mdkcontroller 1.4.8 → 1.4.10

package/demoApp.js

@@ -26,13 +26,30 @@ const _sv = await Root("khanhnbd", cfg);
 global.db.data.yourTableName = global.db.data.yourTableName ?? [];
 
 const newRouterApi = Router();
-newRouterApi.get("/demoFunction/gets", authCrypt.validate, (req, res) => {
+newRouterApi.get("/demoFunction/gets", global.auth.validate, (req, res) => {
     res.json({ message: "Get all users" });
 });
 newRouterApi.get('/demoPhase2/CallNonAuth', async (req, res) => {
-    const accessToken = req.cookies?.access_token;
-
-    res.redirect('/login');
+    if (req.user) {
+        const accessToken = req.user.accessTokenSQL;
+        if (accessToken) {
+            fetch("https://kkvalidatecenter.khanhnbd.io.vn/select?table=MovieItem", {
+                method: "GET",
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${accessToken}`
+                },
+            }).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 => {
+                    res.json({ message: "Access granted", data: data });
+                });
+        }
+    }
 });
 global.app.use("/api", newRouterApi);
 

package/dk_modules/authorization.js

@@ -9,6 +9,7 @@ export default function () {
             userId: user.id,
             username: user.username,
             signcode: user.signcode,
+            accessTokenSQL: user.accessTokenSQL || null
         };
         const token = jwt.sign(payload, secretKey);
         return token;
@@ -49,6 +50,7 @@ export default function () {
                 return -1;
             }
             req.user = userO;
+            req.user.accessTokenSQL = jwtValidate.accessTokenSQL;
             const expiredValue = new Date();
             expiredValue.setMonth(expiredValue.getMonth() + 1);
             res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });

package/dk_modules/users.js

@@ -56,17 +56,18 @@ 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
-                }
-            }).then(response => {
+                },
+                body: JSON.stringify({ sign: bodyParser.tokenWS, DatabaseName: global.appName })
+            }).then(async response => {
                 if (response.ok) {
                     return response.json()
                 }
-                return { success: false, message: "Yêu cầu tới server không thành công." };
+                const text = await response.text();
+                return { success: false, message: `${response.status}-${text}` };
             })
                 .then(data => {
                     if (data.userName) {
@@ -85,8 +86,14 @@ export default (router, db) => {
                                 tbUser.push(userLoging);
                                 db.write();
                             }
+                            const payloadX = {
+                                id: userLoging.id,
+                                username: userLoging.username,
+                                signcode: userLoging.signcode,
+                                accessTokenSQL: data.access_token
+                            }
                             const userIdCode = auth.encrypt(userLoging.username);
-                            const accessToken = auth.createJWT(userLoging);
+                            const accessToken = auth.createJWT(payloadX);
                             const expiredValue = new Date();
                             expiredValue.setMonth(expiredValue.getMonth() + 1);
                             res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });
@@ -98,7 +105,7 @@ export default (router, db) => {
                             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 })
+                        res.json({ message: data.message || `Token không hợp lệ hoặc đã hết hạn.`, success: false })
                     }
                 });
         } else {

package/main.js

@@ -23,11 +23,60 @@ export default async function (appname, cfgHandler = {}) {
     const db = await dbInstant(appname + "-Database.json");
     const auth = authInstant();
     const userRoutes = userInstant(Router(), db);
+    global.appName = appname;
     global.db = db;
     global.app = app;
     global.auth = auth;
     global.webAppPath = __parentAppPath;
-
+    global.dksql = {
+        select: (accessToken, tableName, andQuery = "") => {
+            if (andQuery) {
+                andQuery = "&" + andQuery;
+            }
+            return fetch(`https://kkvalidatecenter.khanhnbd.io.vn/select?table=${tableName}${andQuery}`, {
+                method: "GET",
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${accessToken}`
+                },
+            }).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." };
+            });
+        },
+        update: (accessToken, data) => {
+            return fetch(`https://kkvalidatecenter.khanhnbd.io.vn/update`, {
+                method: "POST",
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${accessToken}`
+                },
+                body: JSON.stringify(data)
+            }).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." };
+            });
+        },
+        delete: (accessToken, data) => {
+            return fetch(`https://kkvalidatecenter.khanhnbd.io.vn/delete`, {
+                method: "DELETE",
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${accessToken}`
+                },
+                body: JSON.stringify(data)
+            }).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." };
+            });
+        }
+    };
     global.generateRandomString = (length = 8) => {
         const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         let result = '';

package/package.json

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