isite 2024.12.2 → 2024.12.4

package/lib/security.js

@@ -393,7 +393,8 @@ module.exports = function init(____0) {
     callback = callback || function () {};
     let index = security.users.findIndex(
       (user) =>
-        (_user.id && user.id === _user.id) ||
+        (_user.id && user.id == _user.id) ||
+        (_user._id && user._id == _user._id) ||
         (!user.key && _user.email && user.email === _user.email.trim().toLowerCase()) ||
         (!user.key && _user.username && user.username === _user.username.trim().toLowerCase()) ||
         (!user.key && _user.mobile && user.mobile === _user.mobile.trim().toLowerCase()) ||
@@ -491,6 +492,8 @@ module.exports = function init(____0) {
           $req.session.user = _user;
           $req.session.user_id = _user.id;
           $req.session.$save();
+        } else {
+          console.log('$req Not Exists in security.login');
         }
         callback(null, _user);
         ____0.call('user login', {
@@ -783,15 +786,16 @@ module.exports = function init(____0) {
         }
       }
 
+      if (user && user.$permissions && user.$permissions.some((p) => p == '*')) {
+        return ok;
+      }
+
       if (user && user.$permissions) {
         for (var i = 0; i < user.$permissions.length; i++) {
           var p = user.$permissions[i];
           if (permission == p) {
             return ok;
           }
-          if (p == '*') {
-            return ok;
-          }
         }
       }
 

package/lib/session.js

@@ -123,18 +123,36 @@ module.exports = function init(req, res, ____0, callback) {
 
     AssignFeatures();
 
-    if (____0.security && session.user_id) {
+    // must get user every request ...
+
+    if (session.user_id) {
       ____0.security.getUser(
         {
           id: session.user_id,
         },
         function (err, user) {
           if (!err && user) {
+            if (user) {
+              req.features.push('login');
+            }
             session.user = user;
-            if (session.user) {
+            callback(session);
+            session.$save();
+          }
+        }
+      );
+    } else if (session.user) {
+      ____0.security.getUser(
+        {
+          email: session.user.email,
+        },
+        function (err, user) {
+          if (!err && user) {
+            if (user) {
               req.features.push('login');
             }
-
+            session.user_id = user.id;
+            session.user = user;
             callback(session);
             session.$save();
           }

package/lib/sessions.js

@@ -83,20 +83,22 @@ module.exports = function init(____0) {
   };
 
   ____0.getSession = sessions.attach = function (req, callback) {
+    
     let session = { accessToken: req.headers['Access-Token'] || req.headers['access-token'] || req.query['access-token'] || req.cookie('access_token') };
 
     callback = callback || function () {};
 
-    if (req.headers['connection'] == 'upgrade' && !session.accessToken) {
-      session.accessToken = req.host + req.ip + new Date().getTime().toString() + '_' + Math.random();
-      session.accessToken = ____0.x0md50x(session.accessToken);
-      session.tmp = true;
-      session.language = ____0.options.language;
-      return callback(session);
-    }
+    // if (req.headers['connection'] == 'upgrade' && !session.accessToken) {
+    //   session.accessToken = req.host + req.ip + new Date().getTime().toString() + '_' + Math.random();
+    //   session.accessToken = ____0.x0md50x(session.accessToken);
+    //   session.tmp = true;
+    //   session.language = ____0.options.language;
+    //   session.$new = !0;
+    //   return callback(session);
+    // }
 
     if (session.accessToken) {
-      let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken === session.accessToken);
+      let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken == session.accessToken);
       if (index !== -1) {
         sessions.list[index].$time = new Date().getTime();
         sessions.list[index].requestesCount++;
@@ -104,7 +106,7 @@ module.exports = function init(____0) {
         sessions.list[index].lang = sessions.list[index].language.id;
         callback(sessions.list[index]);
       } else {
-        if (____0.options.session.storage === 'mongodb') {
+        if (____0.options.session.storage == 'mongodb') {
           sessions.$collection.find(
             { accessToken: session.accessToken },
             (err, doc) => {
@@ -114,7 +116,6 @@ module.exports = function init(____0) {
                 if (!doc.language || !doc.language.id) {
                   doc.language = ____0.options.language;
                 }
-
                 doc.lang = doc.language.id;
                 sessions.list.push(doc);
                 callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
@@ -142,8 +143,8 @@ module.exports = function init(____0) {
           session.requestesCount = 1;
           session.createdTime = new Date().getTime();
           session.$time = new Date().getTime();
-          callback(session);
           sessions.list.push(session);
+          callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
         }
       }
     } else {

package/lib/wsClient.js

@@ -107,5 +107,5 @@ module.exports = function init(____0) {
     }
   };
 
-  ____0.ws.wsSupport();
+  
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2024.12.02",
+  "version": "2024.12.04",
   "description": "Create High Level Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {