@payez/next-mvp 4.0.31 → 4.0.33

package/dist/auth/better-auth.js

@@ -269,7 +269,7 @@ async function exchangeOAuthForIdpTokens(sessionToken, provider = 'google') {
             return false;
         }
         // Build IDP token data
-        const requiresTwoFactor = result.user?.requiresTwoFactor ?? result.requiresTwoFactor ?? false;
+        const requiresTwoFactor = result.requires_two_factor ?? result.user?.requiresTwoFactor ?? result.requiresTwoFactor ?? false;
         const idpTokenData = {
             idpAccessToken: result.access_token,
             idpRefreshToken: result.refresh_token,

package/dist/lib/idp-fetch.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.idpFetchJSON = idpFetchJSON;
 const test_aware_get_token_1 = require("./test-aware-get-token");
@@ -34,6 +67,17 @@ async function ensureFreshAccessToken(req) {
         return {};
     }
     let session = await (0, session_store_1.getSession)(sessionToken);
+    // Fall back to Better Auth: decode session from cookies to get IDP tokens
+    if (!session?.idpAccessToken) {
+        try {
+            const { decodeSession } = await Promise.resolve().then(() => __importStar(require('../server/decode-session')));
+            const decoded = await decodeSession(req.cookies);
+            if (decoded?.sessionData?.idpAccessToken) {
+                session = decoded.sessionData;
+            }
+        }
+        catch { /* decodeSession unavailable in edge */ }
+    }
     console.log('[IDP_FETCH] Redis session lookup:', {
         hasSession: !!session,
         hasAccessToken: !!session?.idpAccessToken,

package/package.json

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

package/src/auth/better-auth.ts

@@ -262,7 +262,7 @@ export async function exchangeOAuthForIdpTokens(
     }
 
     // Build IDP token data
-    const requiresTwoFactor = result.user?.requiresTwoFactor ?? result.requiresTwoFactor ?? false;
+    const requiresTwoFactor = result.requires_two_factor ?? result.user?.requiresTwoFactor ?? result.requiresTwoFactor ?? false;
     const idpTokenData = {
       idpAccessToken: result.access_token,
       idpRefreshToken: result.refresh_token,

package/src/lib/idp-fetch.ts

@@ -44,6 +44,16 @@ async function ensureFreshAccessToken(req: NextRequest): Promise<{ sessionToken?
     return {};
   }
   let session = await getSession(sessionToken);
+  // Fall back to Better Auth: decode session from cookies to get IDP tokens
+  if (!session?.idpAccessToken) {
+    try {
+      const { decodeSession } = await import('../server/decode-session');
+      const decoded = await decodeSession(req.cookies);
+      if (decoded?.sessionData?.idpAccessToken) {
+        session = decoded.sessionData;
+      }
+    } catch { /* decodeSession unavailable in edge */ }
+  }
   console.log('[IDP_FETCH] Redis session lookup:', {
     hasSession: !!session,
     hasAccessToken: !!session?.idpAccessToken,