mbkauthe 4.7.2 → 4.8.0

package/README.md

@@ -22,7 +22,7 @@
 - PostgreSQL session management
 - Multi-session support (configurable concurrent sessions per user)
 - Optional TOTP-based 2FA with trusted devices
-- OAuth login (GitHub & Google)
+- Social login (GitHub App & Google OAuth)
 - Role-based access: SuperAdmin, NormalUser, Guest
 - CSRF protection & rate limiting
 - Easy Express.js integration
@@ -101,9 +101,9 @@ These are only mounted when `process.env.env === "dev"`:
 
 Enable via `MBKAUTH_TWO_FA_ENABLE=true`. Trusted devices can skip 2FA for a set duration.
 
-## 🔄 OAuth Integration
+## 🔄 Social Login Integration
 
-**GitHub / Google OAuth:** Configure apps and credentials via `.env` or `mbkautheVar`. Users must link accounts before login.
+**GitHub App / Google OAuth:** Configure credentials via `.env` or `mbkautheVar`. Users must link accounts before login.
 
 ## 🎨 Customization
 

package/docs/api.md

@@ -179,7 +179,7 @@ Renders the main login page.
 **Response:** HTML page with login form
 
 **Template Variables:**
-- `githubLoginEnabled` - Whether GitHub OAuth is enabled
+- `githubLoginEnabled` - Whether GitHub App login is enabled
 - `googleLoginEnabled` - Whether Google OAuth is enabled
 - `customURL` - Redirect URL after login
 - `userLoggedIn` - Whether user is already authenticated
@@ -317,8 +317,8 @@ The endpoints below are active in the router but are not fully expanded above. U
 
 **OAuth:**
 
-- `GET /mbkauthe/api/github/login` - Starts GitHub OAuth login flow.
-- `GET /mbkauthe/api/github/login/callback` - GitHub OAuth callback.
+- `GET /mbkauthe/api/github/login` - Starts GitHub App login flow.
+- `GET /mbkauthe/api/github/login/callback` - GitHub App callback.
 - `GET /mbkauthe/api/google/login` - Starts Google OAuth login flow.
 - `GET /mbkauthe/api/google/login/callback` - Google OAuth callback.
 
@@ -1222,11 +1222,11 @@ GET /mbkauthe/test
 
 ### OAuth Endpoints
 
-#### GitHub OAuth
+#### GitHub App
 
 ##### `GET /mbkauthe/api/github/login`
 
-Initiates the GitHub OAuth authentication flow.
+Initiates the GitHub App authentication flow.
 
 **Rate Limit:** 10 requests per 5 minutes
 
@@ -1235,11 +1235,11 @@ Initiates the GitHub OAuth authentication flow.
 **Query Parameters:**
 - `redirect` (optional) - Relative URL to redirect after successful authentication (must start with `/` to prevent open redirect attacks)
 
-**Response:** Redirects to GitHub OAuth authorization page
+**Response:** Redirects to GitHub authorization page
 
 **Prerequisites:**
 - `GITHUB_LOGIN_ENABLED=true` in environment
-- Valid `GITHUB_CLIENT_ID` and `GITHUB_CLIENT_SECRET` configured
+- Valid `GITHUB_APP_CLIENT_ID` and `GITHUB_APP_CLIENT_SECRET` configured
 - User's GitHub account must be linked to an MBKAuth account in `user_github` table
 
 **Example:**
@@ -1250,9 +1250,9 @@ GET /mbkauthe/api/github/login?redirect=/dashboard
 **Workflow:**
 1. User clicks "Login with GitHub"
 2. CSRF token generated and stored in session
-3. Redirects to GitHub for authorization
-4. GitHub redirects back to callback URL
-5. System verifies GitHub account is linked
+3. Redirects to GitHub authorization page
+4. GitHub redirects back to callback URL with authorization `code`
+5. System verifies `github_id` is linked
 6. If 2FA enabled, prompts for 2FA
 7. Creates session and redirects to specified URL
 
@@ -1260,7 +1260,7 @@ GET /mbkauthe/api/github/login?redirect=/dashboard
 
 ##### `GET /mbkauthe/api/github/login/callback`
 
