mbkauthe 4.1.1 → 4.1.3

package/index.js

@@ -99,4 +99,5 @@ export {
     ErrorCodes, ErrorMessages, getErrorByCode,
     createErrorResponse, logError
 } from "./lib/utils/errors.js";
+export { mbkautheVar } from "./lib/config/index.js";
 export default router;

package/lib/config/index.js

@@ -36,8 +36,6 @@ function validateConfiguration() {
             if (mbkauthShared && typeof mbkauthShared !== 'object') {
                 console.warn('[mbkauthe] mbkauthShared is not a valid object, ignoring it');
                 mbkauthShared = null;
-            } else {
-                console.log('[mbkauthe] mbkauthShared detected and parsed successfully');
             }
         }
     } catch (error) {
@@ -46,6 +44,8 @@ function validateConfiguration() {
     }
 
     // Merge fallback settings: for any key missing or empty in mbkautheVar, check mbkauthShared
+    const usedFromShared = [];
+    const usedDefaults = [];
     const applyFallback = (source, sourceName) => {
         if (!source) return;
         Object.keys(source).forEach(key => {
@@ -53,7 +53,7 @@ function validateConfiguration() {
             if ((mbkautheVar[key] === undefined || (typeof mbkautheVar[key] === 'string' && mbkautheVar[key].trim() === '')) &&
                 val !== undefined && !(typeof val === 'string' && val.trim() === '')) {
                 mbkautheVar[key] = val;
-                console.log(`[mbkauthe] Using ${key} from ${sourceName}`);
+                if (sourceName === 'mbkauthShared') usedFromShared.push(key);
             }
         });
     };
@@ -86,10 +86,10 @@ function validateConfiguration() {
         if (isEmpty) {
             if (mbkauthShared && mbkauthShared[key] !== undefined && !(typeof mbkauthShared[key] === 'string' && mbkauthShared[key].trim() === '')) {
                 mbkautheVar[key] = mbkauthShared[key];
-                console.log(`[mbkauthe] Using ${key} from mbkauthShared`);
+                if (!usedFromShared.includes(key)) usedFromShared.push(key);
             } else if (defaults[key] !== undefined) {
                 mbkautheVar[key] = defaults[key];
-                console.log(`[mbkauthe] Using default value for ${key}`);
+                usedDefaults.push(key);
             }
         }
     });
@@ -209,7 +209,16 @@ function validateConfiguration() {
         throw new Error(`[mbkauthe] Configuration Validation Failed:\n  - ${errors.join('\n  - ')}`);
     }
 
-    console.log('[mbkauthe] Configuration validation passed successfully');
+    // Print consolidated configuration summary
+    const configParts = [];
+    if (mbkauthShared) {
+        configParts.push(`mbkauthShared: ${usedFromShared.length} keys`);
+    }
+    if (usedDefaults.length > 0) {
+        configParts.push(`defaults: ${usedDefaults.length} keys`);
+    }
+    const configSummary = configParts.length > 0 ? ` (${configParts.join(', ')})` : '';
+    console.log(`[mbkauthe] Configuration loaded${configSummary}`);
     return mbkautheVar;
 }
 

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/lib/routes/oauth.js

@@ -108,6 +108,9 @@ const createOAuthStrategy = async (provider, profile, done) => {
   }
 };
 
+// Configure OAuth strategies and track enabled providers
+const enabledProviders = [];
+
 // Configure GitHub Strategy for login (only if enabled and configured)
 if ((mbkautheVar.GITHUB_LOGIN_ENABLED || "").toLowerCase() === "true") {
   if (mbkautheVar.GITHUB_CLIENT_ID && mbkautheVar.GITHUB_CLIENT_SECRET) {
@@ -119,12 +122,10 @@ if ((mbkautheVar.GITHUB_LOGIN_ENABLED || "").toLowerCase() === "true") {
     }, (accessToken, refreshToken, profile, done) =>
       createOAuthStrategy('GitHub', profile, done)
     ));
-    console.log('[mbkauthe] GitHub OAuth strategy registered');
+    enabledProviders.push('GitHub');
   } else {
     console.warn('[mbkauthe] GITHUB_LOGIN_ENABLED is true but GITHUB_CLIENT_ID/SECRET missing; skipping GitHub strategy registration');
   }
-} else {
-  console.log('[mbkauthe] GitHub OAuth not enabled; skipping GitHub strategy registration');
 }
 
 // Configure Google Strategy for login (only if enabled and configured)
@@ -138,12 +139,15 @@ if ((mbkautheVar.GOOGLE_LOGIN_ENABLED || "").toLowerCase() === "true") {
     }, (accessToken, refreshToken, profile, done) =>
       createOAuthStrategy('Google', profile, done)
     ));
-    console.log('[mbkauthe] Google OAuth strategy registered');
+    enabledProviders.push('Google');
   } else {
     console.warn('[mbkauthe] GOOGLE_LOGIN_ENABLED is true but GOOGLE_CLIENT_ID/SECRET missing; skipping Google strategy registration');
   }
-} else {
-  console.log('[mbkauthe] Google OAuth not enabled; skipping Google strategy registration');
+}
+
+// Print consolidated OAuth summary
+if (enabledProviders.length > 0) {
+  console.log(`[mbkauthe] OAuth providers: ${enabledProviders.join(', ')}`);
 }
 
 // Serialize/Deserialize user for OAuth login

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkauthe",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "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>