integrate-sdk 0.8.23 → 0.8.27

package/dist/adapters/auto-routes.js

@@ -651,7 +651,7 @@ class OAuthManager {
     this.getTokenCallback = tokenCallbacks?.getProviderToken;
     this.setTokenCallback = tokenCallbacks?.setProviderToken;
     this.removeTokenCallback = tokenCallbacks?.removeProviderToken;
-    this.skipLocalStorage = tokenCallbacks?.skipLocalStorage ?? !!tokenCallbacks?.getProviderToken;
+    this.skipLocalStorage = !!(tokenCallbacks?.getProviderToken || tokenCallbacks?.setProviderToken);
     this.cleanupExpiredPendingAuths();
   }
   async initiateFlow(provider, config, returnUrl) {
@@ -669,13 +669,10 @@ class OAuthManager {
     };
     this.pendingAuths.set(state, pendingAuth);
     this.savePendingAuthToStorage(state, pendingAuth);
-    console.log("[OAuth] Requesting authorization URL, flow mode:", this.flowConfig.mode);
     const authUrl = await this.getAuthorizationUrl(provider, state, codeChallenge, config.redirectUri, codeVerifier);
-    console.log("[OAuth] Received authorization URL, length:", authUrl?.length);
     if (!authUrl || authUrl.trim() === "") {
       throw new Error("Received empty authorization URL from server");
     }
-    console.log("[OAuth] Opening authorization URL, mode:", this.flowConfig.mode);
     if (this.flowConfig.mode === "popup") {
       this.windowManager.openPopup(authUrl, this.flowConfig.popupOptions);
       try {
@@ -686,7 +683,6 @@ class OAuthManager {
         throw error;
       }
     } else {
-      console.log("[OAuth] Redirecting to authorization URL:", authUrl.substring(0, 100) + (authUrl.length > 100 ? "..." : ""));
       this.windowManager.openRedirect(authUrl);
     }
   }
@@ -881,7 +877,6 @@ class OAuthManager {
       return;
     }
     if (this.skipLocalStorage) {
-      console.log(`[OAuth] Token for ${provider} stored in memory only (skipLocalStorage: true). Configure setProviderToken/getProviderToken callbacks for persistence.`);
       return;
     }
     if (typeof window !== "undefined" && window.localStorage) {
@@ -930,6 +925,9 @@ class OAuthManager {
     if (this.getTokenCallback) {
       return;
     }
+    if (this.skipLocalStorage) {
+      return;
+    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_token_${provider}`;
@@ -955,9 +953,6 @@ class OAuthManager {
     }
   }
   savePendingAuthToStorage(state, pendingAuth) {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_oauth_pending_${state}`;
@@ -968,9 +963,6 @@ class OAuthManager {
     }
   }
   loadPendingAuthFromStorage(state) {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_oauth_pending_${state}`;
@@ -985,9 +977,6 @@ class OAuthManager {
     return;
   }
   removePendingAuthFromStorage(state) {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_oauth_pending_${state}`;
@@ -998,9 +987,6 @@ class OAuthManager {
     }
   }
   cleanupExpiredPendingAuths() {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const prefix = "integrate_oauth_pending_";
@@ -1046,21 +1032,20 @@ class OAuthManager {
         frontendOrigin: this.apiBaseUrl && this.flowConfig.mode === "redirect" && typeof window !== "undefined" ? window.location.origin : undefined
       })
     });
+    if (response.headers.get("X-Integrate-Use-Database") === "true") {
+      this.skipLocalStorage = true;
+    }
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Failed to get authorization URL: ${error}`);
     }
     const data = await response.json();
     if (!data.authorizationUrl) {
-      console.error("[OAuth] Authorization URL is missing from response:", data);
       throw new Error("Authorization URL is missing from server response");
     }
     if (typeof data.authorizationUrl !== "string" || data.authorizationUrl.trim() === "") {
-      console.error("[OAuth] Invalid authorization URL received:", data.authorizationUrl);
       throw new Error("Invalid authorization URL received from server");
     }
-    const urlPreview = data.authorizationUrl.length > 100 ? data.authorizationUrl.substring(0, 100) + "..." : data.authorizationUrl;
-    console.log("[OAuth] Received authorization URL from API route:", urlPreview);
     return data.authorizationUrl;
   }
   async exchangeCodeForToken(provider, code, codeVerifier, state) {
@@ -1077,6 +1062,9 @@ class OAuthManager {
         state
       })
     });
+    if (response.headers.get("X-Integrate-Use-Database") === "true") {
+      this.skipLocalStorage = true;
+    }
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Failed to exchange code for token: ${error}`);
@@ -1084,6 +1072,9 @@ class OAuthManager {
     const data = await response.json();
     return data;
   }
