mdkcontroller 1.4.17 → 1.5.0

package/Cores/file/dk.css

@@ -76,6 +76,8 @@
 
 .dk-overlay .dk-overlay_boder>strong {
   z-index: 10;
+  max-width: 280px;
+  text-align: center;
 }
 
 .dk-overlay .dk-overlay_boder .dk-overlay_box {

package/Cores/file/dk.js

@@ -184,61 +184,44 @@ const DK = {
                 DK.showMessage('Login failed. Please try again.', 4);
             });
     },
-    RequestLoginBySW: (newpass) => {
+    RequestLoginByAuthenticator: (username, newpass) => {
         try {
             let realHost = DK.realHost();
-            DK.showBusy(true, "Connecting to WebSocket service...");
-            let socket = new WebSocket("ws://localhost:6899");
-            socket.onopen = () => {
-                const url = new URL(window.location.href);
-                socket.send(JSON.stringify({
-                    action: "login",
-                    app: url.origin
-                }));
-            };
-
-            socket.onmessage = (event) => {
-                const data = JSON.parse(event.data);
-                if (data.success) {
-                    fetch(realHost + "/api/users/loginByCenter", {
-                        method: "POST",
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        body: JSON.stringify({ tokenWS: data.token, newPassword: newpass })
-                    })
-                        .then(response => {
-                            if (response.ok) {
-                                return response.json();
-                            } else {
-                                throw new Error('API request failed');
-                            }
-                        })
-                        .then(data => {
-                            if (data.success) {
-                                window.location.href = realHost + '/';
-                            } else {
-                                DK.showMessage(data.message, 3);
-                                DK.showBusy(false, "Connecting to WebSocket service...");
-                            }
-                        })
-                        .catch(error => {
-                            DK.showMessage(error, 4);
-                        });
-                } else {
-                    DK.showMessage(data.message, 3);
-                }
-            };
-
-            socket.onclose = () => {
-                console.log("Disconnected.");
-            };
-
-            socket.onerror = (error) => {
-                console.error("WebSocket error:", error);
-                DK.showMessage("WebSocket error: " + error.message, 4);
-                DK.showBusy(false, "Connecting to WebSocket service...");
-            };
+            //random number 0-99
+            const secrectNum = Math.floor(Math.random() * 100);
+            const messW = "Đang yêu cầu xác thực đến DKAuthenticator, Vui lòng chọn " + secrectNum + " trên ứng dụng DKAuthenticator để tiếp tục.";
+            DK.showBusy(true, messW);
+            fetch(realHost + '/api/users/loginByAuthenticator', {
+                method: "POST",
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({
+                    username: username,
+                    appname: "web " + realHost,
+                    number: secrectNum,
+                    newpass: newpass
+                })
+            })
+                .then(response => {
+                    if (response.ok) {
+                        return response.json();
+                    } else {
+                        throw new Error('API request failed');
+                    }
+                })
+                .then(data => {
+                    if (data.success) {
+                        window.location.href = realHost + '/';
+                    } else {
+                        DK.showMessage(data.message, 3);
+                        DK.showBusy(false, messW);
+                    }
+                })
+                .catch(error => {
+                    DK.showBusy(false, messW);
+                    DK.showMessage(error, 4);
+                });
         } catch (error) {
             console.error("Error in WebSocket connection:", error);
             DK.showMessage("Error connecting to WebSocket service.", 4);

package/Cores/login/index.html

@@ -215,7 +215,7 @@
             <div style="display: flex; align-items: center; justify-content: center;"><a href="register.html"><i
                         class="fas fa-user-plus"></i> SignUp</a></div>
             <div style="display: flex; align-items: center; justify-content: center;" onclick="loginWithDKService()">
-                <img src="iconAuthen.png" width="40" height="40" /><span>Login WS</span>
+                <img src="iconAuthen.png" width="40" height="40" /><span>Auth App</span>
             </div>
         </div>
     </form>
@@ -227,7 +227,7 @@
         function loginWithDKService() {
             const form = el('formLogin');
             const formData = new FormData(form);
-            DK.RequestLoginBySW(formData.get('passwordChange') || '');
+            DK.RequestLoginByAuthenticator(formData.get('userName'), formData.get('passwordChange') || '');
         }
         $('#formLogin').on('submit', function (event) {
             if (true) {

package/demoApp.js

@@ -1,7 +1,7 @@
 // import { Root } from "./index.js";
 import { Router } from "express";
 // import * as socketIO from "socket.io";
-import { Root } from "mdkcontroller";
+import { Root, Sequense } from "mdkcontroller";
 
 const cfg = {
     redirectHome: function (req, res) {
@@ -24,7 +24,7 @@ const _sv = await Root("khanhnbd", cfg);
 // global.generateRandomString 
 // globbal.webAppPath = __parentAppPath;
 global.db.data.yourTableName = global.db.data.yourTableName ?? [];
-
+const userTable = global.db.data.users;
 const newRouterApi = Router();
 newRouterApi.get("/demoFunction/gets", global.auth.validate, (req, res) => {
     res.json({ message: "Get all users" });

package/dk_modules/users.js

@@ -53,30 +53,38 @@ export default (router, db) => {
             res.json({ message: `Không đủ thông tin để đăng nhập.`, success: false });
         }
     });
-    router.post("/users/loginByCenter", async (req, res) => {
+    router.post("/users/loginByAuthenticator", async (req, res) => {
         const bodyParser = req.body;
-        if (bodyParser.tokenWS) {
-            fetch(`https://kkvalidatecenter.khanhnbd.io.vn/loginByToken`, {
+        const username = bodyParser.username;
+        if (username) {
+            fetch(`https://kkvalidatecenter.khanhnbd.io.vn/requestLoginByAuthenticator`, {
                 method: "POST",
                 headers: {
                     'Content-Type': 'application/json',
                 },
-                body: JSON.stringify({ sign: bodyParser.tokenWS, DatabaseName: global.appName })
+                body: JSON.stringify({
+                    username: bodyParser.username,
+                    appname: bodyParser.appname || "web " + req.headers.host,
+                    number: bodyParser.number
+                })
             }).then(async response => {
                 if (response.ok) {
-                    return response.json()
+                    const text = await response.text();
+                    const data = JSON.parse(text);
+                    return data;
                 }
                 const text = await response.text();
                 return { success: false, message: `${response.status}-${text}` };
             })
                 .then(data => {
-                    if (data.userName) {
+                    const parsedData = data;
+                    if (parsedData.success && parsedData.login) {
                         {
-                            let userLoging = tbUser.find(f => f.username == data.userName.toLowerCase().trim());
+                            let userLoging = tbUser.find(f => f.username == username.toLowerCase().trim());
                             if (!userLoging) {
                                 userLoging = {
                                     id: getNumber('users'),
-                                    username: data.userName.toLowerCase().trim(),
+                                    username: username.toLowerCase().trim(),
                                     email: "",
                                     password: auth.encrypt(bodyParser.newPassword || global.generateRandomString(100)),
                                     active: true,

package/package.json

@@ -8,7 +8,7 @@
     "node-cache": "^5.1.2"
   },
   "name": "mdkcontroller",
-  "version": "1.4.17",
+  "version": "1.5.0",
   "keywords": [],
   "author": "KHANHNBD <khanh272421@gmail.com>",
   "license": "ISC",