Close model.

lib/api/authenticate.js

@@ -1,17 +1,28 @@
 module.exports = function(email, password, done) {
   var self = this;
-  
+
   email = email.toLowerCase();
-  
+
   self.getUserByEmail(email, function(err, $user) {
-    if (err) return done(err);
+    if (err) {
+      $user.close();
+      return done(err);
+    }
 
     self.passwordMatch($user, password, function(err, match) {
-      if (err) return done(err);
-      if (!match) return done(self.error('wrongPassword'));
+      if (err) {
+        $user.close();
+        return done(err);
+      }
+      if (!match) {
+        $user.close();
+        return done(self.error('wrongPassword'));
+      }
 
       // Return userId
-      return done(null, $user.get('id'));
+      var userId = $user.get('id')
+      $user.close();
+      return done(null, userId);
     });
   });
 }

lib/api/changeEmail.js

@@ -1,15 +1,21 @@
 module.exports = function(userId, email, done) {
   var self = this;
   var model = self.backend.createModel();
-  
+
   email = email.toLowerCase();
 
   // Look for user with given userId
   var $user = model.at(self.options.collection + '.' + userId);
   model.fetch($user, function(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
-    if (!$user.get()) return done(self.error('noUser'));
+    if (!$user.get()) {
+      model.close();
+      return done(self.error('noUser'));
+    }
 
     if ($user.get(self.options.emailField) === email) return done(self.error('equalEmails'));
 
@@ -18,9 +24,15 @@ module.exports = function(userId, email, done) {
         email: email,
         timestamp: +new Date()
       }
-      $user.set(self.options.localField + '.' + self.options.emailChangeField, emailChange, done);
+      $user.set(self.options.localField + '.' + self.options.emailChangeField, emailChange, function() {
+        model.close();
+        return done();
+      });
     } else {
-      $user.set(self.options.emailField, email, done);
+      $user.set(self.options.emailField, email, function() {
+        model.close();
+        return done();
+      });
     }
 
   });

lib/api/changePassword.js

@@ -5,20 +5,38 @@ module.exports = function(userId, oldpassword, password, done) {
   // Look for user with given userId
   var $user = model.at(self.options.collection + '.' + userId);
   model.fetch($user, function(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
-    if (!$user.get()) return done(self.error('noUser'));
+    if (!$user.get()) {
+      model.close();
+      return done(self.error('noUser'));
+    }
 
-    if (!$user.get(self.options.localField)) return done(self.error('noLocal'));
+    if (!$user.get(self.options.localField)) {
+      model.close();
+      return done(self.error('noLocal'));
+    }
 
     // Check the old password
     self.passwordMatch($user, oldpassword, function(err, match) {
-      if (err) return done(err);
+      if (err) {
+        model.close();
+        return done(err);
+      }
 
-      if (!match) return done(self.error('wrongOldPassword'));
+      if (!match) {
+        model.close();
+        return done(self.error('wrongOldPassword'));
+      }
 
       // Save password
-      self.setPassword($user, password, done);
+      self.setPassword($user, password, function() {
+        model.close();
+        return done();
+      });
     });
   });
 }

lib/api/confirmEmail.js

@@ -5,24 +5,43 @@ module.exports = function(userId, done) {
   // Look for user with given userId
   var $user = model.at(self.options.collection + '.' + userId);
   model.fetch($user, function(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
-    if (!$user.get()) return done(self.error('noUser'));
+    if (!$user.get()) {
+      model.close();
+      return done(self.error('noUser'));
+    }
 
-    if (!$user.get(self.options.localField)) return done(self.error('noLocal'));
+    if (!$user.get(self.options.localField)) {
+      model.close();
+      return done(self.error('noLocal'));
+    }
 
     var emailChange = $user.get(self.options.localField + '.' + self.options.emailChangeField);
-    if (!emailChange) return done(self.error('alreadyConfirmed'));
+    if (!emailChange) {
+      model.close();
+      return done(self.error('alreadyConfirmed'));
+    }
 
     var now = +new Date();
     if (emailChange.timestamp + self.options.confirmEmailTimeLimit < now) {
+      model.close();
       return done(self.error('confirmationExpired'));
     }
 
     $user.set(self.options.emailField, emailChange.email, function(err) {
-      if (err) return done(err);
+      if (err) {
+        model.close();
+        return done(err);
+      }
 
-      $user.del(self.options.localField + '.' + self.options.emailChangeField, done);
+      $user.del(self.options.localField + '.' + self.options.emailChangeField, function() {
+        model.close();
+        return done();
+      });
     });
   });
 }

lib/api/getUserByEmail.js