+  setSkipLocalStorage(value) {
+    this.skipLocalStorage = value;
+  }
   close() {
     this.windowManager.close();
   }
@@ -1140,6 +1131,7 @@ class MCPClientBase {
   eventEmitter = new SimpleEventEmitter;
   apiRouteBase;
   apiBaseUrl;
+  databaseDetected = false;
   oauthCallbackPromise;
   server;
   constructor(config) {
@@ -1173,8 +1165,7 @@ class MCPClientBase {
     this.oauthManager = new OAuthManager(oauthApiBase, config.oauthFlow, this.apiBaseUrl, {
       getProviderToken: config.getProviderToken,
       setProviderToken: config.setProviderToken,
-      removeProviderToken: config.removeProviderToken,
-      skipLocalStorage: config.skipLocalStorage
+      removeProviderToken: config.removeProviderToken
     });
     for (const integration of this.integrations) {
       for (const toolName of integration.tools) {
@@ -1384,6 +1375,10 @@ class MCPClientBase {
         arguments: args
       })
     });
+    if (!this.databaseDetected && response.headers.get("X-Integrate-Use-Database") === "true") {
+      this.oauthManager.setSkipLocalStorage(true);
+      this.databaseDetected = true;
+    }
     if (!response.ok) {
       let errorMessage = `Request failed: ${response.statusText}`;
       const error = new Error(errorMessage);
@@ -6556,10 +6551,17 @@ function createMCPServer(config) {
         const oauthHandler = new OAuthHandler({
           providers,
           serverUrl: config.serverUrl,
-          apiKey: config.apiKey
+          apiKey: config.apiKey,
+          setProviderToken: config.setProviderToken,
+          removeProviderToken: config.removeProviderToken,
+          getSessionContext: config.getSessionContext
         });
         const result = await oauthHandler.handleToolCall(body, authHeader);
-        return Response.json(result);
+        const response2 = Response.json(result);
+        if (oauthHandler.hasDatabaseCallbacks()) {
+          response2.headers.set("X-Integrate-Use-Database", "true");
+        }
+        return response2;
       } catch (error) {
         console.error("[MCP Tool Call] Error:", error);
         return Response.json({ error: error.message || "Failed to execute tool call" }, { status: error.statusCode || 500 });
@@ -6685,7 +6687,6 @@ function createMCPServer(config) {
           }
         }
         if (!targetOrigin) {
-          console.warn("[OAuth] Could not determine frontend origin for redirect. Using request origin as fallback.");
           targetOrigin = new URL(webRequest.url).origin;
         }
         const targetUrl = new URL(returnUrl, targetOrigin);
@@ -7215,6 +7216,9 @@ class OAuthHandler {
     }
     return headers;
   }
+  hasDatabaseCallbacks() {
+    return !!this.config.setProviderToken;
+  }
   async handleAuthorize(request) {
     let webRequest;
     let authorizeRequest;
@@ -7226,7 +7230,6 @@ class OAuthHandler {
     } else {
       authorizeRequest = request;
     }
-    console.log("[handleAuthorize] Received request for provider:", authorizeRequest.provider, "has codeVerifier:", !!authorizeRequest.codeVerifier, "has frontendOrigin:", !!authorizeRequest.frontendOrigin);
     const providerConfig = this.config.providers[authorizeRequest.provider];
     if (!providerConfig) {
       throw new Error(`Provider ${authorizeRequest.provider} not configured. Add OAuth credentials to your API route configuration.`);
@@ -7267,22 +7270,14 @@ class OAuthHandler {
     const data = await response.json();
     const result = data;
     if (!result.authorizationUrl) {
-      console.error("[OAuth] MCP server did not return authorizationUrl:", data);
       throw new Error("MCP server failed to return authorization URL");
     }
-    const urlPreview = result.authorizationUrl.length > 100 ? result.authorizationUrl.substring(0, 100) + "..." : result.authorizationUrl;
-    console.log("[OAuth] Generated authorization URL:", urlPreview);
     if (authorizeRequest.codeVerifier) {
       try {
         const { storeCodeVerifier: storeCodeVerifier2 } = await Promise.resolve().then(() => (init_server(), exports_server));
         storeCodeVerifier2(authorizeRequest.state, authorizeRequest.codeVerifier, authorizeRequest.provider, authorizeRequest.frontendOrigin);
-        console.log("[OAuth] Stored codeVerifier for state:", authorizeRequest.state.substring(0, 20) + "...", "frontendOrigin:", authorizeRequest.frontendOrigin);
-      } catch (error) {
-        console.warn("[OAuth] Failed to store codeVerifier:", error);
-      }
-    } else {
-      console.log("[OAuth] No codeVerifier provided in authorize request");
-    }
+      } catch (error) {}
+    } else {}
     if (webRequest) {
       try {
         const { detectSessionContext: detectSessionContext2 } = await Promise.resolve().then(() => exports_session_detector);
@@ -7299,9 +7294,7 @@ class OAuthHandler {
           const cookieValue = await createContextCookie2(context, authorizeRequest.provider, secret);
           result.setCookie = getSetCookieHeader2(cookieValue);
         }
-      } catch (error) {
-        console.warn("[OAuth] Failed to capture user context:", error);
-      }
+      } catch (error) {}
     }
     return result;
   }
@@ -7335,9 +7328,7 @@ class OAuthHandler {
             context = contextData.context;
           }
         }
