Aggiornamenti

src/server/middleware/authenticate.js

@@ -1,6 +1,6 @@
 const server_constants = require('../tools/server_constants');
 
-var {User} = require('../models/user');
+var { User } = require('../models/user');
 
 const tools = require('../tools/general');
 
@@ -12,6 +12,7 @@ const authenticate = (req, res, next) => {
   const access = 'auth';
 
   User.findByToken(token, access).then((user) => {
+
     if (!user) {
       // tools.mylog("TOKEN " + token);
       // tools.mylog(" NOT FOUND! (Maybe Connected to other Page) ACCESS: '" + access + "'");
@@ -19,15 +20,26 @@ const authenticate = (req, res, next) => {
       // res.status().send();
     }
 
-    // Save last time online
-    user.lasttimeonline = new Date();
+    if (!!user.deleted) {
+      if (user.deleted)
+        user = null;
+    }
 
-    return user.save().then(() => {
-      req.user = user;
-      req.token = token;
-      req.access = access;
-      next();
-    });
+    if (!user) {
+      return Promise.reject(server_constants.RIS_CODE_HTTP_INVALID_TOKEN);
+    }
+
+    if (!!user) {
+      // Save last time online
+      user.lasttimeonline = new Date();
+
+      return user.save().then(() => {
+        req.user = user;
+        req.token = token;
+        req.access = access;
+        next();
+      });
+    }
     // tools.mylog('userid', user._id);
 
   }).catch((e) => {
@@ -46,7 +58,7 @@ const authenticate_noerror = (req, res, next) => {
       req.user = null;
       req.token = null;
       req.access = null;
-    }else {
+    } else {
       req.user = user;
       req.token = token;
       req.access = access;
@@ -59,4 +71,4 @@ const authenticate_noerror = (req, res, next) => {
   });
 };
 
-module.exports = {authenticate, authenticate_noerror};
+module.exports = { authenticate, authenticate_noerror };