@coreiam/auth 1.0.4 → 1.0.5

package/dist/core/index.js

@@ -2,15 +2,17 @@
 // src/core/index.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreIAM = void 0;
-const DEFAULT_GATEWAY_URL = "https://api.e-qalam.com";
 class CoreIAM {
     apiKey = '';
     baseUrl = '';
     constructor(config) {
         this.apiKey = config?.apiKey || process.env.COREIAM_API_KEY || '';
-        this.baseUrl = config?.baseUrl || DEFAULT_GATEWAY_URL;
+        // FIX: Removed hardcoded URL. Throw if missing.
+        this.baseUrl = config?.baseUrl || process.env.COREIAM_API_URL || '';
         if (!this.apiKey)
-            throw new Error('CoreIAM: Missing API Key');
+            throw new Error('CoreIAM: Missing API Key (COREIAM_API_KEY)');
+        if (!this.baseUrl)
+            throw new Error('CoreIAM: Missing Gateway URL (COREIAM_API_URL)');
     }
     // Exposed publicly so the Next.js layer can use it for getSession()
     async refreshTokens(headers) {

package/dist/nextjs/index.d.ts

@@ -5,6 +5,6 @@ import { NextRequest, NextResponse } from 'next/server';
 import { CoreIAM } from '../core';
 export declare class NextHandlers {
     private iam;
-    constructor(iam: CoreIAM);
+    constructor(iam?: CoreIAM);
     handleProxy(req: NextRequest, internalPath: string): Promise<NextResponse<any>>;
 }

package/dist/nextjs/index.js

@@ -10,13 +10,16 @@ Object.defineProperty(exports, "loginActionSdk", { enumerable: true, get: functi
 Object.defineProperty(exports, "registerActionSdk", { enumerable: true, get: function () { return actions_1.registerActionSdk; } });
 Object.defineProperty(exports, "logoutActionSdk", { enumerable: true, get: function () { return actions_1.logoutActionSdk; } });
 Object.defineProperty(exports, "getSession", { enumerable: true, get: function () { return actions_1.getSession; } });
+// FIX: Export the new handleCoreIamAuth function instead of the old middleware
 var middleware_1 = require("./middleware");
 Object.defineProperty(exports, "coreIamMiddleware", { enumerable: true, get: function () { return middleware_1.coreIamMiddleware; } });
 const server_1 = require("next/server");
+const core_1 = require("../core");
 class NextHandlers {
     iam;
     constructor(iam) {
-        this.iam = iam;
+        // If no iam client is provided, instantiate one using the env variables
+        this.iam = iam || new core_1.CoreIAM({ apiKey: process.env.COREIAM_API_KEY, baseUrl: process.env.COREIAM_API_URL });
     }
     async handleProxy(req, internalPath) {
         const method = internalPath === '/csrf' ? 'POST' : req.method;

package/dist/nextjs/middleware.d.ts

@@ -1,2 +1,9 @@
 import { NextRequest, NextResponse } from 'next/server';
-export declare function coreIamMiddleware(): (request: NextRequest) => Promise<NextResponse<unknown>>;
+/**
+ * Handles CoreIAM token refresh and header rewriting.
+ * Returns the NextResponse to return, and whether the user is authenticated.
+ */
+export declare function coreIamMiddleware(request: NextRequest): Promise<{
+    response: NextResponse;
+    isAuthenticated: boolean;
+}>;

package/dist/nextjs/middleware.js

@@ -4,91 +4,79 @@ exports.coreIamMiddleware = coreIamMiddleware;
 // src/nextjs/middleware.ts
 const server_1 = require("next/server");
 const jwt_decode_1 = require("jwt-decode");
-const DEFAULT_GATEWAY_URL = "https://api.e-qalam.com";
-function coreIamMiddleware() {
-    return async function middleware(request) {
-        const { nextUrl } = request;
-        const pathname = nextUrl.pathname;
-        const jwtCookie = request.cookies.get("jwt");
-        const refreshTokenCookie = request.cookies.get("refreshToken");
-        let isLoggedIn = false;
-        let needsRefresh = false;
-        if (jwtCookie) {
-            try {
-                const decoded = (0, jwt_decode_1.jwtDecode)(jwtCookie.value);
-                if (decoded.exp && decoded.exp * 1000 > Date.now()) {
-                    isLoggedIn = true;
-                }
-                else {
-                    if (refreshTokenCookie)
-                        needsRefresh = true;
-                }
+/**
+ * Handles CoreIAM token refresh and header rewriting.
+ * Returns the NextResponse to return, and whether the user is authenticated.
+ */
+async function coreIamMiddleware(request) {
+    const jwtCookie = request.cookies.get("jwt");
+    const refreshTokenCookie = request.cookies.get("refreshToken");
+    const gatewayUrl = process.env.COREIAM_API_URL;
+    let isAuthenticated = false;
+    let needsRefresh = false;
+    if (jwtCookie) {
+        try {
+            const decoded = (0, jwt_decode_1.jwtDecode)(jwtCookie.value);
+            if (decoded.exp && decoded.exp * 1000 > Date.now()) {
+                isAuthenticated = true;
             }
-            catch {
-                if (refreshTokenCookie)
-                    needsRefresh = true;
+            else if (refreshTokenCookie) {
+                needsRefresh = true;
             }
         }
-        else if (refreshTokenCookie) {
-            needsRefresh = true;
+        catch {
+            if (refreshTokenCookie)
+                needsRefresh = true;
         }
-        // Allow API routes to pass through (we handle their 401s normally)
-        if (pathname.startsWith('/api')) {
-            return server_1.NextResponse.next();
-        }
-        // 1. ATTEMPT SILENT REFRESH
-        if (needsRefresh) {
-            try {
-                const refreshRes = await fetch(`${DEFAULT_GATEWAY_URL}/auth/refresh-token`, {
-                    method: 'POST',
-                    headers: {
-                        'X-API-Key': process.env.COREIAM_API_KEY,
-                        'cookie': `refreshToken=${refreshTokenCookie?.value || ''}; jwt=${jwtCookie?.value || ''}`,
-                    },
-                });
-                if (refreshRes.ok) {
-                    const setCookies = refreshRes.headers.getSetCookie();
-                    if (setCookies && setCookies.length > 0) {
-                        let newJwt = '';
-                        let newRefreshToken = '';
-                        setCookies.forEach(cookie => {
-                            if (cookie.startsWith('jwt='))
-                                newJwt = cookie.split(';')[0].split('=')[1];
-                            if (cookie.startsWith('refreshToken='))
-                                newRefreshToken = cookie.split(';')[0].split('=')[1];
-                        });
-                        // CRITICAL: Rewrite request headers so Server Components see the new JWT!
+    }
+    else if (refreshTokenCookie) {
+        needsRefresh = true;
+    }
+    // 1. ATTEMPT SILENT REFRESH
+    if (needsRefresh && gatewayUrl) {
+        try {
+            const refreshRes = await fetch(`${gatewayUrl}/auth/refresh-token`, {
+                method: 'POST',
+                headers: {
+                    'X-API-Key': process.env.COREIAM_API_KEY,
+                    'cookie': `refreshToken=${refreshTokenCookie?.value || ''}; jwt=${jwtCookie?.value || ''}`,
+                },
+            });
+            if (refreshRes.ok) {
+                const setCookies = refreshRes.headers.getSetCookie();
+                if (setCookies && setCookies.length > 0) {
+                    let newJwt = '';
+                    let newRefreshToken = '';
+                    setCookies.forEach(cookie => {
+                        if (cookie.startsWith('jwt='))
+                            newJwt = cookie.split(';')[0].split('=')[1];
+                        if (cookie.startsWith('refreshToken='))
+                            newRefreshToken = cookie.split(';')[0].split('=')[1];
+                    });
+                    if (newJwt) {
                         const requestHeaders = new Headers(request.headers);
                         requestHeaders.set('cookie', `jwt=${newJwt}; refreshToken=${newRefreshToken}`);
                         requestHeaders.set('Authorization', `Bearer ${newJwt}`);
                         const response = server_1.NextResponse.next({
                             request: { headers: requestHeaders },
                         });
-                        // Set the new cookies on the browser
                         setCookies.forEach(cookie => {
                             response.headers.append('set-cookie', cookie);
                         });
-                        return response; // Exit early, token is fresh!
+                        return { response, isAuthenticated: true };
                     }
                 }
             }
-            catch (error) {
-                // Refresh failed, fall through to clear cookies
-            }
-            // 2. IF REFRESH FAILED, CLEAR COOKIES TO PREVENT INFINITE LOOP
-            const res = server_1.NextResponse.redirect(new URL('/auth/login', nextUrl));
-            res.cookies.delete('jwt');
-            res.cookies.delete('refreshToken');
-            return res;
-        }
-        // 3. STANDARD ROUTE PROTECTION
-        const isAuthRoute = pathname.startsWith('/auth/login') || pathname.startsWith('/auth/register');
-        if (isAuthRoute && isLoggedIn) {
-            return server_1.NextResponse.redirect(new URL('/', nextUrl));
         }
-        if (!isLoggedIn && !isAuthRoute) {
-            return server_1.NextResponse.redirect(new URL('/auth/login', nextUrl));
+        catch (error) {
+            // Refresh failed, fall through to clear cookies
         }
-        return server_1.NextResponse.next();
-    };
+        // 2. IF REFRESH FAILED, CLEAR COOKIES
+        const response = server_1.NextResponse.next();
+        response.cookies.delete('jwt');
+        response.cookies.delete('refreshToken');
+        return { response, isAuthenticated: false };
+    }
+    // 3. NO REFRESH NEEDED (Token is valid or completely missing)
+    return { response: server_1.NextResponse.next(), isAuthenticated };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coreiam/auth",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "./dist/core/index.js",
   "types": "./dist/core/index.d.ts",
   "exports": {