@@ -1,9 +1,9 @@
 module.exports = function(email, done) {
   var self = this;
   var model = self.backend.createModel();
-  
+
   email = email.toLowerCase();
-  
+
   // Look for user with given email
   var query = { $limit: 1 };
   query[self.options.emailField] = {
@@ -13,12 +13,18 @@ module.exports = function(email, done) {
   var $userQuery = model.query(self.options.collection, query);
 
   model.fetch($userQuery, function(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
     var user = $userQuery.get()[0];
 
     // Return error if no user
-    if (!user) return done(self.error('noUserByEmail'));
+    if (!user) {
+      model.close();
+      return done(self.error('noUserByEmail'));
+    }
 
     // Return user as scoped model
     var $user = model.at(self.options.collection + '.' + user.id);

lib/api/getUserBySecret.js

@@ -8,12 +8,18 @@ module.exports = function(secret, done) {
   var $userQuery = model.query(self.options.collection, query);
 
   model.fetch($userQuery, function(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
     var user = $userQuery.get()[0];
 
     // Return error if no user
-    if (!user) return done(self.error('noUserBySecret'));
+    if (!user) {
+      model.close();
+      return done(self.error('noUserBySecret'));
+    }
 
     // Return user as scoped model
     var $user = model.at(self.options.collection + '.' + user.id);

lib/api/index.js

@@ -8,6 +8,7 @@ Login.prototype.getUserByEmail = require('./getUserByEmail');
 Login.prototype.getUserBySecret = require('./getUserBySecret');
 Login.prototype.login = require('./login');
 Login.prototype.logout = require('./logout');
+Login.prototype.logoutUser = require('./logoutUser');
 Login.prototype.passwordMatch = require('./passwordMatch');
 Login.prototype.register = require('./register');
 Login.prototype.registerProvider = require('./registerProvider');

lib/api/logout.js

@@ -1,5 +1,5 @@
 module.exports = function(req) {
   delete req.session.userId;
-
+  req.session.userIds = [];
   req.logout();
 }

lib/api/registerProvider.js

@@ -6,22 +6,32 @@ module.exports = function(userId, provider, profile, userData, done) {
   profile.timestamp = +new Date();
 
   function callback(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
     // Return userId
+    model.close();
     done(null, userId);
   }
 
   // Look for user with given userId
   var $user = model.at(self.options.collection + '.' + userId);
 
   model.fetch($user, function(err) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
     // User exist
     if ($user.get()) {
       // Error if user allready has given provider
-      if ($user.get(provider)) return done(self.error('providerExists'));
+      if ($user.get(provider)) {
+        model.close();
+        return done(self.error('providerExists'));
+      }
 
       // Save provider's profile
       return $user.set(provider, profile, callback);
@@ -33,7 +43,10 @@ module.exports = function(userId, provider, profile, userData, done) {
     user[provider] = profile;
 
     self.parseRegisterProvider(user, provider, profile, function(err, user) {
-      if (err) return done(err);
+      if (err) {
+        model.close();
+        return done(err);
+      }
 
       model.add(self.options.collection, user, callback);
     })

lib/api/resetPassword.js

@@ -2,19 +2,30 @@ module.exports = function(secret, password, done) {
   var self = this;
 
   self.getUserBySecret(secret, function(err, $user) {
-    if (err) return done(err);
+    if (err) {
+      $user.close();
+      return done(err);
+    }
 
     var timestamp = $user.get(self.options.localField + '.passwordReset.timestamp');
     var now = +new Date();
-    if (timestamp + self.options.resetPasswordTimeLimit < now)
+    if (timestamp + self.options.resetPasswordTimeLimit < now) {
+      $user.close();
       return done(self.error('resetPasswordExpired'));
+    }
 
     // Save password
     self.setPassword($user, password, function(err) {
-      if (err) return done(err);
+      if (err) {
+        $user.close();
+        return done(err);
+      }
 
       // Delete secret
-      $user.del(self.options.localField + '.passwordReset', done);
+      $user.del(self.options.localField + '.passwordReset', function() {
+        $user.close();
+        done();
+      });
     });
   });
 }

lib/api/resetPasswordSecret.js

@@ -3,7 +3,10 @@ module.exports = function(email, done) {
   var model = self.backend.createModel();
 
   self.getUserByEmail(email, function(err, $user) {
-    if (err) return done(err);
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
     // Generate secret as uuid
     var secret = model.id();
@@ -14,10 +17,15 @@ module.exports = function(email, done) {
       timestamp: +new Date()
     }
     $user.set(self.options.localField + '.passwordReset', passwordReset, function(err) {
-      if (err) return done(err);
+      if (err) {
+        model.close();
+        return done(err);
+      }
 
       // Return secret and userId
-      done(null, secret, $user.get('id'));
+      var userId = $user.get('id');
+      model.close();
+      done(null, secret, userId);
     });
   });
 }

lib/api/userExists.js

@@ -1,7 +1,7 @@
 module.exports = function(email, done) {
   var self = this;
   var model = self.backend.createModel();
-  
+
   email = email.toLowerCase();
 
   // Look for user with given email
@@ -13,10 +13,14 @@ module.exports = function(email, done) {
   var $userQuery = model.query(self.options.collection, query);
 
   model.fetch($userQuery, function(err) {
-    if (err) { return done(err); }
+    if (err) {
+      model.close();
+      return done(err);
+    }
 
     var user = $userQuery.get()[0];
 
+    model.close();
     // Return boolean
     done(null, !!user, user);
   });

lib/api/verifyCallback.js

@@ -19,6 +19,6 @@ module.exports = function (req, accessToken, refreshToken, profile, done) {
     profile.refreshToken = refreshToken;
 
     // Register new user or add provider to current user
-    self.registerProvider(req.session.userId, profile.provider, profile, null, done);
+    self.registerProvider(req.model.get('_session.userId'), profile.provider, profile, null, done);
   });
-}
+}