Delint.

Author: jaredhanson

lib/authenticator.js

@@ -19,7 +19,7 @@ function Authenticator() {
   this._userProperty = 'user';
 
   this.init();
-};
+}
 
 /**
  * Initialize authenticator.
@@ -29,7 +29,7 @@ function Authenticator() {
 Authenticator.prototype.init = function() {
   this.framework(require('./framework/connect')());
   this.use(new SessionStrategy());
-}
+};
 
 /**
  * Utilize the given `strategy` with optional `name`, overridding the strategy's
@@ -51,7 +51,7 @@ Authenticator.prototype.use = function(name, strategy) {
     strategy = name;
     name = strategy.name;
   }
-  if (!name) throw new Error('Authentication strategies must have a name');
+  if (!name) { throw new Error('Authentication strategies must have a name'); }
 
   this._strategies[name] = strategy;
   return this;
@@ -79,7 +79,7 @@ Authenticator.prototype.use = function(name, strategy) {
 Authenticator.prototype.unuse = function(name) {
   delete this._strategies[name];
   return this;
-}
+};
 
 /**
  * Setup Passport to be used under framework.
@@ -103,7 +103,7 @@ Authenticator.prototype.unuse = function(name) {
 Authenticator.prototype.framework = function(fw) {
   this._framework = fw;
   return this;
-}
+};
 
 /**
  * Passport's primary initialization middleware.
@@ -133,7 +133,7 @@ Authenticator.prototype.initialize = function(options) {
   this._userProperty = options.userProperty || 'user';
 
   return this._framework.initialize(this);
-}
+};
 
 /**
  * Middleware that will authenticate a request using the given `strategy` name,
@@ -165,7 +165,7 @@ Authenticator.prototype.initialize = function(options) {
  */
 Authenticator.prototype.authenticate = function(strategy, options, callback) {
   return this._framework.authenticate(this, strategy, options, callback);
-}
+};
 
 /**
  * Middleware that will authorize a third-party account using the given
@@ -193,7 +193,7 @@ Authenticator.prototype.authorize = function(strategy, options, callback) {
 
   var fn = this._framework.authorize || this._framework.authenticate;
   return fn(this, strategy, options, callback);
-}
+};
 
 /**
  * Middleware that will restore login state from a session.
@@ -235,7 +235,7 @@ Authenticator.prototype.authorize = function(strategy, options, callback) {
  */
 Authenticator.prototype.session = function(options) {
   return this.authenticate('session', options);
-}
+};
 
 /**
  * Registers a function used to serialize user objects into the session.
@@ -293,7 +293,7 @@ Authenticator.prototype.serializeUser = function(fn, req, done) {
       return done(e);
     }
   })(0);
-}
+};
 
 /**
  * Registers a function used to deserialize user objects out of the session.
@@ -356,7 +356,7 @@ Authenticator.prototype.deserializeUser = function(fn, req, done) {
       return done(e);
     }
   })(0);
-}
+};
 
 /**
  * Registers a function used to transform auth info.
@@ -447,7 +447,7 @@ Authenticator.prototype.transformAuthInfo = function(fn, req, done) {
       return done(e);
     }
   })(0);
-}
+};
 
 /**
  * Return strategy with given `name`. 
@@ -458,7 +458,7 @@ Authenticator.prototype.transformAuthInfo = function(fn, req, done) {
  */
 Authenticator.prototype._strategy = function(name) {
   return this._strategies[name];
-}
+};
 
 
 /**

lib/framework/connect.js

@@ -23,5 +23,5 @@ module.exports = function() {
   return {
     initialize: initialize,
     authenticate: authenticate
-  }
-}
+  };
+};

lib/http/request.js

@@ -53,7 +53,7 @@ req.logIn = function(user, options, done) {
   } else {
     done && done();
   }
-}
+};
 
 /**
  * Terminate an existing login session.

lib/middleware/authenticate.js

@@ -87,15 +87,16 @@ module.exports = function authenticate(passport, name, options, callback) {
           return callback(null, false, failures[0].challenge, failures[0].status);
         } else {
           var challenges = failures.map(function(f) { return f.challenge; });
-          var statuses = failures.map(function(f) { return f.status; })
+          var statuses = failures.map(function(f) { return f.status; });
           return callback(null, false, challenges, statuses);
         }
       }
 
       // Strategies are ordered by priority.  For the purpose of flashing a
       // message, the first failure will be displayed.
       var failure = failures[0] || {}
-        , challenge = failure.challenge || {};
+        , challenge = failure.challenge || {}
+        , msg;
 
       if (options.failureFlash) {
         var flash = options.failureFlash;
@@ -105,13 +106,13 @@ module.exports = function authenticate(passport, name, options, callback) {
         flash.type = flash.type || 'error';
 
         var type = flash.type || challenge.type || 'error';
-        var msg = flash.message || challenge.message || challenge;
+        msg = flash.message || challenge.message || challenge;
         if (typeof msg == 'string') {
           req.flash(type, msg);
         }
       }
       if (options.failureMessage) {
-        var msg = options.failureMessage;
+        msg = options.failureMessage;
         if (typeof msg == 'boolean') {
           msg = challenge.message || challenge;
         }
@@ -130,16 +131,16 @@ module.exports = function authenticate(passport, name, options, callback) {
       // actions#fail).  If multiple strategies failed, each of their challenges
       // will be included in the response.
       var rchallenge = []
-        , rstatus;
+        , rstatus, status;
 
       for (var j = 0, len = failures.length; j < len; j++) {
-        var failure = failures[j]
-          , challenge = failure.challenge
-          , status = failure.status;
+        failure = failures[j];
+        challenge = failure.challenge;
+        status = failure.status;
 
         rstatus = rstatus || status;
         if (typeof challenge == 'string') {
-          rchallenge.push(challenge)
+          rchallenge.push(challenge);
         }
       }
 
@@ -193,7 +194,8 @@ module.exports = function authenticate(passport, name, options, callback) {
           return callback(null, user, info);
         }
 
-        info = info || {}
+        info = info || {};
+        var msg;
 
         if (options.successFlash) {
           var flash = options.successFlash;
@@ -203,13 +205,13 @@ module.exports = function authenticate(passport, name, options, callback) {
           flash.type = flash.type || 'success';
 
           var type = flash.type || info.type || 'success';
-          var msg = flash.message || info.message || info;
+          msg = flash.message || info.message || info;
           if (typeof msg == 'string') {
             req.flash(type, msg);
           }
         }
         if (options.successMessage) {
-          var msg = options.successMessage;
+          msg = options.successMessage;
           if (typeof msg == 'boolean') {
             msg = info.message || info;
           }
@@ -225,16 +227,7 @@ module.exports = function authenticate(passport, name, options, callback) {
 
         req.logIn(user, options, function(err) {
           if (err) { return next(err); }
-          if (options.authInfo !== false) {
-            passport.transformAuthInfo(info, req, function(err, tinfo) {
-              if (err) { return next(err); }
-              req.authInfo = tinfo;
-              complete();
-            });
-          } else {
-            complete();
-          }
-        
+          
           function complete() {
             if (options.successReturnToOrRedirect) {
               var url = options.successReturnToOrRedirect;
@@ -249,8 +242,18 @@ module.exports = function authenticate(passport, name, options, callback) {
             }
             next();
           }
+          
+          if (options.authInfo !== false) {
+            passport.transformAuthInfo(info, req, function(err, tinfo) {
+              if (err) { return next(err); }
+              req.authInfo = tinfo;
+              complete();
+            });
+          } else {
+            complete();
+          }
         });
-      }
+      };
 
       /**
        * Fail authentication, with optional `challenge` and `status`, defaulting
@@ -272,7 +275,7 @@ module.exports = function authenticate(passport, name, options, callback) {
         // using the next strategy
         failures.push({ challenge: challenge, status: status });
         attempt(i + 1);
-      }
+      };
 
       /**
        * Redirect to `url` with optional `status`, defaulting to 302.
@@ -296,7 +299,7 @@ module.exports = function authenticate(passport, name, options, callback) {
           res.setHeader('Content-Length', '0');
           res.end();
         }
-      }
+      };
 
       /**
        * Pass without making a success or fail decision.
@@ -309,7 +312,7 @@ module.exports = function authenticate(passport, name, options, callback) {
        */
       strategy.pass = function() {
         next();
-      }
+      };
 
       /**
        * Internal error while performing authentication.
@@ -327,11 +330,11 @@ module.exports = function authenticate(passport, name, options, callback) {
         }
 
         next(err);
-      }
+      };
 
       // ----- END STRATEGY AUGMENTATION -----
 
       strategy.authenticate(req, options);
     })(0); // attempt
-  }
-}
+  };
+};

lib/middleware/initialize.js

@@ -60,5 +60,5 @@ module.exports = function initialize(passport) {
     }
 
     next();
-  }
-}
+  };
+};

lib/strategies/session.js

@@ -55,7 +55,7 @@ SessionStrategy.prototype.authenticate = function(req, options) {
           paused.resume();
         }
         return;
-      };
+      }
       var property = req._passport.instance._userProperty || 'user';
       req[property] = user;
       self.pass();
@@ -66,10 +66,10 @@ SessionStrategy.prototype.authenticate = function(req, options) {
   } else {
     self.pass();
   }
-}
+};
 
 
 /**
  * Expose `SessionStrategy`.
- */ 
+ */
 module.exports = SessionStrategy;