@smg-automotive/auth 8.2.0 → 8.2.1-instrumentation-with-debug.2

package/dist/esm/server/middleware/protectRoute.js

@@ -1,7 +1,10 @@
 import { NextResponse } from 'next/server';
+import debug from 'debug';
 import { getLoginLink } from '../../lib/authLinks.js';
+import { getOrCreateRequestId } from './requestId.js';
 import { proactivelyRefreshAccessToken } from './proactivelyRefreshAccessToken.js';
 
+const log = debug('@smg-automotive/auth:protectRoute');
 const redirectToLogin = ({ auth0Config, language, returnTo, origin, }) => {
     const loginUrl = getLoginLink({
         auth0Config,
@@ -13,12 +16,23 @@ const redirectToLogin = ({ auth0Config, language, returnTo, origin, }) => {
     });
 };
 const protectRoute = async ({ isProtected, auth0Instance, auth0Config, language, request, response, onError, }) => {
-    const session = await auth0Instance.getSession(request);
+    const requestId = getOrCreateRequestId(request);
     const { pathname, search, origin } = request.nextUrl;
+    log('Checking route protection', { requestId, pathname, isProtected });
+    const session = await auth0Instance.getSession(request);
+    log('Session check', {
+        requestId,
+        hasSession: !!session,
+        hasUser: !!session?.user,
+    });
     if (!isProtected && !session?.user) {
+        log('Route not protected and no user session, allowing', { requestId });
         return response;
     }
     if (!session && isProtected) {
+        log('Protected route without session, redirecting to login', {
+            requestId,
+        });
         return redirectToLogin({
             auth0Config,
             language,
@@ -27,15 +41,22 @@ const protectRoute = async ({ isProtected, auth0Instance, auth0Config, language,
         });
     }
     try {
+        log('Refreshing token for protected route', { requestId });
         await proactivelyRefreshAccessToken({
             request,
             response,
             auth0Instance,
             auth0Config,
         });
+        log('Token refreshed successfully, allowing access', { requestId });
     }
     catch (error) {
         const authError = error;
+        log('Token refresh failed for protected route', {
+            requestId,
+            message: authError.message,
+            code: authError.code,
+        });
         onError?.(authError);
         return redirectToLogin({
             auth0Config,

package/dist/esm/server/middleware/protectRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAUA,MAAM,eAAe,GAAG,CAAC,EACvB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAMP,KAAkB;IACjB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC5B,WAAW;QACX,QAAQ;QACR,QAAQ;AACT,KAAA,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;AACtD,QAAA,MAAM,EAAE,GAAG;AACZ,KAAA,CAAC;AACJ,CAAC;MAEY,YAAY,GAAG,OAAO,EACjC,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GASR,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;IAEpD,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClC,QAAA,OAAO,QAAQ;IACjB;AAEA,IAAA,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;AAC3B,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AAEA,IAAA,IAAI;AACF,QAAA,MAAM,6BAA6B,CAAC;YAClC,OAAO;YACP,QAAQ;YACR,aAAa;YACb,WAAW;AACZ,SAAA,CAAC;IACJ;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;AACnC,QAAA,OAAO,GAAG,SAAS,CAAC;AAEpB,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AACF;;;;"}
+{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAYA,MAAM,GAAG,GAAG,KAAK,CAAC,mCAAmC,CAAC;AAEtD,MAAM,eAAe,GAAG,CAAC,EACvB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAMP,KAAkB;IACjB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC5B,WAAW;QACX,QAAQ;QACR,QAAQ;AACT,KAAA,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;AACtD,QAAA,MAAM,EAAE,GAAG;AACZ,KAAA,CAAC;AACJ,CAAC;MAEY,YAAY,GAAG,OAAO,EACjC,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GASR,KAAkC;AACjC,IAAA,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC;IAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;IACpD,GAAG,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;IAEtE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,GAAG,CAAC,eAAe,EAAE;QACnB,SAAS;QACT,UAAU,EAAE,CAAC,CAAC,OAAO;AACrB,QAAA,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI;AACzB,KAAA,CAAC;IAEF,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClC,QAAA,GAAG,CAAC,mDAAmD,EAAE,EAAE,SAAS,EAAE,CAAC;AACvE,QAAA,OAAO,QAAQ;IACjB;AAEA,IAAA,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;QAC3B,GAAG,CAAC,uDAAuD,EAAE;YAC3D,SAAS;AACV,SAAA,CAAC;AACF,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AAEA,IAAA,IAAI;AACF,QAAA,GAAG,CAAC,sCAAsC,EAAE,EAAE,SAAS,EAAE,CAAC;AAC1D,QAAA,MAAM,6BAA6B,CAAC;YAClC,OAAO;YACP,QAAQ;YACR,aAAa;YACb,WAAW;AACZ,SAAA,CAAC;AACF,QAAA,GAAG,CAAC,+CAA+C,EAAE,EAAE,SAAS,EAAE,CAAC;IACrE;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;QACnC,GAAG,CAAC,0CAA0C,EAAE;YAC9C,SAAS;YACT,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,IAAI,EAAE,SAAS,CAAC,IAAI;AACrB,SAAA,CAAC;AACF,QAAA,OAAO,GAAG,SAAS,CAAC;AAEpB,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AACF;;;;"}

package/dist/esm/server/middleware/requestId.d.ts

@@ -0,0 +1,8 @@
+import { NextRequest } from 'next/server';
+export declare const requestIdHeader = "x-automotive-request-id";
+/**
+ * Reads the request ID from the request header.
+ * Returns undefined if not present.
+ */
+export declare const getRequestId: (request: NextRequest) => string | undefined;
+export declare const getOrCreateRequestId: (request: NextRequest) => string;

package/dist/esm/server/middleware/requestId.js

@@ -0,0 +1,26 @@
+const requestIdHeader = 'x-automotive-request-id';
+const generateRequestId = () => {
+    // UUID v4 format: xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
+    // where x is any hex digit and y is one of 8, 9, A, B
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        // eslint-disable-next-line sonarjs/pseudo-random
+        const r = (Math.random() * 16) | 0;
+        const v = c === 'x' ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+};
+const getRequestIdFromHeader = (request) => {
+    return request.headers.get(requestIdHeader) || undefined;
+};
+const getOrCreateRequestId = (request) => {
+    const idFromHeader = getRequestIdFromHeader(request);
+    if (idFromHeader) {
+        return idFromHeader;
+    }
+    const newId = generateRequestId();
+    request.headers.set(requestIdHeader, newId);
+    return newId;
+};
+
+export { getOrCreateRequestId, requestIdHeader };
+//# sourceMappingURL=requestId.js.map

package/dist/esm/server/middleware/requestId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestId.js","sources":["../../../../../src/server/middleware/requestId.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEO,MAAM,eAAe,GAAG;AAE/B,MAAM,iBAAiB,GAAG,MAAa;;;IAGrC,OAAO,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,KAAI;;AAEnE,QAAA,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC;AAClC,QAAA,MAAM,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG;AACzC,QAAA,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;AACvB,IAAA,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,OAAoB,KAAwB;IAC1E,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,SAAS;AAC1D,CAAC;AAUM,MAAM,oBAAoB,GAAG,CAAC,OAAoB,KAAY;AACnE,IAAA,MAAM,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC;IAEpD,IAAI,YAAY,EAAE;AAChB,QAAA,OAAO,YAAY;IACrB;AAEA,IAAA,MAAM,KAAK,GAAG,iBAAiB,EAAE;IACjC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC;AAC3C,IAAA,OAAO,KAAK;AACd;;;;"}

package/dist/esm/server/middleware/token.js

@@ -1,15 +1,24 @@
 import { NextResponse } from 'next/server';
+import debug from 'debug';
 import { AccessTokenErrorCode } from '@auth0/nextjs-auth0/errors';
+import { getOrCreateRequestId } from './requestId.js';
 import { proactivelyRefreshAccessToken } from './proactivelyRefreshAccessToken.js';
 import { combineHeaders } from './combineHeaders.js';
 import { combineCookies } from './combineCookies.js';
 import { addCachingHeaders } from './addCachingHeaders.js';
 
+const log = debug('@smg-automotive/auth:token');
 const handleAccessTokenRequest = async ({ request, response, auth0Instance, auth0Config, onError, }) => {
     if (request.nextUrl.pathname !== auth0Config.tokenEndpoint)
         return;
+    const requestId = getOrCreateRequestId(request);
+    log('Handling access token request', {
+        requestId,
+        pathname: request.nextUrl.pathname,
+    });
     const session = await auth0Instance.getSession(request);
     if (!session) {
+        log('Access token request failed: no session', { requestId });
         return NextResponse.json({
             error: {
                 message: 'The user does not have an active session.',
@@ -20,12 +29,14 @@ const handleAccessTokenRequest = async ({ request, response, auth0Instance, auth
         });
     }
     try {
+        log('Refreshing access token', { requestId });
         const { token, expiresAt } = await proactivelyRefreshAccessToken({
             request,
             response,
             auth0Instance,
             auth0Config,
         });
+        log('Access token refreshed successfully', { requestId, expiresAt });
         const tokenResponse = NextResponse.json({
             token,
             expiresAt,
@@ -45,6 +56,11 @@ const handleAccessTokenRequest = async ({ request, response, auth0Instance, auth
     }
     catch (error) {
         const authError = error;
+        log('Access token request error', {
+            requestId,
+            message: authError.message,
+            code: authError.code,
+        });
         onError?.(authError);
         return NextResponse.json({ error: { message: authError.message, code: authError.code } }, { status: 401 });
     }

package/dist/esm/server/middleware/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAWO,MAAM,wBAAwB,GAAG,OAAO,EAC7C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,EACX,OAAO,GAOR,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,aAAa;QAAE;IAE5D,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,YAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;AACL,gBAAA,OAAO,EAAE,2CAA2C;gBACpD,IAAI,EAAE,oBAAoB,CAAC,eAAe;AAC3C,aAAA;SACF,EACD;AACE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CACF;IACH;AAEA,IAAA,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,6BAA6B,CAAC;YAC/D,OAAO;YACP,QAAQ;YACR,aAAa;YACb,WAAW;AACZ,SAAA,CAAC;AACF,QAAA,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;YACtC,KAAK;YACL,SAAS;AACV,SAAA,CAAC;QACF,MAAM,2BAA2B,GAAG,cAAc,CAAC;AACjD,YAAA,kBAAkB,EAAE,aAAa;AACjC,YAAA,YAAY,EAAE,QAAQ;AACtB,YAAA,eAAe,EAAE,IAAI;AACtB,SAAA,CAAC;QACF,iBAAiB,CAAC,2BAA2B,CAAC;;AAE9C,QAAA,cAAc,CAAC;AACb,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,cAAc,EAAE,2BAA2B;AAC5C,SAAA,CAAC;AACF,QAAA,OAAO,2BAA2B;IACpC;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;AACnC,QAAA,OAAO,GAAG,SAAS,CAAC;AACpB,QAAA,OAAO,YAAY,CAAC,IAAI,CACtB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAC/D,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB;IACH;AACF;;;;"}
+{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AAaA,MAAM,GAAG,GAAG,KAAK,CAAC,4BAA4B,CAAC;AAExC,MAAM,wBAAwB,GAAG,OAAO,EAC7C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,EACX,OAAO,GAOR,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,aAAa;QAAE;AAE5D,IAAA,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC;IAC/C,GAAG,CAAC,+BAA+B,EAAE;QACnC,SAAS;AACT,QAAA,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;AACnC,KAAA,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE;AACZ,QAAA,GAAG,CAAC,yCAAyC,EAAE,EAAE,SAAS,EAAE,CAAC;QAC7D,OAAO,YAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;AACL,gBAAA,OAAO,EAAE,2CAA2C;gBACpD,IAAI,EAAE,oBAAoB,CAAC,eAAe;AAC3C,aAAA;SACF,EACD;AACE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CACF;IACH;AAEA,IAAA,IAAI;AACF,QAAA,GAAG,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;QAC7C,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,6BAA6B,CAAC;YAC/D,OAAO;YACP,QAAQ;YACR,aAAa;YACb,WAAW;AACZ,SAAA,CAAC;QACF,GAAG,CAAC,qCAAqC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;AACpE,QAAA,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;YACtC,KAAK;YACL,SAAS;AACV,SAAA,CAAC;QACF,MAAM,2BAA2B,GAAG,cAAc,CAAC;AACjD,YAAA,kBAAkB,EAAE,aAAa;AACjC,YAAA,YAAY,EAAE,QAAQ;AACtB,YAAA,eAAe,EAAE,IAAI;AACtB,SAAA,CAAC;QACF,iBAAiB,CAAC,2BAA2B,CAAC;;AAE9C,QAAA,cAAc,CAAC;AACb,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,cAAc,EAAE,2BAA2B;AAC5C,SAAA,CAAC;AACF,QAAA,OAAO,2BAA2B;IACpC;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;QACnC,GAAG,CAAC,4BAA4B,EAAE;YAChC,SAAS;YACT,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,IAAI,EAAE,SAAS,CAAC,IAAI;AACrB,SAAA,CAAC;AACF,QAAA,OAAO,GAAG,SAAS,CAAC;AACpB,QAAA,OAAO,YAAY,CAAC,IAAI,CACtB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAC/D,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB;IACH;AACF;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smg-automotive/auth",
-  "version": "8.2.0",
+  "version": "8.2.1-instrumentation-with-debug.2",
   "description": "SMG Automotive auth package",
   "exports": {
     ".": {
@@ -68,6 +68,7 @@
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.0",
     "@testing-library/user-event": "14.6.1",
+    "@types/debug": "4.1.12",
     "@types/react": "19.2.2",
     "dotenv": "17.2.3",
     "jest": "30.2.0",
@@ -92,6 +93,7 @@
     "@auth0/nextjs-auth0": "4.9.0",
     "@smg-automotive/api-client-pkg": "4.5.0",
     "@smg-automotive/i18n-pkg": "2.0.0",
+    "debug": "4.4.3",
     "jose": "6.1.0",
     "redis": "5.9.0"
   },