mbkauthe 1.1.2 → 1.1.4

package/.env.example

@@ -8,7 +8,8 @@ mbkautheVar='{
     "LOGIN_DB": "postgres://username:password@host:port/database",
     "MBKAUTH_TWO_FA_ENABLE": "false",
     "COOKIE_EXPIRE_TIME": 2,
-    "DOMAIN": "yourdomain.com"
+    "DOMAIN": "yourdomain.com",
+    "layout": false
 }'
 
 # See env.md for more details

package/README.md

@@ -94,7 +94,8 @@ mbkautheVar='{
     "LOGIN_DB": "postgres://username:password@host:port/database",
     "MBKAUTH_TWO_FA_ENABLE": "false",
     "COOKIE_EXPIRE_TIME": 2,
-    "DOMAIN": "yourdomain.com"
+    "DOMAIN": "yourdomain.com",
+    "layout": false
 }'
 ```
 

package/env.md

@@ -70,4 +70,6 @@ MBKAUTH_TWO_FA_ENABLE=false
 ```properties
 COOKIE_EXPIRE_TIME=5
 ```
-> Cookie expiration time in days. Default is `2 days`.
+> Cookie expiration time in days. Default is `2 days`.
+
+"layout": false

package/index.js

@@ -47,4 +47,5 @@ if (process.env.test === "true") {
 
 export { validateSession, checkRolePermission, validateSessionAndRole, getUserData, authenticate } from "./lib/validateSessionAndRole.js";
 export { dblogin } from "./lib/pool.js";
+export { authapi } from "./lib/authapi.js";
 export default router;

package/lib/authapi.js

@@ -0,0 +1,57 @@
+import { pool } from "./pool.js";
+
+export const authapi = () => {
+    return (req, res, next) => {
+        const token = req.headers["authorization"];
+
+        // Query to check if the token exists in UserAuthApiKey table
+        const tokenQuery = 'SELECT * FROM "UserAuthApiKey" WHERE "key" = $1';
+        pool.query(tokenQuery, [token], (err, result) => {
+            if (err) {
+                console.error("Database query error:", err);
+                return res
+                    .status(500)
+                    .json({ success: false, message: "Internal Server Error" });
+            }
+
+            if (result.rows.length === 0) {
+                console.log("Invalid token");
+                return res
+                    .status(401)
+                    .json({ success: false, message: "The AuthApiToken Is InValid" });
+            }
+
+            const username = result.rows[0].username;
+
+            // Query to check if the user exists and is active in Users table
+            const userQuery =
+                'SELECT * FROM "Users" WHERE "UserName" = $1 AND "Active" = true';
+            pool.query(userQuery, [username], (err, userResult) => {
+                if (username === "demo") {
+                    console.log("Demo user is not allowed to access this endpoint");
+                    return res.status(401).json({
+                        success: false,
+                        message: "Demo user is not allowed to access endpoints",
+                    });
+                }
+                if (err) {
+                    console.error("Database query error:", err);
+                    return res
+                        .status(500)
+                        .json({ success: false, message: "Internal Server Error" });
+                }
+
+                if (userResult.rows.length === 0) {
+                    console.log("User does not exist or is not active");
+                    return res.status(401).json({
+                        success: false,
+                        message: "User does not exist or is not active",
+                    });
+                }
+
+                console.log("Token and user are valid");
+                next();
+            });
+        });
+    };
+};

package/lib/info.js

@@ -507,9 +507,15 @@ router.get(["/mbkauthe/"], async (_, res) => {
     }
 
     // Read and process file
-    const readmePath = path.join(process.cwd(), "README.md");
+    let readmePath;
+    if (process.env.test === "true") {
+      readmePath = path.join(process.cwd(), "README.md");
+    }
+    else {
+      readmePath = path.join(process.cwd(), "./node_modules/mbkauthe/README.md");
+    }
     const data = await fs.promises.readFile(readmePath, "utf8");
-    
+
     // Convert markdown to HTML
     let html = marked(data, {
       breaks: true,
@@ -519,9 +525,9 @@ router.get(["/mbkauthe/"], async (_, res) => {
 
     // Process HTML with cheerio
     const $ = cheerio.load(html);
-    
+
     // Add IDs to headers for anchor links
-    $('h1, h2, h3, h4, h5, h6').each(function() {
+    $('h1, h2, h3, h4, h5, h6').each(function () {
       const id = $(this).text()
         .toLowerCase()
         .replace(/\s+/g, '-')
@@ -529,9 +535,9 @@ router.get(["/mbkauthe/"], async (_, res) => {
       $(this).attr('id', id);
       $(this).addClass('header-anchor');
     });
-    
+
     // Fix table of contents links and add icons
-    $('a[href^="#"]').each(function() {
+    $('a[href^="#"]').each(function () {
       const href = $(this).attr('href');
       const id = href.substring(1)
         .toLowerCase()
@@ -542,7 +548,7 @@ router.get(["/mbkauthe/"], async (_, res) => {
     });
 
     // Add copy buttons to code blocks
-    $('pre').each(function() {
+    $('pre').each(function () {
       const $pre = $(this);
       const $button = $(`<button class="copy-button" aria-label="Copy code">📋</button>`);
       $pre.prepend($button);
@@ -550,7 +556,7 @@ router.get(["/mbkauthe/"], async (_, res) => {
 
     // Create the full HTML response
     const htmlContent = generateFullHtml($.html());
-    
+
     // Update cache
     cachedHtml = htmlContent;
     cacheTimestamp = now;

package/lib/validateSessionAndRole.js

@@ -36,6 +36,7 @@ async function validateSession(req, res, next) {
     console.log("User not authenticated");
     console.log(req.session.user);
     return res.render("templates/Error/NotLoggedIn.handlebars", {
+      layout: mbkautheVar.layout === true ? true : false,
       currentUrl: req.originalUrl,
     });
   }
@@ -54,6 +55,7 @@ async function validateSession(req, res, next) {
       res.clearCookie("sessionId", cookieOptions);
       res.clearCookie("username", cookieOptions);
       return res.render("templates/Error/SessionExpire.handlebars", {
+        layout: mbkautheVar.layout === true ? true : false,
         currentUrl: req.originalUrl,
       });
     }
@@ -66,6 +68,7 @@ async function validateSession(req, res, next) {
       res.clearCookie("sessionId", cookieOptions);
       res.clearCookie("username", cookieOptions);
       return res.render("templates/Error/AccountInactive.handlebars", {
+        layout: mbkautheVar.layout === true ? true : false,
         currentUrl: req.originalUrl,
       });
     }
@@ -80,6 +83,7 @@ async function validateSession(req, res, next) {
         res.clearCookie("sessionId", cookieOptions);
         res.clearCookie("username", cookieOptions);
         return res.render("templates/Error/Error.handlebars", {
+          layout: mbkautheVar.layout === true ? true : false,
           error: `You Are Not Authorized To Use The Application \"${mbkautheVar.APP_NAME}\"`,
         });
       }
@@ -99,6 +103,7 @@ const checkRolePermission = (requiredRole) => {
         console.log("User not authenticated");
         console.log(req.session);
         return res.render("templates/Error/NotLoggedIn.handlebars", {
+          layout: mbkautheVar.layout === true ? true : false,
           currentUrl: req.originalUrl,
         });
       }
@@ -119,6 +124,7 @@ const checkRolePermission = (requiredRole) => {
       const userRole = result.rows[0].Role;
       if (userRole !== requiredRole) {
         return res.render("templates/Error/AccessDenied.handlebars", {
+          layout: mbkautheVar.layout === true ? true : false,
           currentRole: userRole,
           requiredRole: requiredRole,
         });

package/package.json

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