-      } catch (error) {
-        console.warn("[OAuth] Failed to restore user context:", error);
-      }
+      } catch (error) {}
     }
     const url = new URL("/oauth/callback", this.serverUrl);
     const response = await fetch(url.toString(), {
@@ -7372,9 +7363,7 @@ class OAuthHandler {
           scopes: result.scopes
         };
         await this.config.setProviderToken(callbackRequest.provider, tokenData, context);
-      } catch (error) {
-        console.error("[OAuth] Failed to save provider token:", error);
-      }
+      } catch (error) {}
     }
     if (webRequest) {
       const { getClearCookieHeader: getClearCookieHeader2 } = await Promise.resolve().then(() => exports_context_cookie);
@@ -7495,6 +7484,9 @@ function createNextOAuthHandler(config) {
         if (result.setCookie) {
           response.headers.set("Set-Cookie", result.setCookie);
         }
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
         return response;
       } catch (error) {
         console.error("[OAuth Authorize] Error:", error);
@@ -7508,6 +7500,9 @@ function createNextOAuthHandler(config) {
         if (result.clearCookie) {
           response.headers.set("Set-Cookie", result.clearCookie);
         }
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
         return response;
       } catch (error) {
         console.error("[OAuth Callback] Error:", error);
@@ -7526,7 +7521,11 @@ function createNextOAuthHandler(config) {
         }
         const accessToken = authHeader.substring(7);
         const result = await handler.handleStatus(provider, accessToken);
-        return Response.json(result);
+        const response = Response.json(result);
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
+        return response;
       } catch (error) {
         console.error("[OAuth Status] Error:", error);
         return Response.json({ error: error.message || "Failed to check authorization status" }, { status: 500 });
@@ -7545,7 +7544,11 @@ function createNextOAuthHandler(config) {
           return Response.json({ error: "Missing provider in request body" }, { status: 400 });
         }
         const result = await handler.handleDisconnect({ provider }, accessToken, req);
-        return Response.json(result);
+        const response = Response.json(result);
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
+        return response;
       } catch (error) {
         console.error("[OAuth Disconnect] Error:", error);
         return Response.json({ error: error.message || "Failed to disconnect provider" }, { status: 500 });

package/dist/adapters/base-handler.d.ts

@@ -192,6 +192,11 @@ export declare class OAuthHandler {
      * Get headers with API key if configured
      */
     private getHeaders;
+    /**
+     * Check if database callbacks are configured
+     * Used to determine if we should set X-Integrate-Use-Database header
+     */
+    hasDatabaseCallbacks(): boolean;
     /**
      * Handle authorization URL request
      * Gets authorization URL from MCP server with full OAuth credentials

package/dist/adapters/base-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-handler.d.ts","sourceRoot":"","sources":["../../../src/adapters/base-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-handler.d.ts","sourceRoot":"","sources":["../../../src/adapters/base-handler.ts"],"names":[],"mappings":"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"}

package/dist/adapters/index.js

@@ -651,7 +651,7 @@ class OAuthManager {
     this.getTokenCallback = tokenCallbacks?.getProviderToken;
     this.setTokenCallback = tokenCallbacks?.setProviderToken;
     this.removeTokenCallback = tokenCallbacks?.removeProviderToken;
-    this.skipLocalStorage = tokenCallbacks?.skipLocalStorage ?? !!tokenCallbacks?.getProviderToken;
+    this.skipLocalStorage = !!(tokenCallbacks?.getProviderToken || tokenCallbacks?.setProviderToken);
     this.cleanupExpiredPendingAuths();
   }
   async initiateFlow(provider, config, returnUrl) {
@@ -669,13 +669,10 @@ class OAuthManager {
     };
     this.pendingAuths.set(state, pendingAuth);
     this.savePendingAuthToStorage(state, pendingAuth);
-    console.log("[OAuth] Requesting authorization URL, flow mode:", this.flowConfig.mode);
     const authUrl = await this.getAuthorizationUrl(provider, state, codeChallenge, config.redirectUri, codeVerifier);
-    console.log("[OAuth] Received authorization URL, length:", authUrl?.length);
     if (!authUrl || authUrl.trim() === "") {
       throw new Error("Received empty authorization URL from server");
     }
-    console.log("[OAuth] Opening authorization URL, mode:", this.flowConfig.mode);
     if (this.flowConfig.mode === "popup") {
       this.windowManager.openPopup(authUrl, this.flowConfig.popupOptions);
       try {
@@ -686,7 +683,6 @@ class OAuthManager {
         throw error;
       }
     } else {
-      console.log("[OAuth] Redirecting to authorization URL:", authUrl.substring(0, 100) + (authUrl.length > 100 ? "..." : ""));
       this.windowManager.openRedirect(authUrl);
     }
   }
@@ -881,7 +877,6 @@ class OAuthManager {
       return;
     }
     if (this.skipLocalStorage) {
-      console.log(`[OAuth] Token for ${provider} stored in memory only (skipLocalStorage: true). Configure setProviderToken/getProviderToken callbacks for persistence.`);
       return;
     }
     if (typeof window !== "undefined" && window.localStorage) {
@@ -930,6 +925,9 @@ class OAuthManager {
     if (this.getTokenCallback) {
       return;
     }
+    if (this.skipLocalStorage) {
+      return;
+    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_token_${provider}`;
@@ -955,9 +953,6 @@ class OAuthManager {
     }
   }
   savePendingAuthToStorage(state, pendingAuth) {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_oauth_pending_${state}`;
@@ -968,9 +963,6 @@ class OAuthManager {
     }
   }
   loadPendingAuthFromStorage(state) {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_oauth_pending_${state}`;
@@ -985,9 +977,6 @@ class OAuthManager {
     return;
   }
   removePendingAuthFromStorage(state) {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_oauth_pending_${state}`;
@@ -998,9 +987,6 @@ class OAuthManager {
     }
   }
   cleanupExpiredPendingAuths() {
-    if (this.skipLocalStorage) {
-      return;
-    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const prefix = "integrate_oauth_pending_";
@@ -1046,21 +1032,20 @@ class OAuthManager {
         frontendOrigin: this.apiBaseUrl && this.flowConfig.mode === "redirect" && typeof window !== "undefined" ? window.location.origin : undefined
       })
     });
+    if (response.headers.get("X-Integrate-Use-Database") === "true") {
+      this.skipLocalStorage = true;
+    }
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Failed to get authorization URL: ${error}`);
     }
     const data = await response.json();
     if (!data.authorizationUrl) {
-      console.error("[OAuth] Authorization URL is missing from response:", data);
       throw new Error("Authorization URL is missing from server response");
     }
     if (typeof data.authorizationUrl !== "string" || data.authorizationUrl.trim() === "") {
-      console.error("[OAuth] Invalid authorization URL received:", data.authorizationUrl);
       throw new Error("Invalid authorization URL received from server");
     }
-    const urlPreview = data.authorizationUrl.length > 100 ? data.authorizationUrl.substring(0, 100) + "..." : data.authorizationUrl;
-    console.log("[OAuth] Received authorization URL from API route:", urlPreview);
     return data.authorizationUrl;
   }
   async exchangeCodeForToken(provider, code, codeVerifier, state) {
@@ -1077,6 +1062,9 @@ class OAuthManager {
         state
       })
     });
+    if (response.headers.get("X-Integrate-Use-Database") === "true") {
+      this.skipLocalStorage = true;
+    }
     if (!response.ok) {
       const error = await response.text();
       throw new Error(`Failed to exchange code for token: ${error}`);
@@ -1084,6 +1072,9 @@ class OAuthManager {
     const data = await response.json();
     return data;
   }
+  setSkipLocalStorage(value) {
+    this.skipLocalStorage = value;
+  }
   close() {
     this.windowManager.close();
   }
@@ -1140,6 +1131,7 @@ class MCPClientBase {
   eventEmitter = new SimpleEventEmitter;
   apiRouteBase;
   apiBaseUrl;
+  databaseDetected = false;
   oauthCallbackPromise;
   server;
   constructor(config) {
@@ -1173,8 +1165,7 @@ class MCPClientBase {
     this.oauthManager = new OAuthManager(oauthApiBase, config.oauthFlow, this.apiBaseUrl, {
       getProviderToken: config.getProviderToken,
       setProviderToken: config.setProviderToken,
-      removeProviderToken: config.removeProviderToken,
-      skipLocalStorage: config.skipLocalStorage
+      removeProviderToken: config.removeProviderToken
     });
     for (const integration of this.integrations) {
       for (const toolName of integration.tools) {
@@ -1384,6 +1375,10 @@ class MCPClientBase {
         arguments: args
       })
     });
+    if (!this.databaseDetected && response.headers.get("X-Integrate-Use-Database") === "true") {
+      this.oauthManager.setSkipLocalStorage(true);
+      this.databaseDetected = true;
+    }
     if (!response.ok) {
       let errorMessage = `Request failed: ${response.statusText}`;
       const error = new Error(errorMessage);
@@ -6556,10 +6551,17 @@ function createMCPServer(config) {
         const oauthHandler = new OAuthHandler({
           providers,
           serverUrl: config.serverUrl,
-          apiKey: config.apiKey
+          apiKey: config.apiKey,
+          setProviderToken: config.setProviderToken,
+          removeProviderToken: config.removeProviderToken,
+          getSessionContext: config.getSessionContext
         });
         const result = await oauthHandler.handleToolCall(body, authHeader);
-        return Response.json(result);
+        const response2 = Response.json(result);
+        if (oauthHandler.hasDatabaseCallbacks()) {
+          response2.headers.set("X-Integrate-Use-Database", "true");
+        }
+        return response2;
       } catch (error) {
         console.error("[MCP Tool Call] Error:", error);
         return Response.json({ error: error.message || "Failed to execute tool call" }, { status: error.statusCode || 500 });
@@ -6685,7 +6687,6 @@ function createMCPServer(config) {
           }
         }
         if (!targetOrigin) {
-          console.warn("[OAuth] Could not determine frontend origin for redirect. Using request origin as fallback.");
           targetOrigin = new URL(webRequest.url).origin;
         }
         const targetUrl = new URL(returnUrl, targetOrigin);
@@ -7215,6 +7216,9 @@ class OAuthHandler {
     }
     return headers;
   }
+  hasDatabaseCallbacks() {
+    return !!this.config.setProviderToken;
+  }
   async handleAuthorize(request) {
     let webRequest;
     let authorizeRequest;
@@ -7226,7 +7230,6 @@ class OAuthHandler {
     } else {
       authorizeRequest = request;
     }
-    console.log("[handleAuthorize] Received request for provider:", authorizeRequest.provider, "has codeVerifier:", !!authorizeRequest.codeVerifier, "has frontendOrigin:", !!authorizeRequest.frontendOrigin);
     const providerConfig = this.config.providers[authorizeRequest.provider];
     if (!providerConfig) {
       throw new Error(`Provider ${authorizeRequest.provider} not configured. Add OAuth credentials to your API route configuration.`);
@@ -7267,22 +7270,14 @@ class OAuthHandler {
     const data = await response.json();
     const result = data;
     if (!result.authorizationUrl) {
-      console.error("[OAuth] MCP server did not return authorizationUrl:", data);
       throw new Error("MCP server failed to return authorization URL");
     }
-    const urlPreview = result.authorizationUrl.length > 100 ? result.authorizationUrl.substring(0, 100) + "..." : result.authorizationUrl;
-    console.log("[OAuth] Generated authorization URL:", urlPreview);
     if (authorizeRequest.codeVerifier) {
       try {
         const { storeCodeVerifier: storeCodeVerifier2 } = await Promise.resolve().then(() => (init_server(), exports_server));
         storeCodeVerifier2(authorizeRequest.state, authorizeRequest.codeVerifier, authorizeRequest.provider, authorizeRequest.frontendOrigin);
-        console.log("[OAuth] Stored codeVerifier for state:", authorizeRequest.state.substring(0, 20) + "...", "frontendOrigin:", authorizeRequest.frontendOrigin);
-      } catch (error) {
-        console.warn("[OAuth] Failed to store codeVerifier:", error);
-      }
-    } else {
-      console.log("[OAuth] No codeVerifier provided in authorize request");
-    }
+      } catch (error) {}
+    } else {}
     if (webRequest) {
       try {
         const { detectSessionContext: detectSessionContext2 } = await Promise.resolve().then(() => exports_session_detector);
@@ -7299,9 +7294,7 @@ class OAuthHandler {
           const cookieValue = await createContextCookie2(context, authorizeRequest.provider, secret);
           result.setCookie = getSetCookieHeader2(cookieValue);
         }
-      } catch (error) {
-        console.warn("[OAuth] Failed to capture user context:", error);
-      }
+      } catch (error) {}
     }
     return result;
   }
@@ -7335,9 +7328,7 @@ class OAuthHandler {
             context = contextData.context;
           }
         }
-      } catch (error) {
-        console.warn("[OAuth] Failed to restore user context:", error);
-      }
+      } catch (error) {}
     }
     const url = new URL("/oauth/callback", this.serverUrl);
     const response = await fetch(url.toString(), {
@@ -7372,9 +7363,7 @@ class OAuthHandler {
           scopes: result.scopes
         };
         await this.config.setProviderToken(callbackRequest.provider, tokenData, context);
-      } catch (error) {
-        console.error("[OAuth] Failed to save provider token:", error);
-      }
+      } catch (error) {}
     }
     if (webRequest) {
       const { getClearCookieHeader: getClearCookieHeader2 } = await Promise.resolve().then(() => exports_context_cookie);
@@ -7495,6 +7484,9 @@ function createNextOAuthHandler(config) {
         if (result.setCookie) {
           response.headers.set("Set-Cookie", result.setCookie);
         }
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
         return response;
       } catch (error) {
         console.error("[OAuth Authorize] Error:", error);
@@ -7508,6 +7500,9 @@ function createNextOAuthHandler(config) {
         if (result.clearCookie) {
           response.headers.set("Set-Cookie", result.clearCookie);
         }
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
         return response;
       } catch (error) {
         console.error("[OAuth Callback] Error:", error);
@@ -7526,7 +7521,11 @@ function createNextOAuthHandler(config) {
         }
         const accessToken = authHeader.substring(7);
         const result = await handler.handleStatus(provider, accessToken);
-        return Response.json(result);
+        const response = Response.json(result);
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
+        return response;
       } catch (error) {
         console.error("[OAuth Status] Error:", error);
         return Response.json({ error: error.message || "Failed to check authorization status" }, { status: 500 });
@@ -7545,7 +7544,11 @@ function createNextOAuthHandler(config) {
           return Response.json({ error: "Missing provider in request body" }, { status: 400 });
         }
         const result = await handler.handleDisconnect({ provider }, accessToken, req);
-        return Response.json(result);
+        const response = Response.json(result);
+        if (handler.hasDatabaseCallbacks()) {
+          response.headers.set("X-Integrate-Use-Database", "true");
+        }
+        return response;
       } catch (error) {
         console.error("[OAuth Disconnect] Error:", error);
         return Response.json({ error: error.message || "Failed to disconnect provider" }, { status: 500 });

package/dist/adapters/nextjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextjs.d.ts","sourceRoot":"","sources":["../../../src/adapters/nextjs.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAgB,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG1E,KAAK,WAAW,GAAG,GAAG,CAAC;AACvB,KAAK,YAAY,GAAG,GAAG,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB;IAI7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAwCG;mBACkB,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAuBxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;kBACiB,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAuBvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCG;gBACe,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA+BrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;oBACmB,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAkCzD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;;QAGC;;WAEG;kBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,GACpE,OAAO,CAAC,YAAY,CAAC;QA2BxB;;WAEG;iBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,GACpE,OAAO,CAAC,YAAY,CAAC;;IAiB5B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;aACY,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAelD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;qCAC8B;QAC/B,6DAA6D;QAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,iEAAiE;QACjE,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B;QAKG;;WAEG;kBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,CAAC,CAAA;SAAE,GAClE,OAAO,CAAC,YAAY,CAAC;QAsCxB;;WAEG;iBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,CAAC,CAAA;SAAE,GAClE,OAAO,CAAC,YAAY,CAAC;;EA+F/B"}
+{"version":3,"file":"nextjs.d.ts","sourceRoot":"","sources":["../../../src/adapters/nextjs.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAgB,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG1E,KAAK,WAAW,GAAG,GAAG,CAAC;AACvB,KAAK,YAAY,GAAG,GAAG,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB;IAI7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAwCG;mBACkB,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA4BxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;kBACiB,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA4BvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCG;gBACe,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAsCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;oBACmB,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAyCzD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;;QAGC;;WAEG;kBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,GACpE,OAAO,CAAC,YAAY,CAAC;QA2BxB;;WAEG;iBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,GACpE,OAAO,CAAC,YAAY,CAAC;;IAiB5B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;aACY,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAelD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;qCAC8B;QAC/B,6DAA6D;QAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,iEAAiE;QACjE,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B;QAKG;;WAEG;kBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,CAAC,CAAA;SAAE,GAClE,OAAO,CAAC,YAAY,CAAC;QAsCxB;;WAEG;iBAEI,WAAW,WACP;YAAE,MAAM,EAAE;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aAAE,CAAC,CAAA;SAAE,GAClE,OAAO,CAAC,YAAY,CAAC;;EA+F/B"}