mbkauthe 1.1.10 → 1.1.12

package/lib/info.js

@@ -20,7 +20,7 @@ router.get("/mbkauthe/login", (req, res) => {
     layout: false,
     customURL: mbkautheVar.loginRedirectURL || '/home',
     userLoggedIn: !!req.session?.user,
-    UserName: req.session?.user?.username || ''
+    username: req.session?.user?.username || ''
   });
 });
 

package/lib/main.js

@@ -18,6 +18,10 @@ const mbkautheVar = JSON.parse(process.env.mbkautheVar);
 
 const router = express.Router();
 
+router.use(express.json());
+router.use(express.urlencoded({ extended: true }));
+router.use(cookieParser());
+
 router.use((req, res, next) => {
   const origin = req.headers.origin;
   if (origin && origin.endsWith(`.${mbkautheVar.DOMAIN}`)) {
@@ -28,10 +32,6 @@ router.use((req, res, next) => {
   }
   next();
 });
-router.use(mbkautheinfo);
-router.use(express.json());
-router.use(express.urlencoded({ extended: true }));
-router.use(cookieParser());
 
 const LoginLimit = rateLimit({
   windowMs: 1 * 60 * 1000,
@@ -211,7 +211,7 @@ router.post("/mbkauthe/api/login", LoginLimit, async (req, res) => {
 
     if (user.Role !== "SuperAdmin") {
       const allowedApps = user.AllowedApps;
-      if (!allowedApps || !allowedApps.includes(mbkautheVar.APP_NAME)) {
+      if (!allowedApps || !allowedApps.some(app => app.toLowerCase() === mbkautheVar.APP_NAME.toLowerCase())) {
         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}\"` });
       }
@@ -335,4 +335,6 @@ router.post("/mbkauthe/api/logout", async (req, res) => {
   }
 });
 
+router.use(mbkautheinfo);
+
 export default router;

package/lib/validateSessionAndRole.js

@@ -76,7 +76,7 @@ async function validateSession(req, res, next) {
 
     if (userResult.Role !== "SuperAdmin") {
       const allowedApps = userResult.AllowedApps;
-      if (!allowedApps || !allowedApps.includes(mbkautheVar.APP_NAME)) {
+      if (!allowedApps || !allowedApps.some(app => app.toLowerCase() === mbkautheVar.APP_NAME.toLowerCase())) {
         console.warn(`User \"${req.session.user.username}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
         req.session.destroy();
         const cookieOptions = getCookieOptions();
@@ -212,100 +212,100 @@ const authenticate = (authentication) => {
 };
 
 const authapi = (requiredRole = []) => {
-    return (req, res, next) => {
-        const token = req.headers["authorization"];
+  return (req, res, next) => {
+    const token = req.headers["authorization"];
 
-        if (typeof token === 'string') {
-            console.log("[authapi] Received request with token:", token[0] + token[1] + token[2], ".....", token[63]);
-        } else {
-            console.log("[authapi] Token is not a valid string:", token);
-        }
+    if (typeof token === 'string') {
+      console.log("[authapi] Received request with token:", token[0] + token[1] + token[2], ".....", token[63]);
+    } else {
+      console.log("[authapi] Token is not a valid string:", token);
+    }
 
-        if (!token) {
-            console.log("[authapi] No token provided in the request headers");
-            return res.status(401).json({
-                success: false,
-                message: "Authorization token is required"
-            });
-        }
+    if (!token) {
+      console.log("[authapi] No token provided in the request headers");
+      return res.status(401).json({
+        success: false,
+        message: "Authorization token is required"
+      });
+    }
+
+    console.log("[authapi] Querying database to validate token");
+    const tokenQuery = 'SELECT * FROM "UserAuthApiKey" WHERE "key" = $1';
+    pool.query(tokenQuery, [token], (err, result) => {
+      if (err) {
+        console.error("[authapi] Database query error while validating token:", err);
+        return res.status(500).json({
+          success: false,
+          message: "Internal Server Error"
+        });
+      }
+
+      if (result.rows.length === 0) {
+        console.log("[authapi] Invalid token provided:", token);
+        return res.status(401).json({
+          success: false,
+          message: "The AuthApiToken Is Invalid"
+        });
+      }
+
+      const username = result.rows[0].username;
+      console.log("[authapi] Token is valid. Associated username:", username);
 
-        console.log("[authapi] Querying database to validate token");
-        const tokenQuery = 'SELECT * FROM "UserAuthApiKey" WHERE "key" = $1';
-        pool.query(tokenQuery, [token], (err, result) => {
-            if (err) {
-                console.error("[authapi] Database query error while validating token:", err);
-                return res.status(500).json({
-                    success: false,
-                    message: "Internal Server Error"
-                });
-            }
-
-            if (result.rows.length === 0) {
-                console.log("[authapi] Invalid token provided:", token);
-                return res.status(401).json({
-                    success: false,
-                    message: "The AuthApiToken Is Invalid"
-                });
-            }
-
-            const username = result.rows[0].username;
-            console.log("[authapi] Token is valid. Associated username:", username);
-
-            console.log("[authapi] Querying database to validate user and role");
-            const userQuery = `
+      console.log("[authapi] Querying database to validate user and role");
+      const userQuery = `
                 SELECT id, "UserName", "Active", "Role" FROM "Users"
                 WHERE "UserName" = $1 AND "Active" = true
             `;
 
-            pool.query(userQuery, [username], (err, userResult) => {
-                if (err) {
-                    console.error("[authapi] Database query error while validating user:", err);
-                    return res.status(500).json({
-                        success: false,
-                        message: "Internal Server Error"
-                    });
-                }
-
-                if (userResult.rows.length === 0) {
-                    console.log("[authapi] User does not exist or is not active. Username:", username);
-                    return res.status(401).json({
-                        success: false,
-                        message: "User does not exist or is not active",
-                    });
-                }
-
-                if (username === "demo") {
-                    console.log("[authapi] Demo user attempted to access an endpoint. Access denied.");
-                    return res.status(401).json({
-                        success: false,
-                        message: "Demo user is not allowed to access endpoints",
-                    });
-                }
-
-                const user = userResult.rows[0];
-                console.log("[authapi] User is valid. User details:", user);
-
-                // Check if role is required and if user has it
-                if ((requiredRole && user.Role !== requiredRole) && user.Role !== "SuperAdmin") {
-                    console.log(`[authapi] User does not have the required role. Required: ${requiredRole}, User's role: ${user.Role}`);
-                    return res.status(403).json({
-                        success: false,
-                        message: `Access denied. Required role: ${requiredRole}`,
-                    });
-                }
-
-                console.log("[authapi] User has the required role or no specific role is required. Proceeding to next middleware.");
-                req.user = {
-                    username: user.UserName,
-                    role: user.Role,
-                    // Add other user properties you might need
-                };
-
-                console.log("[authapi] Token and user validation successful. Passing control to next middleware.");
-                next();
-            });
-        });
-    };
+      pool.query(userQuery, [username], (err, userResult) => {
+        if (err) {
+          console.error("[authapi] Database query error while validating user:", err);
+          return res.status(500).json({
+            success: false,
+            message: "Internal Server Error"
+          });
+        }
+
+        if (userResult.rows.length === 0) {
+          console.log("[authapi] User does not exist or is not active. Username:", username);
+          return res.status(401).json({
+            success: false,
+            message: "User does not exist or is not active",
+          });
+        }
+
+        if (username === "demo") {
+          console.log("[authapi] Demo user attempted to access an endpoint. Access denied.");
+          return res.status(401).json({
+            success: false,
+            message: "Demo user is not allowed to access endpoints",
+          });
+        }
+
+        const user = userResult.rows[0];
+        console.log("[authapi] User is valid. User details:", user);
+
+        // Check if role is required and if user has it
+        if ((requiredRole && user.Role !== requiredRole) && user.Role !== "SuperAdmin") {
+          console.log(`[authapi] User does not have the required role. Required: ${requiredRole}, User's role: ${user.Role}`);
+          return res.status(403).json({
+            success: false,
+            message: `Access denied. Required role: ${requiredRole}`,
+          });
+        }
+
+        console.log("[authapi] User has the required role or no specific role is required. Proceeding to next middleware.");
+        req.user = {
+          username: user.UserName,
+          role: user.Role,
+          // Add other user properties you might need
+        };
+
+        console.log("[authapi] Token and user validation successful. Passing control to next middleware.");
+        next();
+      });
+    });
+  };
 };
 
 export { validateSession, checkRolePermission, validateSessionAndRole, getUserData, authenticate, authapi };

package/package.json

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

package/views/loginmbkauthe.handlebars

@@ -228,12 +228,10 @@
             cursor: pointer;
             transition: var(--transition);
             box-shadow: var(--shadow-sm);
-            margin-top: 1rem;
         }
 
         .btn-login:hover {
             background: var(--primary-dark);
-            transform: translateY(-3px);
             box-shadow: var(--shadow-md);
         }
 
@@ -420,6 +418,20 @@
         .remember-me label:hover {
             color: var(--light);
         }
+        
+        .WarningboxInfo {
+            background: var(--dark-light);
+            border: 0.5px solid var(--warning);
+            border-left: 4px solid var(--warning);
+            padding: 0.75rem 1rem;
+            border-radius: var(--radius-sm);
+            color: var(--warning);
+            font-size: 0.9rem;
+            font-weight: 500;
+            margin-top: 1rem;
+            text-align: center;
+            box-shadow: var(--shadow-sm);
+        }
     </style>
 </head>
 
@@ -485,6 +497,14 @@
                     <span id="loginButtonText">Login</span>
                 </button>
 
+                {{#if userLoggedIn }}
+                <div class="WarningboxInfo">
+                    You Are Already Logged In With username
+                    <span class="username">"<span id="headerProfileUserName">{{username}}</span>"</span>. Go To
+                    <a class="terms-link" href="/home">Home Page</a>
+                </div>
+                {{/if }}
+
                 <div class="login-links">
                     <a onclick="fpass()" class="login-link">Forgot Password?</a>
                     <a href="https://www.mbktechstudio.com/Support" target="_blank" class="login-link">Need Help?</a>
@@ -492,9 +512,9 @@
 
                 <p class="terms-info">
                     By logging in, you agree to our
-                    <a href="/info/Terms&Conditions" class="terms-link">Terms & Conditions</a>
+                    <a href="/info/Terms&Conditions" target="_blank" class="terms-link">Terms & Conditions</a>
                     and
-                    <a href="/info/PrivacyPolicy" class="terms-link">Privacy Policy</a>.
+                    <a href="/info/PrivacyPolicy" target="_blank" class="terms-link">Privacy Policy</a>.
                 </p>
             </form>
         </div>
@@ -570,10 +590,13 @@
                         } else {
                             localStorage.removeItem('rememberedUsername');
                         }
-
+                        
                         // Redirect to the appropriate page
                         const redirectUrl = new URLSearchParams(window.location.search).get('redirect');
                         window.location.href = redirectUrl ? decodeURIComponent(redirectUrl) : '{{customURL}}';
+
+                        loginButton.disabled = false;
+                        loginButtonText.textContent = 'Login';
                     } else {
                         // Handle errors
                         grecaptcha.reset();