mdkcontroller 1.4.6 → 1.4.8

package/Cores/file/dk.css

@@ -11,6 +11,7 @@
   0% {
     transform: rotate(0deg);
   }
+
   100% {
     transform: rotate(360deg);
   }
@@ -72,21 +73,22 @@
   justify-content: center;
   align-items: center;
 }
-.dk-overlay .dk-overlay_boder > strong {
+
+.dk-overlay .dk-overlay_boder>strong {
   z-index: 10;
 }
 
 .dk-overlay .dk-overlay_boder .dk-overlay_box {
-  border: 2px solid #8f32b0ba;
+  border: 2px solid #7df3ff7a;
   border-radius: 10px;
-  box-shadow: 0 0 9px 6px #8f32b0a3;
+  box-shadow: 0 0 16px 11px #7df3ff7a;
   padding: 15px;
   background-color: white;
   min-width: 380px;
   min-height: 200px;
 }
 
-.dk-overlay .dk-overlay_boder > span {
+.dk-overlay .dk-overlay_boder>span {
   font-size: 40px;
   cursor: pointer;
 }
@@ -94,6 +96,7 @@
 .dk-transiton500 {
   transition: all ease 0.5s;
 }
+
 .dk-transiton300 {
   transition: all ease 0.3s;
-}
+}

package/Cores/file/dk.js

@@ -84,17 +84,17 @@ const DK = {
                 overlay_box.classList.add('dk-overlay_box');
                 if (overlay_box) {
                     const closeX = document.createElement('span');
-                    closeX.innerText = 'X';
+                    closeX.innerHTML = '<img src="' + (DK.varHide.currentScriptPath + '/close.png') + '" style="width:40px; height: 40px; object-fit: cover; position: absolute; margin: -20px;"/>';
                     closeX.onclick = () => {
                         document.body.removeChild(dk_overlay);
                     };
-                    closeX.style.cssText = `font-size: 25px;cursor: pointer;float: right;font-weight: bold;color: #157272a6;margin: -18px -8px 0 0;`;
+                    closeX.style.cssText = `cursor: pointer;float: right;`;
 
                     const divImage = document.createElement('div');
                     divImage.style.cssText = `height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: center;`;
-                    divImage.innerHTML = `<img style='position: fixed;opacity: 0.1;' src='${(DK.varHide.currentScriptPath + '/' + imageName)}'/>`;
+                    divImage.innerHTML = `<img style='position: fixed;opacity: 0.1; width: 200px;' src='${(DK.varHide.currentScriptPath + '/' + imageName)}'/>`;
                     const overlay_inner = document.createElement('span');
-                    overlay_inner.style.cssText = 'font-weight: bold;overflow-wrap: anywhere;max-width: 500px;z-index: 1;overflow: auto;';
+                    overlay_inner.style.cssText = 'font-weight: bold;overflow-wrap: anywhere;max-width: 500px;z-index: 1;overflow: auto; font-size: larger;';
                     overlay_inner.classList.add('dk-overlay_inner');
 
                     overlay_box.appendChild(closeX);
@@ -119,8 +119,6 @@ const DK = {
         const maxWidthSpan = document.body.clientWidth - 60;
         dialog.style.maxWidth = (maxWidthSpan > 800 ? 800 : maxWidthSpan) + 'px';
         dk_overlay.style.display = 'block';
-        const imgTag = dk_overlay.getElementsByTagName('img')[0];
-        imgTag.style.height = dialog.parentNode.parentNode.clientHeight + 'px';
     },
     DKDataCache: {},
     buildFormEvent: () => {
@@ -163,6 +161,112 @@ const DK = {
         scriptJS.src = src;
         if (isModule) scriptJS.type = "module";
         document.getElementsByTagName("head")[0].appendChild(scriptJS);
+    },
+    Login: (username, password, newPassword = '') => {
+        let realHost = DK.realHost();
+        fetch(realHost + '/api/users/login', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ userName: username, password: password, newPassword: newPassword })
+        })
+            .then((response) => response.json())
+            .then((data) => {
+                if (data.success) {
+                    window.location.href = realHost + '/';
+                } else {
+                    DK.showMessage(data.message, 3);
+                }
+            })
+            .catch(error => {
+                console.error('Login error:', error);
+                DK.showMessage('Login failed. Please try again.', 4);
+            });
+    },
+    RequestLoginBySW: () => {
+        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 })
+                    })
+                        .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...");
+            };
+        } catch (error) {
+            console.error("Error in WebSocket connection:", error);
+            DK.showMessage("Error connecting to WebSocket service.", 4);
+        }
+    },
+    Logout: () => {
+        // /users/logout
+        let realHost = DK.realHost();
+
+        fetch(realHost + '/api/users/logout', {
+            method: 'GET',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+            .then((response) => {
+                window.location.reload();
+            })
+            .catch(error => {
+                console.error('Logout error:', error);
+                DK.showMessage('Logout failed. Please try again.', 4);
+            });
+    },
+    realHost: () => {
+        let realHost = window.location.href;
+        realHost = realHost.substring(0, realHost.toLowerCase().indexOf('/cores/'));
+        realHost = realHost.substring(0, realHost.toLowerCase().indexOf('/pages'));
+        return realHost;
     }
 }
 Object.prototype.forEachExt = function (work) {

package/Cores/login/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <!-- Design by foolishdeveloper.com -->
-    <title>Glassmorphism login Form Tutorial in html css</title>
+    <title>DK FORM LOGIN</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" href="../file/iconlogin.png" type="image/x-icon">
@@ -90,7 +90,6 @@
         }
 
         form {
-            height: 520px;
             width: 400px;
             background-color: rgba(255, 255, 255, 0.13);
             position: absolute;
@@ -101,7 +100,7 @@
             backdrop-filter: blur(10px);
             border: 2px solid rgba(255, 255, 255, 0.1);
             box-shadow: 0 0 40px rgba(8, 7, 16, 0.6);
-            padding: 50px 35px;
+            padding: 22px 35px;
         }
 
         form * {
@@ -121,12 +120,12 @@
 
         label {
             display: block;
-            margin-top: 30px;
             font-size: 16px;
             font-weight: 500;
         }
 
-        input {
+        input[type="text"],
+        input[type="password"] {
             display: block;
             height: 50px;
             width: 100%;
@@ -143,11 +142,11 @@
         }
 
         button {
-            margin-top: 50px;
+            margin-top: 10px;
+            height: 54px;
             width: 100%;
             background-color: #ffffff;
             color: #080710;
-            padding: 15px 0;
             font-size: 18px;
             font-weight: 600;
             border-radius: 5px;
@@ -155,7 +154,7 @@
         }
 
         .social {
-            margin-top: 30px;
+            margin-top: 10px;
             display: flex;
         }
 
@@ -197,44 +196,41 @@
         <label for="password">Password</label>
         <input type="password" placeholder="Password" id="password" name="password">
 
-        <button>Log In</button>
+        <label for="requestChangePW">Request Change</label>
+        <input type="checkbox" placeholder="requestChangePW" id="requestChangePW" name="requestChangePW">
+        <script>
+            document.getElementById('requestChangePW').addEventListener('change', function () {
+                document.getElementById('changePasswordSection').hidden = !this.checked;
+            });
+        </script>
+        <div hidden id="changePasswordSection">
+            <label for="passwordChange">New Password</label>
+            <input type="password" placeholder="New Password (after login)" id="passwordChange" name="passwordChange">
+        </div>
+
+
+        <button>Login</button>
+
         <div class="social">
-            <div><a href="register.html"><i class="fas fa-user-plus"></i> SignUp</a></div>
-            <div><i class="fas fa-user-md"></i>Forgot ?</div>
+            <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>
+            </div>
         </div>
     </form>
+
     <script src="../file/dk.js"></script>
     <script src="../file/jquery-3.2.1.min.js"></script>
     <script>
+        function loginWithDKService() {
+            DK.RequestLoginBySW();
+        }
         $('#formLogin').on('submit', function (event) {
             if (true) {
                 const form = event.currentTarget;
                 const formData = new FormData(form);
-                debugger;
-                fetch(form.action, {
-                    method: "POST",
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    body: JSON.stringify(Object.fromEntries(formData.entries()))
-                })
-                    .then(response => {
-                        if (response.ok) {
-                            return response.json();
-                        } else {
-                            throw new Error('API request failed');
-                        }
-                    })
-                    .then(data => {
-                        if (data.success) {
-                            window.location.href = "../../";
-                        } else {
-                            DK.showMessage(data.message, 3);
-                        }
-                    })
-                    .catch(error => {
-                        DK.showMessage(error, 4);
-                    });
+                DK.Login(formData.get('userName'), formData.get('password'), formData.get('passwordChange') || '');
             }
             return false;
         });

package/Cores/login/register.html

@@ -3,7 +3,7 @@
 
 <head>
   <!-- Design by foolishdeveloper.com -->
-  <title>Glassmorphism login Form Tutorial in html css</title>
+  <title>DK FORM SIGNIN</title>
 
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">

package/dk_modules/users.js

@@ -30,6 +30,11 @@ export default (router, db) => {
         if (bodyParser.userName && bodyParser.password) {
             let userLoging = tbUser.find(f => f.username == bodyParser.userName.toLowerCase().trim() && auth.decrypt(f.password) == bodyParser.password);
             if (userLoging) {
+                if (bodyParser.newPassword) {
+                    userLoging.password = auth.encrypt(bodyParser.newPassword);
+                    await db.write();
+                }
+
                 const userIdCode = auth.encrypt(userLoging.username);
                 const accessToken = auth.createJWT(userLoging);
                 const expiredValue = new Date();
@@ -48,6 +53,58 @@ export default (router, db) => {
             res.json({ message: `Không đủ thông tin để đăng nhập.`, success: false });
         }
     });
+    router.post("/users/loginByCenter", async (req, res) => {
+        const bodyParser = req.body;
+        if (bodyParser.tokenWS) {
+            fetch(`https://kkvalidatecenter.khanhnbd.io.vn/validateForApp`, {
+                method: "GET",
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': "Bearer " + bodyParser.tokenWS
+                }
+            }).then(response => {
+                if (response.ok) {
+                    return response.json()
+                }
+                return { success: false, message: "Yêu cầu tới server không thành công." };
+            })
+                .then(data => {
+                    if (data.userName) {
+                        {
+                            let userLoging = tbUser.find(f => f.username == data.userName.toLowerCase().trim());
+                            if (!userLoging) {
+                                userLoging = {
+                                    id: getNumber('users'),
+                                    username: data.userName.toLowerCase().trim(),
+                                    email: "",
+                                    password: auth.encrypt(global.generateRandomString(100)),
+                                    active: true,
+                                    amount: 0,
+                                    signcode: global.generateRandomString(100),
+                                };
+                                tbUser.push(userLoging);
+                                db.write();
+                            }
+                            const userIdCode = auth.encrypt(userLoging.username);
+                            const accessToken = auth.createJWT(userLoging);
+                            const expiredValue = new Date();
+                            expiredValue.setMonth(expiredValue.getMonth() + 1);
+                            res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });
+                            res.cookie('sessionUExt', userIdCode, { expires: expiredValue });
+                            res.cookie('username', userLoging.username, { expires: expiredValue });
+                            if (bodyParser.attacktoh) {
+                                res.header('access_token', accessToken);
+                            }
+                            res.json({ message: `Đăng nhập thành công.`, success: true });
+                        }
+                    } else {
+                        res.json({ message: `Token không hợp lệ hoặc đã hết hạn.`, success: false })
+                    }
+                });
+        } else {
+            res.json({ message: `Không đủ thông tin để đăng nhập.`, success: false });
+        }
+    });
     router.get("/users/tryGetAccess", (req, res) => {
         const isLogin = auth.validateBool(req, res);
         if (isLogin == 1) {

package/package.json

@@ -8,7 +8,7 @@
     "node-cache": "^5.1.2"
   },
   "name": "mdkcontroller",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "keywords": [],
   "author": "KHANHNBD <khanh272421@gmail.com>",
   "license": "ISC",
@@ -25,4 +25,4 @@
     "Cores/",
     "dk_modules/"
   ]
-}
+}