@payez/next-mvp 4.0.44 → 4.0.45

package/dist/lib/api-handler.js

@@ -173,7 +173,9 @@ class ApiHandler {
                 return { success: false, reason: 'SESSION_EXPIRED' };
             }
             const { session: sessionData } = sessionWithVersion;
-            let accessToken = sessionData.idpAccessToken || null;
+            // Sessions may store the access token under either field name
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let accessToken = sessionData.idpAccessToken || sessionData.accessToken || null;
             let userRoles = Array.isArray(sessionData.roles) ? sessionData.roles : [];
             // Merge roles from JWT token
             try {
@@ -188,7 +190,8 @@ class ApiHandler {
             // some session shapes store the refresh token under different field names,
             // and we still want a refresh attempt to populate the access token.
             const thresholdMs = 5 * 60 * 1000;
-            const expires = sessionData.idpAccessTokenExpires || 0;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const expires = sessionData.idpAccessTokenExpires || sessionData.accessTokenExpires || 0;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const hasRefreshToken = !!(sessionData.idpRefreshToken || sessionData.refreshToken);
             const accessTokenStale = !accessToken || (expires - Date.now()) <= thresholdMs;
@@ -303,11 +306,17 @@ class ApiHandler {
             // Double-check if still needs refresh
             const latest = await (0, session_store_1.getSession)(sessionToken);
             const thresholdMs = 5 * 60 * 1000;
-            const stillNeeds = !latest?.accessToken || ((latest?.accessTokenExpires || 0) - Date.now()) <= thresholdMs;
-            if (!stillNeeds && latest?.accessToken) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const latestAny = latest;
+            // Sessions may store the access token under either `accessToken` or `idpAccessToken`,
+            // and expiry under `accessTokenExpires` or `idpAccessTokenExpires`.
+            const latestAccessToken = latestAny?.accessToken || latestAny?.idpAccessToken;
+            const latestExpires = latestAny?.accessTokenExpires || latestAny?.idpAccessTokenExpires || 0;
+            const stillNeeds = !latestAccessToken || (latestExpires - Date.now()) <= thresholdMs;
+            if (!stillNeeds && latestAccessToken) {
                 return {
-                    accessToken: latest.accessToken,
-                    roles: Array.isArray(latest.roles) ? latest.roles : [],
+                    accessToken: latestAccessToken,
+                    roles: Array.isArray(latest?.roles) ? latest.roles : [],
                 };
             }
             // Use centralized internal API helper for server-to-server refresh calls
@@ -316,10 +325,12 @@ class ApiHandler {
                 return {};
             }
             const refreshed = await (0, session_store_1.getSession)(sessionToken);
-            if (refreshed?.accessToken) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const refreshedAccessToken = refreshed?.accessToken || refreshed?.idpAccessToken;
+            if (refreshedAccessToken) {
                 return {
-                    accessToken: refreshed.accessToken,
-                    roles: Array.isArray(refreshed.roles) ? refreshed.roles : [],
+                    accessToken: refreshedAccessToken,
+                    roles: Array.isArray(refreshed?.roles) ? refreshed.roles : [],
                 };
             }
             return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payez/next-mvp",
-  "version": "4.0.44",
+  "version": "4.0.45",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/lib/api-handler.ts

@@ -267,7 +267,9 @@ export class ApiHandler {
       }
 
       const { session: sessionData } = sessionWithVersion;
-      let accessToken = sessionData.idpAccessToken || null;
+      // Sessions may store the access token under either field name
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      let accessToken = sessionData.idpAccessToken || (sessionData as any).accessToken || null;
       let userRoles: string[] = Array.isArray(sessionData.roles) ? sessionData.roles : [];
 
       // Merge roles from JWT token
@@ -283,7 +285,8 @@ export class ApiHandler {
       // some session shapes store the refresh token under different field names,
       // and we still want a refresh attempt to populate the access token.
       const thresholdMs = 5 * 60 * 1000;
-      const expires = sessionData.idpAccessTokenExpires || 0;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const expires = sessionData.idpAccessTokenExpires || (sessionData as any).accessTokenExpires || 0;
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const hasRefreshToken = !!(sessionData.idpRefreshToken || (sessionData as any).refreshToken);
       const accessTokenStale = !accessToken || (expires - Date.now()) <= thresholdMs;
@@ -424,12 +427,18 @@ export class ApiHandler {
       // Double-check if still needs refresh
       const latest = await getSession(sessionToken);
       const thresholdMs = 5 * 60 * 1000;
-      const stillNeeds = !latest?.accessToken || ((latest?.accessTokenExpires || 0) - Date.now()) <= thresholdMs;
-
-      if (!stillNeeds && latest?.accessToken) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const latestAny = latest as any;
+      // Sessions may store the access token under either `accessToken` or `idpAccessToken`,
+      // and expiry under `accessTokenExpires` or `idpAccessTokenExpires`.
+      const latestAccessToken = latestAny?.accessToken || latestAny?.idpAccessToken;
+      const latestExpires = latestAny?.accessTokenExpires || latestAny?.idpAccessTokenExpires || 0;
+      const stillNeeds = !latestAccessToken || (latestExpires - Date.now()) <= thresholdMs;
+
+      if (!stillNeeds && latestAccessToken) {
         return {
-          accessToken: latest.accessToken,
-          roles: Array.isArray(latest.roles) ? latest.roles : [],
+          accessToken: latestAccessToken,
+          roles: Array.isArray(latest?.roles) ? latest.roles : [],
         };
       }
 
@@ -446,10 +455,12 @@ export class ApiHandler {
       }
 
       const refreshed = await getSession(sessionToken);
-      if (refreshed?.accessToken) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const refreshedAccessToken = (refreshed as any)?.accessToken || (refreshed as any)?.idpAccessToken;
+      if (refreshedAccessToken) {
         return {
-          accessToken: refreshed.accessToken,
-          roles: Array.isArray(refreshed.roles) ? refreshed.roles : [],
+          accessToken: refreshedAccessToken,
+          roles: Array.isArray(refreshed?.roles) ? refreshed.roles : [],
         };
       }