@payez/next-mvp 4.0.29 → 4.0.30

package/dist/auth/better-auth.js

@@ -9,6 +9,39 @@
  *
  * @see BETTER-AUTH-MIGRATION-SPEC.md
  */
+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.__betterAuthInstance = void 0;
 exports.buildBetterAuthProviders = buildBetterAuthProviders;
@@ -235,9 +268,9 @@ async function exchangeOAuthForIdpTokens(sessionToken, provider = 'google') {
             console.warn('[BETTER_AUTH] IDP oauth-callback returned no access_token. Keys:', Object.keys(result || {}));
             return false;
         }
-        // Store IDP tokens in the BA Redis session
+        // Build IDP token data
         const requiresTwoFactor = result.user?.requiresTwoFactor ?? result.requiresTwoFactor ?? false;
-        baData.idpTokens = {
+        const idpTokenData = {
             idpAccessToken: result.access_token,
             idpRefreshToken: result.refresh_token,
             idpAccessTokenExpires: result.expires_in
@@ -249,7 +282,22 @@ async function exchangeOAuthForIdpTokens(sessionToken, provider = 'google') {
             roles: result.user?.roles || result.roles || [],
             mfaVerified: !requiresTwoFactor,
         };
+        // Store in BA Redis session (for decodeSession)
+        baData.idpTokens = idpTokenData;
         await (0, redis_1.getRedis)().setex(baKey, 7 * 24 * 60 * 60, JSON.stringify(baData));
+        // Write to canonical session store so refresh handler and token lifecycle can find the tokens.
+        // Key format: {sessionPrefix}{token} — same key that getSession() reads from.
+        try {
+            const { getSessionPrefix } = await Promise.resolve().then(() => __importStar(require('../lib/app-slug')));
+            const canonicalKey = `${getSessionPrefix()}${sessionToken}`;
+            await (0, redis_1.getRedis)().setex(canonicalKey, 7 * 24 * 60 * 60, JSON.stringify({
+                ...idpTokenData,
+                oauthProvider: provider,
+            }));
+        }
+        catch (canonicalErr) {
+            console.warn('[BETTER_AUTH] Failed to write canonical session:', canonicalErr instanceof Error ? canonicalErr.message : String(canonicalErr));
+        }
         console.log('[BETTER_AUTH] IDP tokens stored in session for', email);
         return true;
     }

package/package.json

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

package/src/auth/better-auth.ts

@@ -261,9 +261,9 @@ export async function exchangeOAuthForIdpTokens(
       return false;
     }
 
-    // Store IDP tokens in the BA Redis session
+    // Build IDP token data
     const requiresTwoFactor = result.user?.requiresTwoFactor ?? result.requiresTwoFactor ?? false;
-    baData.idpTokens = {
+    const idpTokenData = {
       idpAccessToken: result.access_token,
       idpRefreshToken: result.refresh_token,
       idpAccessTokenExpires: result.expires_in
@@ -275,7 +275,24 @@ export async function exchangeOAuthForIdpTokens(
       roles: result.user?.roles || result.roles || [],
       mfaVerified: !requiresTwoFactor,
     };
+
+    // Store in BA Redis session (for decodeSession)
+    baData.idpTokens = idpTokenData;
     await getRedis().setex(baKey, 7 * 24 * 60 * 60, JSON.stringify(baData));
+
+    // Write to canonical session store so refresh handler and token lifecycle can find the tokens.
+    // Key format: {sessionPrefix}{token} — same key that getSession() reads from.
+    try {
+      const { getSessionPrefix } = await import('../lib/app-slug');
+      const canonicalKey = `${getSessionPrefix()}${sessionToken}`;
+      await getRedis().setex(canonicalKey, 7 * 24 * 60 * 60, JSON.stringify({
+        ...idpTokenData,
+        oauthProvider: provider,
+      }));
+    } catch (canonicalErr) {
+      console.warn('[BETTER_AUTH] Failed to write canonical session:', canonicalErr instanceof Error ? canonicalErr.message : String(canonicalErr));
+    }
+
     console.log('[BETTER_AUTH] IDP tokens stored in session for', email);
     return true;
   } catch (err) {