mbkauthe 1.1.0 → 1.1.1

package/lib/info.js

@@ -1,12 +1,12 @@
 import express from "express";
 import fetch from 'node-fetch';
-
 import { createRequire } from "module";
-const require = createRequire(import.meta.url);
-const packageJson = require("../package.json");
 import fs from "fs";
 import path from "path";
 
+const require = createRequire(import.meta.url);
+const packageJson = require("../package.json");
+
 import dotenv from "dotenv";
 dotenv.config();
 const mbkautheVar = JSON.parse(process.env.mbkautheVar);

package/lib/main.js

@@ -17,7 +17,6 @@ const mbkautheVar = JSON.parse(process.env.mbkautheVar);
 
 const router = express.Router();
 
-// Enable CORS for subdomains
 router.use((req, res, next) => {
   const origin = req.headers.origin;
   if (origin && origin.endsWith(`.${mbkautheVar.DOMAIN}`)) {
@@ -33,7 +32,6 @@ router.use(express.json());
 router.use(express.urlencoded({ extended: true }));
 router.use(cookieParser());
 
-// Add rate limiting for sensitive operations
 const LoginLimit = rateLimit({
   windowMs: 1 * 60 * 1000,
   max: 8,
@@ -43,7 +41,6 @@ const LoginLimit = rateLimit({
   }
 });
 
-// Configure session with proper domain settings for cross-subdomain sharing
 const sessionConfig = {
   store: new PgSession({
     pool: dblogin,
@@ -53,12 +50,12 @@ const sessionConfig = {
   secret: mbkautheVar.SESSION_SECRET_KEY,
   resave: false,
   saveUninitialized: false,
-  proxy: true, // Trust the reverse proxy
+  proxy: true,
   cookie: {
     maxAge: mbkautheVar.COOKIE_EXPIRE_TIME * 24 * 60 * 60 * 1000,
     domain: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined,
     httpOnly: true,
-    secure: mbkautheVar.IS_DEPLOYED === 'true' ? 'auto' : false, // 'auto' respects X-Forwarded-Proto
+    secure: mbkautheVar.IS_DEPLOYED === 'true' ? 'auto' : false,
     sameSite: 'lax',
     path: '/'
   },
@@ -67,7 +64,6 @@ const sessionConfig = {
 
 router.use(session(sessionConfig));
 
-// Middleware to handle session restoration from sessionId cookie
 router.use(async (req, res, next) => {
   if (!req.session.user && req.cookies.sessionId) {
     try {
@@ -90,7 +86,6 @@ router.use(async (req, res, next) => {
   next();
 });
 
-// Set consistent cookie options for all cookies
 const getCookieOptions = () => ({
   maxAge: mbkautheVar.COOKIE_EXPIRE_TIME * 24 * 60 * 60 * 1000,
   domain: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined,
@@ -120,7 +115,6 @@ router.post("/mbkauthe/api/terminateAllSessions", authenticate(mbkautheVar.Main_
         return res.status(500).json({ success: false, message: "Failed to terminate sessions" });
       }
 
-      // Clear all cookies with proper domain
       const cookieOptions = getCookieOptions();
       res.clearCookie("mbkauthe.sid", cookieOptions);
       res.clearCookie("sessionId", cookieOptions);
@@ -203,7 +197,6 @@ router.post("/mbkauthe/api/login", LoginLimit, async (req, res) => {
         return res.status(500).json({ success: false, errorCode: 605, message: `Internal Server Error` });
       }
     } else {
-      // Check if the password matches
       if (user.Password !== password) {
         console.log(`Incorrect password for username: ${username}`);
         return res.status(401).json({ success: false, errorCode: 603, message: "Incorrect Username Or Password" });
@@ -286,10 +279,8 @@ router.post("/mbkauthe/api/logout", async (req, res) => {
     try {
       const { id, username } = req.session.user;
 
-      // Clear the SessionId in the database first
       await dblogin.query(`UPDATE "Users" SET "SessionId" = NULL WHERE "id" = $1`, [id]);
 
-      // Remove the session from the session table
       if (req.sessionID) {
         await dblogin.query('DELETE FROM "session" WHERE sid = $1', [req.sessionID]);
       }
@@ -300,7 +291,6 @@ router.post("/mbkauthe/api/logout", async (req, res) => {
           return res.status(500).json({ success: false, message: "Logout failed" });
         }
 
-        // Clear all cookies with proper domain
         const cookieOptions = getCookieOptions();
         res.clearCookie("mbkauthe.sid", cookieOptions);
         res.clearCookie("sessionId", cookieOptions);

package/lib/pool.js

@@ -15,28 +15,27 @@ if (!mbkautheVar) {
 }
 const requiredKeys = ["APP_NAME", "RECAPTCHA_Enabled", "SESSION_SECRET_KEY", "IS_DEPLOYED", "LOGIN_DB", "MBKAUTH_TWO_FA_ENABLE", "DOMAIN"];
 requiredKeys.forEach(key => {
-  if (!mbkautheVar[key]) {
-    throw new Error(`mbkautheVar.${key} is required`);
-  }
+    if (!mbkautheVar[key]) {
+        throw new Error(`mbkautheVar.${key} is required`);
+    }
 });
 if (mbkautheVar.RECAPTCHA_Enabled === "true") {
-  if (mbkautheVar.RECAPTCHA_SECRET_KEY === undefined) {
-    throw new Error("mbkautheVar.RECAPTCHA_SECRET_KEY is required");
-  }
+    if (mbkautheVar.RECAPTCHA_SECRET_KEY === undefined) {
+        throw new Error("mbkautheVar.RECAPTCHA_SECRET_KEY is required");
+    }
 }
 if (mbkautheVar.COOKIE_EXPIRE_TIME !== undefined) {
-  const expireTime = parseFloat(mbkautheVar.COOKIE_EXPIRE_TIME);
-  if (isNaN(expireTime) || expireTime <= 0) {
-    throw new Error("mbkautheVar.COOKIE_EXPIRE_TIME must be a valid positive number");
-  }
+    const expireTime = parseFloat(mbkautheVar.COOKIE_EXPIRE_TIME);
+    if (isNaN(expireTime) || expireTime <= 0) {
+        throw new Error("mbkautheVar.COOKIE_EXPIRE_TIME must be a valid positive number");
+    }
 }
 if (mbkautheVar.BypassUsers !== undefined) {
-  if (!Array.isArray(mbkautheVar.BypassUsers)) {
-    throw new Error("mbkautheVar.BypassUsers must be a valid array");
-  }
+    if (!Array.isArray(mbkautheVar.BypassUsers)) {
+        throw new Error("mbkautheVar.BypassUsers must be a valid array");
+    }
 }
 
-// PostgreSQL connection pool for pool
 const poolConfig = {
   connectionString: mbkautheVar.LOGIN_DB,
   ssl: {
@@ -47,7 +46,6 @@ const poolConfig = {
 
 export const dblogin = new Pool(poolConfig);
 
-// Test connection for pool
 (async () => {
   try {
     const client = await dblogin.connect();

package/lib/validateSessionAndRole.js

@@ -1,7 +1,6 @@
 import { dblogin } from "./pool.js";
 const mbkautheVar = JSON.parse(process.env.mbkautheVar);
 
-// Get consistent cookie options
 const getCookieOptions = () => ({
   maxAge: mbkautheVar.COOKIE_EXPIRE_TIME * 24 * 60 * 60 * 1000,
   domain: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined,
@@ -12,7 +11,6 @@ const getCookieOptions = () => ({
 });
 
 async function validateSession(req, res, next) {
-  // First check if we have a session cookie
   if (!req.session.user && req.cookies.sessionId) {
     try {
       const sessionId = req.cookies.sessionId;

package/package.json

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