mbkauthe 4.1.1 → 4.1.2

package/lib/middleware/auth.js

@@ -6,18 +6,13 @@ import { clearSessionCookies, cachedCookieOptions, readAccountListFromCookie } f
 async function validateSession(req, res, next) {
   if (!req.session.user) {
     console.log("[mbkauthe] User not authenticated");
-    const remembered = readAccountListFromCookie(req) || [];
-    const hasRemembered = remembered.some(acct => acct && typeof acct.sessionId === 'string' && acct.sessionId.length > 0);
-    const pageTarget = hasRemembered ? '/mbkauthe/accounts' : `/mbkauthe/login?redirect=${encodeURIComponent(req.originalUrl)}`;
-    const message = hasRemembered
-      ? "Another saved account is available. Open the switch page to continue."
-      : "You Are Not Logged In. Please Log In To Continue.";
-    return renderError(res, req, {
+    console.log("[mbkauthe]: ", req.session.user);
+    return renderError(res, {
       code: 401,
       error: "Not Logged In",
-      message,
-      pagename: hasRemembered ? "Switch Account" : "Login",
-      page: pageTarget,
+      message: "You Are Not Logged In. Please Log In To Continue.",
+      pagename: "Login",
+      page: `/mbkauthe/login?redirect=${encodeURIComponent(req.originalUrl)}`,
     });
   }
 

package/package.json

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

package/views/loginmbkauthe.handlebars

@@ -29,13 +29,13 @@
                                 <i class="fab fa-github"></i>
                                 <span>Continue with GitHub</span>
                             </a>
-                            {{/if }}
+                            {{/if}}
                             {{#if googleLoginEnabled }}
                             <a type="button" id="googleLoginBtn" class="btn-social btn-google-side">
                                 <i class="fab fa-google"></i>
                                 <span>Continue with Google</span>
                             </a>
-                            {{/if }}
+                            {{/if}}
                             <a href="/mbkauthe/accounts" id="switchacc" class="btn-social btn-switch-side">
                                 <i class="fa fa-user-group"></i>
                                 <span>Switch Account</span>
@@ -68,7 +68,7 @@
                                 <a class="terms-link" href="/mbkauthe/accounts">switch account</a>.
                             </div>
                         </div>
-                        {{/if }}
+                        {{/if}}
                         <input type="hidden" name="_csrf" value="{{csrfToken}}">
                         <div class="form-group">
                             <input id="loginUsername" class="form-input" type="text" name="username" placeholder=" "
@@ -312,7 +312,7 @@
             }
         });
 
-        { { #if githubLoginEnabled } }
+        {{#if githubLoginEnabled }}
 
         // GitHub login: Navigate directly to GitHub OAuth flow
         async function startGithubLogin() {
@@ -328,9 +328,9 @@
         const mobileGithubBtn = document.querySelector('.mobile-github-btn');
         if (githubBtn) githubBtn.addEventListener('click', startGithubLogin);
         if (mobileGithubBtn) mobileGithubBtn.addEventListener('click', startGithubLogin);
-        { {/if } }
+        {{/if}}
 
-        { { #if googleLoginEnabled } }
+        {{#if googleLoginEnabled }}
 
         // Google login: Navigate directly to Google OAuth flow
         async function startGoogleLogin() {
@@ -346,7 +346,7 @@
         const mobileGoogleBtn = document.querySelector('.mobile-google-btn');
         if (googleBtn) googleBtn.addEventListener('click', startGoogleLogin);
         if (mobileGoogleBtn) mobileGoogleBtn.addEventListener('click', startGoogleLogin);
-        { {/if } }
+        {{/if}}
     </script>
 </body>