-Handles the OAuth callback from GitHub after user authorization.
+Handles the callback from GitHub after user authorization.
 
 **Rate Limit:** Inherited from OAuth rate limiter (10 requests per 5 minutes)
 
@@ -1277,7 +1277,7 @@ Handles the OAuth callback from GitHub after user authorization.
 - **GitHub Not Linked**: Returns error if GitHub account is not in `user_github` table
 - **Account Inactive**: Returns error if user account is deactivated
 - **Not Authorized**: Returns error if user is not allowed to access the application
-- **GitHub Auth Error**: Returns error for any OAuth-related failures
+- **GitHub Auth Error**: Returns error for provider authentication failures
 
 **Success Flow:**
 ```

package/docs/db.md

@@ -85,7 +85,9 @@ CREATE TABLE IF NOT EXISTS user_github (
     user_name VARCHAR(50) REFERENCES "Users"("UserName"),
     github_id VARCHAR(255) UNIQUE,
     github_username VARCHAR(255),
-    access_token TEXT,
+    installation_id BIGINT,
+    installation_target_type VARCHAR(32),
+    access_token VARCHAR(255),
     created_at TimeStamp WITH TIME ZONE DEFAULT NOW(),
     updated_at TimeStamp WITH TIME ZONE DEFAULT NOW()
 );

package/docs/db.sql

@@ -49,11 +49,17 @@ CREATE TABLE IF NOT EXISTS user_github (
     user_name VARCHAR(50) REFERENCES "Users"("UserName"),
     github_id VARCHAR(255) UNIQUE,
     github_username VARCHAR(255),
+    installation_id BIGINT,
+    installation_target_type VARCHAR(32),
     access_token TEXT,
     created_at TimeStamp WITH TIME ZONE DEFAULT NOW(),
     updated_at TimeStamp WITH TIME ZONE DEFAULT NOW()
 );
 
+ALTER TABLE user_github
+    ADD COLUMN IF NOT EXISTS installation_id BIGINT,
+    ADD COLUMN IF NOT EXISTS installation_target_type VARCHAR(32);
+
 -- Add indexes for performance optimization
 CREATE INDEX IF NOT EXISTS idx_user_github_github_id ON user_github (github_id);
 CREATE INDEX IF NOT EXISTS idx_user_github_user_name ON user_github (user_name);

package/docs/env.md

@@ -95,14 +95,26 @@ This document describes the environment variables MBKAuth expects and keeps brie
   - Required: No
 
 - GITHUB_LOGIN_ENABLED / GOOGLE_LOGIN_ENABLED
-  - Description: Enable OAuth providers.
+  - Description: Enable social login providers.
   - Default: `false`
-  - If `true`, corresponding `*_CLIENT_ID` and `*_CLIENT_SECRET` are required.
+  - If `GOOGLE_LOGIN_ENABLED=true`, `GOOGLE_CLIENT_ID` and `GOOGLE_CLIENT_SECRET` are required.
+  - If `GITHUB_LOGIN_ENABLED=true`, GitHub App client credentials are required.
 
-- GITHUB_CLIENT_ID / GITHUB_CLIENT_SECRET / GOOGLE_CLIENT_ID / GOOGLE_CLIENT_SECRET
-  - Description: OAuth credentials (put in `mbkautheVar` preferred, or `mbkauthShared`).
-  - Required when provider enabled.
-  - Create Github OAuth App: https://github.com/settings/developers
+- GITHUB_APP_SLUG
+  - Description: GitHub App slug (optional for login flow in this package; useful for install/link flows handled elsewhere).
+  - Required: No
+  - Create GitHub App: https://github.com/settings/apps
+
+- GITHUB_APP_CLIENT_ID / GITHUB_APP_CLIENT_SECRET
+  - Description: GitHub App OAuth credentials used for user sign-in.
+  - Required when `GITHUB_LOGIN_ENABLED=true`.
+
+- GITHUB_CLIENT_ID / GITHUB_CLIENT_SECRET
+  - Description: Legacy fallback keys if app-prefixed keys are not provided.
+
+- GOOGLE_CLIENT_ID / GOOGLE_CLIENT_SECRET
+  - Description: Google OAuth credentials.
+  - Required when `GOOGLE_LOGIN_ENABLED=true`.
   - Create Google OAuth: https://console.cloud.google.com/
 
 ---

package/index.d.ts

@@ -55,8 +55,9 @@ declare module 'mbkauthe' {
     COOKIE_EXPIRE_TIME?: number;
     DEVICE_TRUST_DURATION_DAYS?: number;
     GITHUB_LOGIN_ENABLED?: 'true' | 'false' | 'f';
-    GITHUB_CLIENT_ID?: string;
-    GITHUB_CLIENT_SECRET?: string;
+    GITHUB_APP_SLUG?: string;
+    GITHUB_APP_CLIENT_ID?: string;
+    GITHUB_APP_CLIENT_SECRET?: string;
     GOOGLE_LOGIN_ENABLED?: 'true' | 'false' | 'f';
     GOOGLE_CLIENT_ID?: string;
     GOOGLE_CLIENT_SECRET?: string;
@@ -66,8 +67,9 @@ declare module 'mbkauthe' {
 
   export interface OAuthConfig {
     GITHUB_LOGIN_ENABLED?: 'true' | 'false' | 'f';
-    GITHUB_CLIENT_ID?: string;
-    GITHUB_CLIENT_SECRET?: string;
+    GITHUB_APP_SLUG?: string;
+    GITHUB_APP_CLIENT_ID?: string;
+    GITHUB_APP_CLIENT_SECRET?: string;
     GOOGLE_LOGIN_ENABLED?: 'true' | 'false' | 'f';
     GOOGLE_CLIENT_ID?: string;
     GOOGLE_CLIENT_SECRET?: string;
@@ -132,6 +134,8 @@ declare module 'mbkauthe' {
     user_name: string;
     github_id: string;
     github_username: string;
+    installation_id?: number;
+    installation_target_type?: string;
     access_token: string;
     created_at: Date;
     updated_at: Date;

package/lib/config/index.js

@@ -64,7 +64,7 @@ function validateConfiguration() {
     const keysToCheck = [
         "APP_NAME", "DEVICE_TRUST_DURATION_DAYS", "EncPass", "Main_SECRET_TOKEN", "SESSION_SECRET_KEY",
         "IS_DEPLOYED", "LOGIN_DB", "MBKAUTH_TWO_FA_ENABLE", "COOKIE_EXPIRE_TIME", "DOMAIN", "loginRedirectURL",
-        "GITHUB_LOGIN_ENABLED", "GITHUB_CLIENT_ID", "GITHUB_CLIENT_SECRET", "GOOGLE_LOGIN_ENABLED", "GOOGLE_CLIENT_ID",
+        "GITHUB_LOGIN_ENABLED", "GITHUB_APP_SLUG", "GITHUB_APP_CLIENT_ID", "GITHUB_APP_CLIENT_SECRET", "GITHUB_CLIENT_ID", "GITHUB_CLIENT_SECRET", "GOOGLE_LOGIN_ENABLED", "GOOGLE_CLIENT_ID",
         "GOOGLE_CLIENT_SECRET", "MAX_SESSIONS_PER_USER"
     ];
 
@@ -145,11 +145,14 @@ function validateConfiguration() {
 
     // Validate GitHub login configuration
     if (mbkautheVar.GITHUB_LOGIN_ENABLED === "true") {
-        if (!mbkautheVar.GITHUB_CLIENT_ID || mbkautheVar.GITHUB_CLIENT_ID.trim() === '') {
-            errors.push("mbkautheVar.GITHUB_CLIENT_ID is required when GITHUB_LOGIN_ENABLED is 'true'");
+        const hasGithubClientId = !!(mbkautheVar.GITHUB_APP_CLIENT_ID || mbkautheVar.GITHUB_CLIENT_ID);
+        const hasGithubClientSecret = !!(mbkautheVar.GITHUB_APP_CLIENT_SECRET || mbkautheVar.GITHUB_CLIENT_SECRET);
+
+        if (!hasGithubClientId) {
+            errors.push("mbkautheVar.GITHUB_APP_CLIENT_ID (or GITHUB_CLIENT_ID) is required when GITHUB_LOGIN_ENABLED is 'true'");
         }
-        if (!mbkautheVar.GITHUB_CLIENT_SECRET || mbkautheVar.GITHUB_CLIENT_SECRET.trim() === '') {
-            errors.push("mbkautheVar.GITHUB_CLIENT_SECRET is required when GITHUB_LOGIN_ENABLED is 'true'");
+        if (!hasGithubClientSecret) {
+            errors.push("mbkautheVar.GITHUB_APP_CLIENT_SECRET (or GITHUB_CLIENT_SECRET) is required when GITHUB_LOGIN_ENABLED is 'true'");
         }
     }
 

package/lib/middleware/auth.js

@@ -6,6 +6,32 @@ import { ErrorCodes, createErrorResponse } from "../utils/errors.js";
 import { hashApiToken } from "#config.js";
 import { canAccessMethod } from "#config.js";
 
+/**
+ * Decide if the incoming request should return JSON errors instead of HTML.
+ * Non-browser clients (API calls / AJAX) should get JSON.
+ */
+function isJsonRequest(req) {
+  if (!req || !req.headers) return false;
+  const accept = (req.headers.accept || "").toLowerCase();
+  const xRequestedWith = (req.headers["x-requested-with"] || "").toLowerCase();
+  const userAgent = (req.headers["user-agent"] || "").toLowerCase();
+  const url = (req.originalUrl || req.url || "").toLowerCase();
+  const path = (req.path || "").toLowerCase();
+
+  const isApiPath = url.startsWith("/mbkauthe/api/") || url.startsWith("/api/") || path.startsWith("/mbkauthe/api/") || path.startsWith("/api/");
+  const isAcceptJson = accept.includes("application/json") || accept.includes("json") || accept.includes("*/*");
+
+  const nonBrowserAgent = /curl|wget|httpie|python-requests|python|go-http-client|java\/|php|node-fetch|axios|postman|insomnia|okhttp/;
+  const browserAgent = /mozilla|applewebkit|chrome|safari|firefox|edg|msie|trident|opera/;
+
+  if (isApiPath || xRequestedWith === "xmlhttprequest") return true;
+  if (isAcceptJson && !accept.includes("text/html")) return true;
+
+  if (nonBrowserAgent.test(userAgent) && !browserAgent.test(userAgent)) return true;
+
+  return false;
+}
+
 /**
  * Validates a Bearer token (API Token or Session UUID)
  * Returns a user object if valid, or null/error object
@@ -160,6 +186,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
   if (!req.session.user) {
     console.log("[mbkauthe] User not authenticated");
     console.log("[mbkauthe]: ", req.session.user);
+    if (isJsonRequest(req)) {
+      return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_NOT_FOUND));
+    }
     return renderError(res, req, {
       code: 401,
       error: "Not Logged In",
@@ -177,6 +206,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
       console.warn(`[mbkauthe] Missing sessionId for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Session Expired",
