Junto todo lo que es SESIONES PHP en un solo lugar

codenautas · Sep 18, 2016 · d49df23 · d49df23
1 parent 5a963ce
commit d49df23
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/lib/login-plus.js b/lib/login-plus.js
@@ -130,15 +130,24 @@ loginPlus.Manager.prototype.phpInit = function phpInit(app,opts){
             next.apply(null, arguments);
         });
     });
+    var ensureMiddlewareWihtoutPHP = this.ensureMiddleware;
+    this.ensureMiddleware = function(req, res, next){
+        if(req.$SESSION && req.$SESSION[opts.php.varLogged]){
+            return next();
+        }else{
+            ensureMiddlewareWihtoutPHP(req, res, next);
+        }
+    };
 };
 
 loginPlus.Manager.prototype.init = function init(app,opts){
     var thisManager = this;
     var Passport = require('passport').Passport;
-    var passport = this.passport = new Passport;
+    var passport = this.passport = new Passport();
     this.LocalStrategy = require('passport-local').Strategy;
     var promiseChain = Promises.resolve();
     opts = completeOptions(opts);
+    this.ensureMiddleware = ensureLoggedIn(opts.baseUrl+opts.noLoggedUrlPath);
     if(opts.php){
         this.phpInit(app,opts);
     }
@@ -196,19 +205,8 @@ loginPlus.Manager.prototype.init = function init(app,opts){
     );
     passport.serializeUser(opts.serializer.serializeUser);
     passport.deserializeUser(opts.serializer.deserializeUser);
-    /////// ATENCIÓN NUNCA MENTER ensureLoggedIn dentro de una cadena de promesas. Necesitamos que se ejecute sí o sí
-    var ensureMiddlewareWihtoutPHP = ensureLoggedIn(opts.baseUrl+opts.noLoggedUrlPath);
-    var ensureMiddleware = ensureMiddlewareWihtoutPHP;
-    if(opts.php){
-        ensureMiddleware = function(req, res, next){
-            if(req.$SESSION && req.$SESSION[opts.php.varLogged]){
-                return next();
-            }else{
-                ensureMiddlewareWihtoutPHP(req, res, next);
-            }
-        };
-    }
-    app.use(opts.baseUrl,ensureMiddleware); 
+    /////// ATENCIÓN NUNCA METER ensureLoggedIn dentro de una cadena de promesas. Necesitamos que se ejecute sí o sí
+    app.use(opts.baseUrl,this.ensureMiddleware); 
     //// NOW is logged in
     app.get(opts.baseUrl+opts.chPassUrlPath, opts.chPassPageServe);
     app.post(opts.baseUrl+opts.chPassUrlPath, function(req,res){
@@ -217,15 +215,14 @@ loginPlus.Manager.prototype.init = function init(app,opts){
             req.body.oldPassword, 
             req.body.newPassword, 
             function(err, ok, flash){
-                if(err){
-                    console.log('chpass',err);
-                    req.flash({message: 'internal error'});
-                    res.redirect(opts.baseUrl+opts.chPassUrlPath);
-                }else if(ok){
+                if(ok){
                     req.logout();
                     res.redirect(opts.baseUrl+opts.loginUrlPath);
                 }else{
-                    req.flash(flash);
+                    if(err){
+                        console.log('chpass error',err);
+                    }
+                    req.flash(flash||{message: 'internal error'});
                     res.redirect(opts.baseUrl+opts.chPassUrlPath);
                 }
             }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "login-plus",
   "description": "login service for express",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/login-plus",