mbkauthe 1.0.12 → 1.0.14

package/lib/main.js

@@ -25,7 +25,6 @@ try {
 } catch (error) {
   console.log("Error parsing COOKIE_EXPIRE_TIME:", error);
 }
-
 // Enable CORS for subdomains
 router.use((req, res, next) => {
   const origin = req.headers.origin;
@@ -63,6 +62,25 @@ const sessionConfig = {
 
 router.use(session(sessionConfig));
 
+
+router.use(async (req, res, next) => {
+  if (req.session && req.session.user) {
+    res.cookie("username", req.session.user.username, {
+      maxAge: COOKIE_EXPIRE_TIME,
+      path: '/', // Ensure the cookie is available on all paths
+      DOMAIN: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined,
+      secure: mbkautheVar.IS_DEPLOYED === 'true',
+    });
+    res.cookie("sessionId", req.session.user.sessionId, {
+      maxAge: COOKIE_EXPIRE_TIME,
+      path: '/',
+      DOMAIN: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined,
+      secure: mbkautheVar.IS_DEPLOYED === 'true',
+    });
+  }
+  next();
+});
+
 // Middleware to handle session restoration from sessionId cookie
 router.use(async (req, res, next) => {
   if (!req.session.user && req.cookies.sessionId) {
@@ -167,11 +185,10 @@ router.post("/mbkauthe/api/login", async (req, res) => {
     // Query to check if the username exists
     const userQuery = `SELECT * FROM "Users" WHERE "UserName" = $1`;
     const userResult = await dblogin.query(userQuery, [username]);
-    console.log("User query result:", userResult.rows); // Log user query result
 
     if (userResult.rows.length === 0) {
       console.log(`Username does not exist: ${username}`);
-      return res.status(404).json({ success: false, message: "Username does not exist" });
+      return res.status(404).json({ success: false, message: "Incorrect Username Or Password" });
     }
 
     const user = userResult.rows[0];
@@ -179,7 +196,7 @@ router.post("/mbkauthe/api/login", async (req, res) => {
     // Check if the password matches
     if (user.Password !== password) {
       console.log(`Incorrect password for username: ${username}`);
-      return res.status(401).json({ success: false, message: "Incorrect password" });
+      return res.status(401).json({ success: false, message: "Incorrect Username Or Password" });
     }
 
     // Check if the account is inactive
@@ -238,18 +255,18 @@ router.post("/mbkauthe/api/login", async (req, res) => {
     req.session.user = {
       id: user.id,
       username: user.UserName,
+      role: user.Role,
       sessionId,
     };
-    console.log(`Session stored for user: ${user.UserName}, sessionId: ${sessionId}`); // Log session storage
 
-    // Set a cookie accessible across subDOMAINs
     res.cookie("sessionId", sessionId, {
       maxAge: COOKIE_EXPIRE_TIME,
-      DOMAIN: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined, // Use DOMAIN only in production
-      httpOnly: true,
-      secure: mbkautheVar.IS_DEPLOYED === 'true', // Use secure cookies in production
+      path: '/',
+      DOMAIN: mbkautheVar.IS_DEPLOYED === 'true' ? `.${mbkautheVar.DOMAIN}` : undefined,
+      secure: mbkautheVar.IS_DEPLOYED === 'true',
     });
-    console.log(`Cookie set for user: ${user.UserName}, sessionId: ${sessionId}`); // Log cookie setting
+    console.log(req.session.user);
+
 
     console.log(`User "${username}" logged in successfully`);
     res.status(200).json({

package/lib/validateSessionAndRole.js

@@ -25,6 +25,9 @@ async function validateSession(req, res, next) {
   }
 
   if (!req.session.user) {
+    
+    console.log("User not authenticated");
+    console.log(req.session.user);
     return res.render("templates/Error/NotLoggedIn.handlebars", {
       currentUrl: req.originalUrl,
     });

package/package.json

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