mbkauthe 1.0.12 → 1.0.13

package/lib/main.js

@@ -63,6 +63,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) {
@@ -103,9 +122,7 @@ router.post("/mbkauthe/api/terminateAllSessions", authenticate(mbkautheVar.Main_
     req.session.destroy((err) => {
       if (err) {
         console.log("Error destroying session:", err);
-        return res
-          .status(500)
-          .json({ success: false, message: "Failed to terminate sessions" });
+        return res.status(500).json({ success: false, message: "Failed to terminate sessions" });
       }
       console.log("All sessions terminated successfully");
       res.status(200).json({
@@ -171,7 +188,7 @@ router.post("/mbkauthe/api/login", async (req, res) => {
 
     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,9 @@ 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
-    });
-    console.log(`Cookie set for user: ${user.UserName}, sessionId: ${sessionId}`); // Log cookie setting
 
     console.log(`User "${username}" logged in successfully`);
     res.status(200).json({

package/package.json

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