mdkcontroller 1.4.7 → 1.4.9

package/Cores/file/dk.js

@@ -84,7 +84,7 @@ const DK = {
                 overlay_box.classList.add('dk-overlay_box');
                 if (overlay_box) {
                     const closeX = document.createElement('span');
-                    closeX.innerHTML = '<img src="' + (DK.varHide.currentScriptPath + '/close.png') + '" style="width:40px; height: 40px; object-fit: cover; position: absolute; margin: -15px;"/>';
+                    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);
                     };
@@ -94,7 +94,7 @@ const DK = {
                     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; 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: () => {
@@ -164,14 +162,14 @@ const DK = {
         if (isModule) scriptJS.type = "module";
         document.getElementsByTagName("head")[0].appendChild(scriptJS);
     },
-    Login: (username, password) => {
+    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 })
+            body: JSON.stringify({ userName: username, password: password, newPassword: newPassword })
         })
             .then((response) => response.json())
             .then((data) => {

package/Cores/login/index.html

@@ -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,7 +142,7 @@
         }
 
         button {
-            margin-top: 30px;
+            margin-top: 10px;
             height: 54px;
             width: 100%;
             background-color: #ffffff;
@@ -155,7 +154,7 @@
         }
 
         .social {
-            margin-top: 30px;
+            margin-top: 10px;
             display: flex;
         }
 
@@ -197,6 +196,19 @@
         <label for="password">Password</label>
         <input type="password" placeholder="Password" id="password" name="password">
 
+        <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">
@@ -218,7 +230,7 @@
             if (true) {
                 const form = event.currentTarget;
                 const formData = new FormData(form);
-                DK.Login(formData.get('userName'), formData.get('password'));
+                DK.Login(formData.get('userName'), formData.get('password'), formData.get('passwordChange') || '');
             }
             return false;
         });

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();
@@ -51,12 +56,12 @@ export default (router, db) => {
     router.post("/users/loginByCenter", async (req, res) => {
         const bodyParser = req.body;
         if (bodyParser.tokenWS) {
-            fetch(`https://kkvalidatecenter.khanhnbd.io.vn/validateForApp`, {
-                method: "GET",
+            fetch(`https://kkvalidatecenter.khanhnbd.io.vn/loginByToken`, {
+                method: "POST",
                 headers: {
                     'Content-Type': 'application/json',
-                    'Authorization': "Bearer " + bodyParser.tokenWS
-                }
+                },
+                body: JSON.stringify({ sign: bodyParser.tokenWS })
             }).then(response => {
                 if (response.ok) {
                     return response.json()

package/package.json

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