Updated Auth

vikasaditya · Apr 13, 2012 · 7d78691 · 7d78691
1 parent 90d3d84
commit 7d78691
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/plugins/passport/Readme.md b/plugins/passport/Readme.md
@@ -8,3 +8,14 @@ This plugin provides passport authentication support.
  passwordField // the default password field.
  strategy // the passport strategy to use defaults to LocalStrategy.
  protected // the list of urls to protect, defaults to all.
+
+##Request
+To require a route to be authenticated set authrequired.
+
+    ```javascript
+
+    app.all('/your/route', function(req,res, next){
+        req.authrequired = true
+     next();
+    });
+    ```
diff --git a/plugins/passport/passport.js b/plugins/passport/passport.js
@@ -6,13 +6,18 @@ var PassportPlugin = function () {
     if (!this.options.authModel) {
         throw new Error("authModel option is required");
     }
+    this.usernameField = this.options.usernameField || 'username';
+    this.passwordField = this.options.passwordField || 'password';
     this.app.use(passport.initialize());
     this.app.use(passport.session());
 
 
     passport.use(this.options.strategy || new LocalStrategy(
         function (username, password, done) {
-            this.options.authModel.findOne({username:username, password:password}, done)
+            var obj = {};
+            obj[this.usernameField] = username;
+            obj[this.passwordField] = password;
+            this.options.authModel.findOne(obj, done)
         }.bind(this)
     ));
     passport.serializeUser(function (user, done) {
@@ -45,16 +50,17 @@ PassportPlugin.prototype.encryptCredentials = function (req, res, next) {
     req.body[passfield] = passHash;
     next();
 };
-PassportPlugin.prototype.onAuth = function(req,res){
+PassportPlugin.prototype.onAuth = function (req, res) {
     res.send({
         status:0,
         payload:req.user
     });
 }
 PassportPlugin.prototype.filters = function () {
+    var passfield = this.options.passwordField || 'password';
+    var authenticate = passport.authenticate('local', { failureRedirect:this.pluginUrl+'/check' });
     var app = this.app;
-    app.post(this.pluginUrl, this.encryptCredentials.bind(this),
-        passport.authenticate('local', { failureRedirect:'/check' }), this.onAuth.bind(this));
+    app.post(this.pluginUrl,  this.encryptCredentials.bind(this), authenticate, this.onAuth.bind(this));
 
     app.get(this.pluginUrl + '/check', this.ensureAuthenticated.bind(this), this.onAuth.bind(this));
 
@@ -63,6 +69,20 @@ PassportPlugin.prototype.filters = function () {
         res.redirect(this.baseUrl);
     }.bind(this));
 
+    app.all(this.baseUrl + '*', function (req, res, next) {
+        if (req.authrequired) {
+            if (req.body[passfield])
+               return authenticate(req, res, next);
+        }
+        next();
+
+
+    }.bind(this), function (req, res, next) {
+        if (req.authrequired)
+            return  this.ensureAuthenticated(req, res, next)
+        return next();
+    }.bind(this));
+
     [this.baseUrl + '/rest/*'].concat(this.options.restrict).forEach(function (v) {
         if (v)
             this.app.all(v, this.ensureAuthenticated.bind(this));