fix user deletion of credentials

should use a where clause with destroyAll
This commit is contained in:
Berkeley Martinez
2015-06-12 11:58:31 -07:00
parent 070a80cb79
commit 0f5f92b937

View File

@ -1,32 +1,36 @@
var Rx = require('rx'); var Rx = require('rx');
var debug = require('debug')('freecc:user:remote'); var debug = require('debug')('freecc:user:remote');
function destroyById(id, Model) { function destroyAllRelated(id, Model) {
return Rx.Observable.create(function(observer) { return Rx.Observable.fromNodeCallback(
Model.destroyById(id, function(err) { Model.destroyAll,
if (err) { return observer.onError(err); } Model
observer.onCompleted(); )({ userId: id });
});
return Rx.Disposable(Rx.helpers.noop);
});
} }
module.exports = function(app) { module.exports = function(app) {
var User = app.models.User; var User = app.models.User;
var UserIdentity = app.models.UserIdentity; var UserIdentity = app.models.UserIdentity;
var UserCredential = app.models.UserCredential; var UserCredential = app.models.UserCredential;
User.observe('after delete', function(ctx, next) { User.observe('before delete', function(ctx, next) {
debug('removing user', ctx.where); debug('removing user', ctx.where);
var id = ctx.where && ctx.where.id ? ctx.where.id : null; var id = ctx.where && ctx.where.id ? ctx.where.id : null;
if (!id) { if (!id) {
return next(); return next();
} }
Rx.Observable.combineLatest( Rx.Observable.combineLatest(
destroyById(id, UserIdentity), destroyAllRelated(id, UserIdentity),
destroyById(id, UserCredential), destroyAllRelated(id, UserCredential),
Rx.helpers.noop function(identData, credData) {
return {
identData: identData,
credData: credData
};
}
).subscribe( ).subscribe(
Rx.helpers.noop, function(data) {
debug('deleted', data);
},
function(err) { function(err) {
debug('error deleting user %s stuff', id, err); debug('error deleting user %s stuff', id, err);
next(err); next(err);