mbkauthe 2.2.0 → 2.3.0

package/index.js

@@ -16,7 +16,7 @@ if (process.env.test === "dev") {
     app.use(router);
     app.use((req, res) => {
         console.log(`Path not found: ${req.method} ${req.url}`);
-        return res.status(404).render("Error/dError.handlebars", {
+        return renderError(res, {
             layout: false,
             code: 404,
             error: "Not Found",

package/lib/config.js

@@ -158,6 +158,7 @@ try {
 
 // Helper function to render error pages consistently
 const renderError = (res, { code, error, message, page, pagename, details }) => {
+    res.status(code);
     const renderData = {
         layout: false,
         code,

package/lib/main.js

@@ -776,13 +776,13 @@ router.get('/mbkauthe/api/github/login', GitHubOAuthLimit, (req, res, next) => {
     passport.authenticate('github-login')(req, res, next);
   }
   else {
-    return res.status(403).send(renderError(res, {
+    return renderError(res, {
       code: '403',
       error: 'GitHub Login Disabled',
       message: 'GitHub login is currently disabled. Please use your username and password to log in.',
       page: '/mbkauthe/login',
       pagename: 'Login',
-    }).render());
+    });
   }
 });
 
@@ -800,53 +800,53 @@ router.get('/mbkauthe/api/github/login/callback',
         // Map error codes to user-friendly messages
         switch (err.code) {
           case 'GITHUB_NOT_LINKED':
-            return res.status(403).send(renderError(res, {
+            return renderError(res, {
               code: '403',
               error: 'GitHub Account Not Linked',
               message: 'Your GitHub account is not linked to any user in our system. To link your GitHub account, a User must connect their GitHub account to mbktech account through the user settings.',
               page: '/mbkauthe/login',
               pagename: 'Login'
-            }).render());
+            });
 
           case 'ACCOUNT_INACTIVE':
-            return res.status(403).send(renderError(res, {
+            return renderError(res, {
               code: '403',
               error: 'Account Inactive',
               message: 'Your account has been deactivated. Please contact your administrator.',
               page: '/mbkauthe/login',
               pagename: 'Login'
-            }).render());
+            });
 
           case 'NOT_AUTHORIZED':
-            return res.status(403).send(renderError(res, {
+            return renderError(res, {
               code: '403',
               error: 'Not Authorized',
               message: `You are not authorized to access ${mbkautheVar.APP_NAME}. Please contact your administrator.`,
               page: '/mbkauthe/login',
               pagename: 'Login'
-            }).render());
+            });
 
           default:
-            return res.status(500).send(renderError(res, {
+            return renderError(res, {
               code: '500',
               error: 'Authentication Error',
               message: 'An error occurred during GitHub authentication. Please try again.',
               page: '/mbkauthe/login',
               pagename: 'Login',
               details: process.env.NODE_ENV === 'development' ? `${err.message}\n${err.stack}` : 'Error details hidden in production'
-            }).render());
+            });
         }
       }
 
       if (!user) {
         console.error('[mbkauthe] GitHub callback: No user data received');
-        return res.status(401).send(renderError(res, {
+        return renderError(res, {
           code: '401',
           error: 'Authentication Failed',
           message: 'GitHub authentication failed. Please try again.',
           page: '/mbkauthe/login',
           pagename: 'Login'
-        }).render());
+        });
       }
 
       // Authentication successful, attach user to request
@@ -874,14 +874,14 @@ router.get('/mbkauthe/api/github/login/callback',
 
       if (userResult.rows.length === 0) {
         console.error(`[mbkauthe] GitHub login: User not found: ${githubUser.username}`);
-        return res.status(404).send(renderError(res, {
+        return renderError(res, {
           code: '404',
           error: 'User Not Found',
           message: 'Your GitHub account is linked, but the user account no longer exists in our system.',
           page: '/mbkauthe/login',
           pagename: 'Login',
           details: `GitHub username: ${githubUser.username}\nPlease contact your administrator.`
-        }).render());
+        });
       }
 
       const user = userResult.rows[0];
@@ -946,14 +946,14 @@ router.get('/mbkauthe/api/github/login/callback',
 
     } catch (err) {
       console.error('[mbkauthe] GitHub login callback error:', err);
-      return res.status(500).send(renderError(res, {
+      return renderError(res, {
         code: '500',
         error: 'Internal Server Error',
         message: 'An error occurred during GitHub authentication. Please try again.',
         page: '/mbkauthe/login',
         pagename: 'Login',
         details: process.env.NODE_ENV === 'development' ? `${err.message}\n${err.stack}` : 'Error details hidden in production'
-      }).render());
+      });
     }
   }
 );

package/package.json

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