mbkauthe 1.3.0 → 1.3.2

package/lib/main.js

@@ -410,88 +410,22 @@ async function getLatestVersion() {
   }
 }
 
-async function getPackageLock() {
-  const packageLockPath = path.resolve(process.cwd(), "package-lock.json");
-
-  return new Promise((resolve, reject) => {
-    fs.readFile(packageLockPath, "utf8", (err, data) => {
-      if (err) {
-        console.error("[mbkauthe] Error reading package-lock.json:", err);
-        return reject({ success: false, message: "Failed to read package-lock.json" });
-      }
-      try {
-        const packageLock = JSON.parse(data);
-        const mbkautheData = {
-          name: 'mbkauthe',
-          version: packageLock.packages['node_modules/mbkauthe']?.version || packageJson.version,
-          resolved: packageLock.packages['node_modules/mbkauthe']?.resolved || '',
-          integrity: packageLock.packages['node_modules/mbkauthe']?.integrity || '',
-          license: packageLock.packages['node_modules/mbkauthe']?.license || packageJson.license,
-          dependencies: packageLock.packages['node_modules/mbkauthe']?.dependencies || {}
-        };
-        const rootDependency = packageLock.dependencies?.mbkauthe || {};
-        resolve({ mbkautheData, rootDependency });
-      } catch (parseError) {
-        console.error("[mbkauthe] Error parsing package-lock.json:", parseError);
-        reject("Error parsing package-lock.json");
-      }
-    });
-  });
-}
-
-function formatJson(json) {
-  if (typeof json === 'string') {
-    try {
-      json = JSON.parse(json);
-    } catch (e) {
-      return json;
-    }
-  }
-
-  // First stringify with proper indentation
-  let jsonString = JSON.stringify(json, null, 2);
-
-  // Escape HTML special characters EXCEPT for our span tags
-  jsonString = jsonString
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
-
-  // Now apply syntax highlighting (after escaping)
-  jsonString = jsonString
-    // Highlight keys
-    .replace(/"([^"]+)":/g, '"<span style="color: #2b6cb0;">$1</span>":')
-    // Highlight string values
-    .replace(/:\s*"([^"]+)"/g, ': "<span style="color: #38a169;">$1</span>"')
-    // Highlight numbers
-    .replace(/: (\d+)/g, ': <span style="color: #dd6b20;">$1</span>')
-    // Highlight booleans and null
-    .replace(/: (true|false|null)/g, ': <span style="color: #805ad5;">$1</span>');
-
-  return jsonString;
-}
-
 router.get(["/mbkauthe/info", "/mbkauthe/i"], LoginLimit, async (_, res) => {
-  let pkgl = {};
   let latestVersion;
 
   try {
-    pkgl = await getPackageLock();
     latestVersion = await getLatestVersion();
     //latestVersion = "Under Development"; // Placeholder for the latest version
   } catch (err) {
     console.error("[mbkauthe] Error fetching package-lock.json:", err);
-    pkgl = { error: "Failed to fetch package-lock.json" };
   }
-  console.log(pkgl);
+
   try {
     res.render("info.handlebars", {
       layout: false,
       mbkautheVar: mbkautheVar,
       version: packageJson.version,
       latestVersion,
-      packageJson: packageJson.stringify,
-      packageLock: formatJson(pkgl),
     });
   } catch (err) {
     console.error("[mbkauthe] Error fetching version information:", err);

package/lib/validateSessionAndRole.js

@@ -113,7 +113,7 @@ async function validateSession(req, res, next) {
   }
 }
 
-const checkRolePermission = (requiredRole) => {
+const checkRolePermission = (requiredRole, notAllowed) => {
   return async (req, res, next) => {
     try {
       if (!req.session || !req.session.user || !req.session.user.id) {
@@ -129,10 +129,6 @@ const checkRolePermission = (requiredRole) => {
         });
       }
 
-      if (requiredRole === "Any" || requiredRole === "any") {
-        return next();
-      }
-
       const userId = req.session.user.id;
 
       const query = `SELECT "Role" FROM "Users" WHERE "id" = $1`;
@@ -143,6 +139,23 @@ const checkRolePermission = (requiredRole) => {
       }
 
       const userRole = result.rows[0].Role;
+
+      // Check notAllowed role
+      if (notAllowed && userRole === notAllowed) {
+        return res.render("Error/dError.handlebars", {
+          layout: false,
+          code: 403,
+          error: "Access Denied",
+          message: `You are not allowed to access this resource with role: ${notAllowed}`,
+          pagename: "Home",
+          page: `/${mbkautheVar.loginRedirectURL}`
+        });
+      }
+
+      if (requiredRole === "Any" || requiredRole === "any") {
+        return next();
+      }
+
       if (userRole !== requiredRole) {
         return res.render("Error/dError.handlebars", {
           layout: false,
@@ -162,10 +175,10 @@ const checkRolePermission = (requiredRole) => {
   };
 };
 
-const validateSessionAndRole = (requiredRole) => {
+const validateSessionAndRole = (requiredRole, notAllowed) => {
   return async (req, res, next) => {
     await validateSession(req, res, async () => {
-      await checkRolePermission(requiredRole)(req, res, next);
+      await checkRolePermission(requiredRole, notAllowed)(req, res, next);
     });
   };
 };

package/package.json

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

package/views/Error/dError.handlebars

@@ -443,13 +443,11 @@
 
     .status-box:hover {
       box-shadow: var(--shadow-lg);
-      transform: scale(1.05);
     }
 
     .status-code {
       text-align: center;
-      margin-bottom: 1rem;
-      font-size: 2.5rem;
+      font-size: 4rem;
       font-weight: 700;
       color: var(--success);
       position: relative;
@@ -465,7 +463,7 @@
     .status-code::after {
       content: '';
       position: absolute;
-      bottom: -10px;
+      bottom: 10px;
       left: 50%;
       transform: translateX(-50%);
       width: 100px;
@@ -502,7 +500,7 @@
 
     .status-link:hover {
       text-decoration: underline;
-      color: var(--primary-dark);
+      color: #4057be;
     }
 
     .details-wrapper {
@@ -628,6 +626,35 @@
         transform: translateY(-20px) rotate(5deg);
       }
     }
+
+    @media (max-width: 768px) {
+
+      .version-info {
+        bottom: 10px;
+        right: 10px;
+        font-size: 0.7rem;
+        padding: 6px 10px;
+      }
+    }
+
+    .version-info {
+      position: fixed;
+      bottom: 20px;
+      right: 20px;
+      background: var(--dark-light);
+      color: var(--gray);
+      padding: 8px 12px;
+      border-radius: var(--radius-sm);
+      font-size: 0.75rem;
+      border: 1px solid var(--glass-border);
+      z-index: 999;
+      transition: var(--transition);
+    }
+
+    .version-info:hover {
+      color: var(--primary);
+      border-color: var(--primary);
+    }
   </style>
 </head>
 
@@ -637,7 +664,7 @@
       <div class="navbar">
         <a class="logo">
           <img src="https://mbktechstudio.com/Assets/Images/Icon/dgicon.svg" alt="MBK Tech Studio Logo">
-          <span class="logo-text">MBK Authe</span>
+          <span class="logo-text">{{#if app}}{{app}}{{else}}MBK Authe{{/if}}</span>
         </a>
       </div>
     </nav>
@@ -683,6 +710,10 @@
 
     </div>
   </section>
+  <!-- Version Info -->
+  <div class="version-info">
+    v{{version}}
+  </div>
   <script>
     function toggleDetailsDropdown(element) {
       const errorDetailsWrapper = element.querySelector('.error-details-wrapper');

package/views/info.handlebars

@@ -96,46 +96,6 @@
             color: var(--text-color);
         }
 
-        .json-container {
-            background: #252525;
-            border: 1px solid var(--border-color);
-            border-radius: 6px;
-            padding: 12px;
-            margin-top: 10px;
-            max-height: 400px;
-            overflow: auto;
-            font-family: 'Fira Code', 'Consolas', 'Monaco', monospace;
-            font-size: 0.85em;
-            white-space: pre-wrap;
-            position: relative;
-        }
-
-        .json-container pre {
-            margin: 0;
-            font-family: inherit;
-        }
-
-        .json-container .key {
-            color: var(--key-color);
-        }
-
-        .json-container .string {
-            color: var(--string-color);
-        }
-
-        .json-container .number {
-            color: var(--number-color);
-        }
-
-        .json-container .boolean {
-            color: var(--boolean-color);
-        }
-
-        .json-container .null {
-            color: var(--boolean-color);
-            opacity: 0.7;
-        }
-
         .version-status {
             display: inline-block;
             padding: 3px 10px;
@@ -163,30 +123,6 @@
             border: 1px solid var(--warning);
         }
 
-        .copy-btn {
-            background: var(--primary-dark);
-            color: white;
-            border: none;
-            padding: 5px 12px;
-            border-radius: 4px;
-            cursor: pointer;
-            font-size: 0.8em;
-            transition: all 0.2s ease;
-            display: flex;
-            align-items: center;
-            gap: 5px;
-        }
-
-        .copy-btn:hover {
-            background: var(--primary);
-            transform: translateY(-1px);
-        }
-
-        .copy-btn:active {
-            transform: translateY(0);
-        }
-
-        /* Scrollbar styling */
         ::-webkit-scrollbar {
             width: 8px;
             height: 8px;
@@ -293,86 +229,8 @@
             </div>
         </div>
 
-        <div class="info-section">
-            <h2>
-                Package Information
-                <button class="copy-btn tooltip" onclick="copyToClipboard('package-json')">
-                    <span class="tooltiptext">Copy to clipboard</span>
-                    Copy JSON
-                </button>
-            </h2>
-            <div id="package-json" class="json-container">
-                <pre>{{packageJson}}</pre>
-            </div>
-        </div>
-
-        <div class="info-section">
-            <h2>
-                Package Lock
-                <button class="copy-btn tooltip" onclick="copyToClipboard('package-lock')">
-                    <span class="tooltiptext">Copy to clipboard</span>
-                    Copy JSON
-                </button>
-            </h2>
-            <div id="package-lock" class="json-container">
-                <pre>{{packageLockJson}}</pre>
-            </div>
-        </div>
     </div>
 
-    <script>
-        document.addEventListener('DOMContentLoaded', function () {
-            // Apply syntax highlighting to all JSON containers
-            const jsonContainers = document.querySelectorAll('.json-container pre');
-            jsonContainers.forEach(container => {
-                container.innerHTML = syntaxHighlight(container.textContent);
-            });
-        });
-
-        function syntaxHighlight(json) {
-            if (typeof json !== 'string') {
-                json = JSON.stringify(json, null, 2);
-            }
-
-            // Escape HTML
-            json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-
-            // Apply syntax highlighting
-            return json.replace(
-                /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g,
-                function (match) {
-                    let cls = 'number';
-                    if (/^"/.test(match)) {
-                        if (/:$/.test(match)) {
-                            cls = 'key';
-                        } else {
-                            cls = 'string';
-                        }
-                    } else if (/true|false/.test(match)) {
-                        cls = 'boolean';
-                    } else if (/null/.test(match)) {
-                        cls = 'null';
-                    }
-                    return '<span class="' + cls + '">' + match + '</span>';
-                }
-            );
-        }
-
-        function copyToClipboard(elementId) {
-            const element = document.getElementById(elementId);
-            const text = element.textContent;
-            navigator.clipboard.writeText(text).then(() => {
-                const btn = element.parentElement.querySelector('.copy-btn');
-                const originalText = btn.innerHTML;
-                btn.innerHTML = '<span class="tooltiptext">Copied!</span>✓ Copied';
-                setTimeout(() => {
-                    btn.innerHTML = '<span class="tooltiptext">Copy to clipboard</span>' + originalText.replace('✓ Copied', 'Copy JSON');
-                }, 2000);
-            }).catch(err => {
-                console.error('[mbkauthe] Failed to copy text: ', err);
-            });
-        }
-    </script>
 </body>
 
 </html>

package/views/loginmbkauthe.handlebars

@@ -663,7 +663,7 @@
                 })
             })
                 .then(response => response.json())
-                .then data => {
+                .then(data => {
                     if (data.success) {
                         if (data.twoFactorRequired) {
                             // Redirect to 2FA page