Update few changes

common/models/user.js

@@ -686,6 +686,7 @@ module.exports = function(User) {
         next();
       });
     });
+
     UserModel.observe('after save', function afterEmailUpdate(ctx, next) {
       if (!ctx.Model.relations.accessTokens) return next();
       var AccessToken = ctx.Model.relations.accessTokens.modelTo;
@@ -697,14 +698,9 @@ module.exports = function(User) {
         return u.id;
       });
       if (!idsToExpire.length) return next();
-      AccessToken.deleteAll({ userId: { inq: idsToExpire }}, function(err, info) {
-        if (err) return next();
-        next();
-      });
+      AccessToken.deleteAll({ userId: { inq: idsToExpire }}, next);
     });
 
-
-
     UserModel.remoteMethod(
       'login',
       {

test/user.test.js

@@ -1809,7 +1809,7 @@ describe('User', function() {
 
   describe('Email Update', function() {
     describe('User changing email property', function() {
-      var user, originalUserToken1, originalUserToken2, newUserCreated, userSpecial, userNormal;
+      var user, originalUserToken1, originalUserToken2, newUserCreated;
       var currentEmailCredentials = { email: '[email protected]', password: 'bar' };
       var updatedEmailCredentials = { email: '[email protected]', password: 'bar' };
       var newUserCred = { email: '[email protected]', password: 'newpass' };
@@ -1839,9 +1839,7 @@ describe('User', function() {
               next();
             });
           },
-        ], function(err) {
-          done(err);
-        });
+        ], done);
       });
 
       it('invalidates sessions when email is changed using `updateAttributes`', function(done) {
@@ -1948,9 +1946,7 @@ describe('User', function() {
               assertPreservedToken(next);
             });
           },
-        ], function(err) {
-          done(err);
-        });
+        ], done);
       });
 
       it('keeps sessions AS IS if a new user is created using `updateOrCreate`', function(done) {
@@ -1969,17 +1965,15 @@ describe('User', function() {
               assertPreservedToken(next);
             });
           },
-        ], function(err) {
-          done(err);
-        });
+        ], done);
       });
 
       function assertPreservedToken(done) {
         AccessToken.find({ where: { userId: user.id }}, function(err, tokens) {
           if (err) return done(err);
           expect(tokens.length).to.equal(2);
-          assert(originalUserToken1);
-          assert(originalUserToken2);
+          expect([tokens[0].id, tokens[1].id]).to.have.members([originalUserToken1,
+            originalUserToken2]);
           done();
         });
       };
@@ -2060,13 +2054,12 @@ describe('User', function() {
               });
             });
           },
-        ], function(err) {
-          done(err);
-        });
+        ], done);
       });
     });
 
     it('invalidates sessions after using updateAll', function(done) {
+      var userSpecial, userNormal;
       async.series([
         function createSpecialUser(next) {
           User.create(
@@ -2120,9 +2113,7 @@ describe('User', function() {
             next();
           });
         },
-      ], function(err) {
-        done(err);
-      });
+      ], done);
     });
   });