mbkauthe 1.0.11 → 1.0.12

package/lib/main.js

@@ -76,6 +76,9 @@ router.use(async (req, res, next) => {
         req.session.user = {
           id: user.id,
           username: user.UserName,
+          UserName: user.UserName,
+          Role: user.Role,
+          role: user.Role,
           sessionId,
         };
         console.log(`Session restored for user: ${user.UserName}`);
@@ -186,14 +189,12 @@ router.post("/mbkauthe/api/login", async (req, res) => {
     }
 
 
-    if (mbkautheVar.test === "true") {
-      // Check if the user is authorized to use the application
-      if (user.Role !== "SuperAdmin") {
-        const allowedApps = user.AllowedApps;
-        if (!allowedApps || !allowedApps.includes(mbkautheVar.APP_NAME)) {
-          console.warn(`User \"${user.UserName}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
-          return res.status(403).json({ success: false, message: `You Are Not Authorized To Use The Application \"${mbkautheVar.APP_NAME}\"` });
-        }
+    // Check if the user is authorized to use the application
+    if (user.Role !== "SuperAdmin") {
+      const allowedApps = user.AllowedApps;
+      if (!allowedApps || !allowedApps.includes(mbkautheVar.APP_NAME)) {
+        console.warn(`User \"${user.UserName}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
+        return res.status(403).json({ success: false, message: `You Are Not Authorized To Use The Application \"${mbkautheVar.APP_NAME}\"` });
       }
     }
 

package/lib/validateSessionAndRole.js

@@ -8,7 +8,7 @@ async function validateSession(req, res, next) {
       const sessionId = req.cookies.sessionId;
       const query = `SELECT * FROM "Users" WHERE "SessionId" = $1`;
       const result = await dblogin.query(query, [sessionId]);
-      const userResult= result.rows[0];
+      const userResult = result.rows[0];
 
       if (result.rows.length > 0) {
         const user = result.rows[0];
@@ -32,9 +32,9 @@ async function validateSession(req, res, next) {
 
   try {
     const { id, sessionId } = req.session.user;
-    const query = `SELECT "SessionId", "Active", "AllowedApps" FROM "Users" WHERE "id" = $1`;
+    const query = `SELECT "SessionId", "Active", "Role", "AllowedApps" FROM "Users" WHERE "id" = $1`;
     const result = await dblogin.query(query, [id]);
-    const userResult= result.rows[0];
+    const userResult = result.rows[0];
 
     if (result.rows.length === 0 || userResult.SessionId !== sessionId) {
       console.log(`Session invalidated for user "${req.session.user.username}"`);
@@ -56,21 +56,16 @@ async function validateSession(req, res, next) {
       });
     }
 
-    if (mbkautheVar.test === "true") {
-      if (userResult.Role !== "SuperAdmin") {
-        const allowedApps = userResult.AllowedApps;
-        if (!allowedApps || !allowedApps.includes(mbkautheVar.APP_NAME)) {
-          console.log(`Allowed Apps for user "${req.session.user.username}": ${allowedApps}`);
-          console.log(!allowedApps);
-          console.log(!allowedApps.includes(mbkautheVar.APP_NAME));
-          console.warn(`User \"${req.session.user.username}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
-          req.session.destroy();
-          res.clearCookie("mbkauthe.sid", { domain: `.${mbkautheVar.DOMAIN}` });
-          res.clearCookie("sessionId", { domain: `.${mbkautheVar.DOMAIN}` });
-          return res.render("templates/Error/Error.handlebars", {
-            error: `You Are Not Authorized To Use The Application \"${mbkautheVar.APP_NAME}\"`,
-          });
-        }
+    if (userResult.Role !== "SuperAdmin") {
+      const allowedApps = userResult.AllowedApps;
+      if (!allowedApps || !allowedApps.includes(mbkautheVar.APP_NAME)) {
+        console.warn(`User \"${req.session.user.username}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
+        req.session.destroy();
+        res.clearCookie("mbkauthe.sid", { domain: `.${mbkautheVar.DOMAIN}` });
+        res.clearCookie("sessionId", { domain: `.${mbkautheVar.DOMAIN}` });
+        return res.render("templates/Error/Error.handlebars", {
+          error: `You Are Not Authorized To Use The Application \"${mbkautheVar.APP_NAME}\"`,
+        });
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkauthe",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "MBKTechStudio's reusable authentication system for Node.js applications.",
   "main": "index.js",
   "type": "module",