@@ -200,6 +232,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
       console.log(`[mbkauthe] Session not found for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Session Expired",
@@ -217,6 +252,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
       // destroy and clear cookies
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_EXPIRED));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Session Expired",
@@ -231,6 +269,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
       console.log(`[mbkauthe] Account is inactive for user "${req.session.user.username}"`);
       req.session.destroy();
       clearSessionCookies(res);
+      if (isJsonRequest(req)) {
+        return res.status(401).json(createErrorResponse(401, ErrorCodes.ACCOUNT_INACTIVE));
+      }
       return renderError(res, req, {
         code: 401,
         error: "Account Inactive",
@@ -247,6 +288,9 @@ async function validateSession(req, res, next, strictTokenValidation = false) {
         console.warn(`[mbkauthe] User \"${req.session.user.username}\" is not authorized to use the application \"${mbkautheVar.APP_NAME}\"`);
         req.session.destroy();
         clearSessionCookies(res);
+        if (isJsonRequest(req)) {
+          return res.status(401).json(createErrorResponse(401, ErrorCodes.APP_NOT_AUTHORIZED));
+        }
         return renderError(res, req, {
           code: 401,
           error: "Unauthorized",
@@ -444,6 +488,9 @@ const checkRolePermission = (requiredRoles, notAllowed) => {
     try {
       if (!req.session || !req.session.user || !req.session.user.id) {
         console.log("[mbkauthe] User not authenticated");
+        if (isJsonRequest(req)) {
+          return res.status(401).json(createErrorResponse(401, ErrorCodes.SESSION_NOT_FOUND));
+        }
         return renderError(res, req, {
           code: 401,
           error: "Not Logged In",
@@ -458,6 +505,9 @@ const checkRolePermission = (requiredRoles, notAllowed) => {
 
       // Check notAllowed role
       if (notAllowed && userRole === notAllowed) {
+        if (isJsonRequest(req)) {
+          return res.status(403).json(createErrorResponse(403, ErrorCodes.ROLE_NOT_ALLOWED));
+        }
         return renderError(res, req, {
           code: 403,
           error: "Access Denied",
@@ -477,6 +527,9 @@ const checkRolePermission = (requiredRoles, notAllowed) => {
 
       // Check if user role is in allowed roles
       if (!rolesArray.includes(userRole)) {
+        if (isJsonRequest(req)) {
+          return res.status(403).json(createErrorResponse(403, ErrorCodes.INSUFFICIENT_PERMISSIONS));
+        }
         return renderError(res, req, {
           code: 403,
           error: "Access Denied",

package/lib/pool.js

@@ -12,14 +12,9 @@ const poolConfig = {
   ssl: {
     rejectUnauthorized: true,
   },
-
-  // Connection pool tuning for serverless/ephemeral environments (Vercel)
-  // - keep max small to avoid exhausting DB connections
-  // - reduce idle time so connections are returned sooner
-  // - set a short connection timeout to fail fast
-  max: 10,
+  max: 3,
   idleTimeoutMillis: 10000,
-  connectionTimeoutMillis: 25000,
+  connectionTimeoutMillis: 10000,
 };
 
 export const dblogin = new Pool(poolConfig);
@@ -27,6 +22,14 @@ export const dblogin = new Pool(poolConfig);
 // Keep pool.js focused on pool setup; attach dev-only query logger from dedicated module.
 attachDevQueryLogger(dblogin);
 
+/*
+ attachDevQueryLogger([
+  { pool: dblogin, name: "loginDB" },
+  { pool: dblogin1, name: "loginDB1" },
+]);
+*/
+
+/*
 (async () => {
   try {
     const client = await dblogin.connect();
@@ -34,4 +37,5 @@ attachDevQueryLogger(dblogin);
   } catch (err) {
     console.error("[mbkauthe] Database connection error (pool):", err);
   }
-})();
+})();
+*/

package/lib/routes/dbLogs.js

@@ -1,6 +1,7 @@
 import express from "express";
 import { renderError } from "#response.js";
 import { dblogin } from "#pool.js";
+import { getQueryCount, getQueryLog, resetQueryCount, resetQueryLog } from "../utils/dbQueryLogger.js";
 import { mbkautheVar } from "#config.js";
 import rateLimit from 'express-rate-limit';
 
@@ -39,8 +40,8 @@ router.get(["/db.json"], LogLimit, async (req, res) => {
       });
     }
 
-    const queryCount = typeof dblogin.getQueryCount === 'function' ? dblogin.getQueryCount() : null;
-    const queryLog = typeof dblogin.getQueryLog === 'function' ? dblogin.getQueryLog({ limit: queryLimit }) : [];
+    const queryCount = typeof getQueryCount === 'function' ? getQueryCount() : (typeof dblogin.getQueryCount === 'function' ? dblogin.getQueryCount() : 0);
+    const queryLog = typeof getQueryLog === 'function' ? getQueryLog({ limit: queryLimit }) : (typeof dblogin.getQueryLog === 'function' ? dblogin.getQueryLog({ limit: queryLimit }) : []);
 
     return res.json({ queryCount, queryLimit, queryLog, isDev });
   } catch (err) {
@@ -61,8 +62,11 @@ router.post(["/db/reset"], LogLimit, async (req, res) => {
       });
     }
 
-    if (typeof dblogin.resetQueryCount === 'function') dblogin.resetQueryCount();
-    if (typeof dblogin.resetQueryLog === 'function') dblogin.resetQueryLog();
+    if (typeof resetQueryCount === 'function') resetQueryCount();
+    else if (typeof dblogin.resetQueryCount === 'function') dblogin.resetQueryCount();
+
+    if (typeof resetQueryLog === 'function') resetQueryLog();
+    else if (typeof dblogin.resetQueryLog === 'function') dblogin.resetQueryLog();
 
     return res.json({ success: true, message: 'Query log and count have been reset.' });
   } catch (err) {