fix user deletion of credentials
should use a where clause with destroyAll
This commit is contained in:
@ -1,32 +1,36 @@
|
||||
var Rx = require('rx');
|
||||
var debug = require('debug')('freecc:user:remote');
|
||||
|
||||
function destroyById(id, Model) {
|
||||
return Rx.Observable.create(function(observer) {
|
||||
Model.destroyById(id, function(err) {
|
||||
if (err) { return observer.onError(err); }
|
||||
observer.onCompleted();
|
||||
});
|
||||
return Rx.Disposable(Rx.helpers.noop);
|
||||
});
|
||||
function destroyAllRelated(id, Model) {
|
||||
return Rx.Observable.fromNodeCallback(
|
||||
Model.destroyAll,
|
||||
Model
|
||||
)({ userId: id });
|
||||
}
|
||||
|
||||
module.exports = function(app) {
|
||||
var User = app.models.User;
|
||||
var UserIdentity = app.models.UserIdentity;
|
||||
var UserCredential = app.models.UserCredential;
|
||||
User.observe('after delete', function(ctx, next) {
|
||||
User.observe('before delete', function(ctx, next) {
|
||||
debug('removing user', ctx.where);
|
||||
var id = ctx.where && ctx.where.id ? ctx.where.id : null;
|
||||
if (!id) {
|
||||
return next();
|
||||
}
|
||||
Rx.Observable.combineLatest(
|
||||
destroyById(id, UserIdentity),
|
||||
destroyById(id, UserCredential),
|
||||
Rx.helpers.noop
|
||||
destroyAllRelated(id, UserIdentity),
|
||||
destroyAllRelated(id, UserCredential),
|
||||
function(identData, credData) {
|
||||
return {
|
||||
identData: identData,
|
||||
credData: credData
|
||||
};
|
||||
}
|
||||
).subscribe(
|
||||
Rx.helpers.noop,
|
||||
function(data) {
|
||||
debug('deleted', data);
|
||||
},
|
||||
function(err) {
|
||||
debug('error deleting user %s stuff', id, err);
|
||||
next(err);
|
||||
|
Reference in New Issue
Block a user