isite 2022.3.9 → 2022.4.10

package/apps/client-side/site_files/js/site.js

@@ -54,7 +54,7 @@
         };
     }
 
-    if (typeof SOCIALBROWSER === 'object') {
+    if (window.SOCIALBROWSER) {
         SOCIALBROWSER.var = SOCIALBROWSER.var || {};
         SOCIALBROWSER.var.white_list = SOCIALBROWSER.var.white_list || [];
         if (document.location.hostname) {
@@ -92,6 +92,25 @@
     }
 
     let site = {};
+    site.printerList = [];
+    site.getPrinters = function () {
+        if (window.SOCIALBROWSER && SOCIALBROWSER.currentWindow.webContents.getPrintersAsync) {
+            SOCIALBROWSER.currentWindow.webContents.getPrintersAsync().then((arr0) => {
+                site.printerList = arr0;
+            });
+        } else if (window.SOCIALBROWSER && SOCIALBROWSER.currentWindow.webContents.getPrinters) {
+            site.printerList = SOCIALBROWSER.currentWindow.webContents.getPrinters();
+        } else {
+            fetch('http://127.0.0.1:60080/printers/all')
+                .then((res) => res.json())
+                .then((data) => {
+                    site.printerList = data.list;
+                });
+        }
+
+        return site.printerList;
+    };
+    site.getPrinters();
     site.render = function (selector, data) {
         let template = document.querySelector(selector);
         if (template) {

package/lib/security.js

@@ -46,7 +46,7 @@ module.exports = function init(____0) {
             );
             return;
         }
-
+        u.email = u.email.trim().toLowerCase();
         security.getUser(
             {
                 email: u.email,
@@ -127,9 +127,9 @@ module.exports = function init(____0) {
             profile: {
                 name: key,
             },
-            ref_info : {
-                _id : ''
-            }
+            ref_info: {
+                _id: '',
+            },
         });
     };
     ____0.options.security.keys.forEach((key) => {
@@ -166,9 +166,9 @@ module.exports = function init(____0) {
             profile: {
                 name: key,
             },
-            ref_info : {
-                _id : ''
-            }
+            ref_info: {
+                _id: '',
+            },
         });
     });
     ____0.options.security.users.forEach((user) => {
@@ -382,11 +382,11 @@ module.exports = function init(____0) {
 
             if (
                 (userArgs.id && user.id === userArgs.id) ||
-                (!user.key && userArgs.email && user.email === userArgs.email) ||
-                (!user.key && userArgs.userName && user.userName === userArgs.userName) ||
-                (!user.key && userArgs.mobile && user.mobile === userArgs.mobile) ||
+                (!user.key && userArgs.email && user.email === userArgs.email.trim().toLowerCase()) ||
+                (!user.key && userArgs.userName && user.userName === userArgs.userName.trim().toLowerCase()) ||
+                (!user.key && userArgs.mobile && user.mobile === userArgs.mobile.trim().toLowerCase()) ||
                 (user.key && userArgs.key && user.key === userArgs.key) ||
-                (user.key && userArgs.email && user.key === ____0.x0md50x(userArgs.email))
+                (user.key && userArgs.email && user.key === ____0.x0md50x(userArgs.email.trim().toLowerCase()))
             ) {
                 user.$memory = !0;
                 user = security.handleUser(user);
@@ -421,7 +421,7 @@ module.exports = function init(____0) {
 
         for (var i = 0; i < security.users.length; i++) {
             var _user = security.users[i];
-            if (_user.email == user.email && _user.password == user.password) {
+            if (_user.email == user.email.trim().toLowerCase() && _user.password == user.password) {
                 callback(null, { ..._user });
                 return;
             }
@@ -543,7 +543,7 @@ module.exports = function init(____0) {
                         callback(err);
                     } else {
                         callback({
-                            message: 'email or password error',
+                            message: 'email or password error ',
                         });
                     }
 
@@ -712,11 +712,11 @@ module.exports = function init(____0) {
         if (user.id) {
             where.id = user.id;
         } else if (user.email) {
-            where.email = user.email;
+            where.email = user.email.trim().toLowerCase();
         } else if (user.mobile) {
-            where.mobile = user.mobile;
+            where.mobile = user.mobile.trim().toLowerCase();
         } else if (user.userName) {
-            where.userName = user.userName;
+            where.userName = user.userName.trim().toLowerCase();
         } else {
             callback({
                 message: 'User Info Not Correct',

package/package.json

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