integrate-sdk 0.3.7 → 0.3.9

package/dist/index.js

@@ -591,6 +591,7 @@ function base64UrlEncode(array) {
 }
 
 // src/oauth/window-manager.ts
+"use client";
 function isBrowser() {
   return typeof window !== "undefined" && typeof window.document !== "undefined";
 }
@@ -699,6 +700,21 @@ class OAuthWindowManager {
       let state = params.get("state");
       let error = params.get("error");
       let errorDescription = params.get("error_description");
+      if (!code && !error && window.location.hash) {
+        try {
+          const hash = window.location.hash.substring(1);
+          const hashParams = new URLSearchParams(hash);
+          const oauthCallback = hashParams.get("oauth_callback");
+          if (oauthCallback) {
+            const parsed = JSON.parse(decodeURIComponent(oauthCallback));
+            code = parsed.code;
+            state = parsed.state;
+            window.history.replaceState(null, "", window.location.pathname + window.location.search);
+          }
+        } catch (e) {
+          console.error("Failed to parse OAuth callback params from hash:", e);
+        }
+      }
       if (!code && !error) {
         try {
           const stored = sessionStorage.getItem("oauth_callback_params");
@@ -761,6 +777,8 @@ function sendCallbackToOpener(params) {
 }
 
 // src/oauth/manager.ts
+"use client";
+
 class OAuthManager {
   pendingAuths = new Map;
   sessionToken;
@@ -824,6 +842,7 @@ class OAuthManager {
     try {
       const response = await this.exchangeCodeForToken(pendingAuth.provider, code, pendingAuth.codeVerifier, state);
       this.sessionToken = response.sessionToken;
+      this.saveSessionToken(response.sessionToken);
       this.pendingAuths.delete(state);
       return response.sessionToken;
     } catch (error) {
@@ -867,9 +886,26 @@ class OAuthManager {
   }
   setSessionToken(token) {
     this.sessionToken = token;
+    this.saveSessionToken(token);
   }
   clearSessionToken() {
     this.sessionToken = undefined;
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.removeItem("integrate_session_token");
+      } catch (error) {
+        console.error("Failed to clear session token from sessionStorage:", error);
+      }
+    }
+  }
+  saveSessionToken(token) {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.setItem("integrate_session_token", token);
+      } catch (error) {
+        console.error("Failed to save session token to sessionStorage:", error);
+      }
+    }
   }
   async getAuthorizationUrl(provider, scopes, state, codeChallenge, redirectUri) {
     const url = `${this.oauthApiBase}/authorize`;
@@ -921,6 +957,42 @@ class OAuthManager {
 }
 
 // src/client.ts
+"use client";
+
+class SimpleEventEmitter {
+  handlers = new Map;
+  on(event, handler) {
+    if (!this.handlers.has(event)) {
+      this.handlers.set(event, new Set);
+    }
+    this.handlers.get(event).add(handler);
+  }
+  off(event, handler) {
+    const handlers = this.handlers.get(event);
+    if (handlers) {
+      handlers.delete(handler);
+    }
+  }
+  emit(event, payload) {
+    const handlers = this.handlers.get(event);
+    if (handlers) {
+      handlers.forEach((handler) => {
+        try {
+          handler(payload);
+        } catch (error) {
+          console.error(`Error in event handler for ${event}:`, error);
+        }
+      });
+    }
+  }
+  removeAllListeners(event) {
+    if (event) {
+      this.handlers.delete(event);
+    } else {
+      this.handlers.clear();
+    }
+  }
+}
 var MCP_SERVER_URL = "https://mcp.integrate.dev/api/v1/mcp";
 var clientCache = new Map;
 var cleanupClients = new Set;
@@ -939,6 +1011,7 @@ class MCPClient {
   connectionMode;
   connecting = null;
   oauthManager;
+  eventEmitter = new SimpleEventEmitter;
   github;
   gmail;
   server;
@@ -957,9 +1030,16 @@ class MCPClient {
     this.maxReauthRetries = config.maxReauthRetries ?? 1;
     this.connectionMode = config.connectionMode ?? "lazy";
     this.oauthManager = new OAuthManager(config.oauthApiBase || "/api/integrate/oauth", config.oauthFlow);
-    if (config.sessionToken) {
-      this.oauthManager.setSessionToken(config.sessionToken);
-      this.transport.setHeader("X-Session-Token", config.sessionToken);
+    let sessionToken = config.sessionToken;
+    if (!sessionToken) {
+      const storedToken = this.loadSessionToken();
+      if (storedToken) {
+        sessionToken = storedToken;
+      }
+    }
+    if (sessionToken) {
+      this.oauthManager.setSessionToken(sessionToken);
+      this.transport.setHeader("X-Session-Token", sessionToken);
     }
     for (const plugin of this.plugins) {
       for (const toolName of plugin.tools) {
@@ -1175,6 +1255,42 @@ class MCPClient {
   onMessage(handler) {
     return this.transport.onMessage(handler);
   }
+  on(event, handler) {
+    this.eventEmitter.on(event, handler);
+  }
+  off(event, handler) {
+    this.eventEmitter.off(event, handler);
+  }
+  saveSessionToken(token) {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.setItem("integrate_session_token", token);
+      } catch (error) {
+        console.error("Failed to save session token to sessionStorage:", error);
+      }
+    }
+  }
+  loadSessionToken() {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        return window.sessionStorage.getItem("integrate_session_token") || undefined;
+      } catch (error) {
+        console.error("Failed to load session token from sessionStorage:", error);
+        return;
+      }
+    }
+    return;
+  }
+  clearSessionToken() {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.removeItem("integrate_session_token");
+      } catch (error) {
+        console.error("Failed to clear session token from sessionStorage:", error);
+      }
+    }
+    this.oauthManager.clearSessionToken();
+  }
   async disconnect() {
     for (const plugin of this.plugins) {
       if (plugin.onDisconnect) {
@@ -1218,18 +1334,44 @@ class MCPClient {
   async authorize(provider) {
     const plugin = this.plugins.find((p) => p.oauth?.provider === provider);
     if (!plugin?.oauth) {
-      throw new Error(`No OAuth configuration found for provider: ${provider}`);
+      const error = new Error(`No OAuth configuration found for provider: ${provider}`);
+      this.eventEmitter.emit("auth:error", { provider, error });
+      throw error;
+    }
+    this.eventEmitter.emit("auth:started", { provider });
+    try {
+      await this.oauthManager.initiateFlow(provider, plugin.oauth);
+      const sessionToken = this.oauthManager.getSessionToken();
+      if (sessionToken) {
+        this.saveSessionToken(sessionToken);
+        this.eventEmitter.emit("auth:complete", { provider, sessionToken });
+      }
+      this.authState.set(provider, { authenticated: true });
+    } catch (error) {
+      this.eventEmitter.emit("auth:error", { provider, error });
+      throw error;
     }
-    await this.oauthManager.initiateFlow(provider, plugin.oauth);
-    this.authState.set(provider, { authenticated: true });
   }
   async handleOAuthCallback(params) {
-    const sessionToken = await this.oauthManager.handleCallback(params.code, params.state);
-    this.transport.setHeader("X-Session-Token", sessionToken);
-    for (const plugin of this.plugins) {
-      if (plugin.oauth) {
-        this.authState.set(plugin.oauth.provider, { authenticated: true });
+    try {
+      const sessionToken = await this.oauthManager.handleCallback(params.code, params.state);
+      this.saveSessionToken(sessionToken);
+      this.transport.setHeader("X-Session-Token", sessionToken);
+      for (const plugin of this.plugins) {
+        if (plugin.oauth) {
+          this.authState.set(plugin.oauth.provider, { authenticated: true });
+          this.eventEmitter.emit("auth:complete", {
+            provider: plugin.oauth.provider,
+            sessionToken
+          });
+        }
       }
+    } catch (error) {
+      this.eventEmitter.emit("auth:error", {
+        provider: "unknown",
+        error
+      });
+      throw error;
     }
   }
   getSessionToken() {
@@ -1324,6 +1466,9 @@ function createMCPClient(config) {
         console.error("Failed to connect client:", error);
       });
     }
+    if (config.autoHandleOAuthCallback !== false) {
+      processOAuthCallbackFromHash(client);
+    }
     return client;
   } else {
     const client = new MCPClient(config);
@@ -1336,9 +1481,35 @@ function createMCPClient(config) {
         console.error("Failed to connect client:", error);
       });
     }
+    if (config.autoHandleOAuthCallback !== false) {
+      processOAuthCallbackFromHash(client);
+    }
     return client;
   }
 }
+function processOAuthCallbackFromHash(client) {
+  if (typeof window === "undefined") {
+    return;
+  }
+  try {
+    const hash = window.location.hash;
+    if (hash && hash.includes("oauth_callback=")) {
+      const hashParams = new URLSearchParams(hash.substring(1));
+      const oauthCallbackData = hashParams.get("oauth_callback");
+      if (oauthCallbackData) {
+        const callbackParams = JSON.parse(decodeURIComponent(oauthCallbackData));
+        if (callbackParams.code && callbackParams.state) {
+          client.handleOAuthCallback(callbackParams).catch((error) => {
+            console.error("Failed to process OAuth callback:", error);
+          });
+          window.history.replaceState(null, "", window.location.pathname + window.location.search);
+        }
+      }
+    }
+  } catch (error) {
+    console.error("Failed to process OAuth callback from hash:", error);
+  }
+}
 async function clearClientCache() {
   const clients = Array.from(clientCache.values());
   clientCache.clear();
@@ -1356,6 +1527,30 @@ async function clearClientCache() {
 // src/index.ts
 init_nextjs();
 
+// src/adapters/nextjs-oauth-redirect.ts
+function createOAuthRedirectHandler(config) {
+  const redirectUrl = config?.redirectUrl || "/";
+  const errorRedirectUrl = config?.errorRedirectUrl || "/auth-error";
+  return async function GET(req) {
+    const { searchParams } = new URL(req.url);
+    const code = searchParams.get("code");
+    const state = searchParams.get("state");
+    const error = searchParams.get("error");
+    const errorDescription = searchParams.get("error_description");
+    if (error) {
+      const errorMsg = errorDescription || error;
+      console.error("[OAuth Redirect] Error:", errorMsg);
+      return Response.redirect(new URL(`${errorRedirectUrl}?error=${encodeURIComponent(errorMsg)}`, req.url));
+    }
+    if (!code || !state) {
+      console.error("[OAuth Redirect] Missing code or state parameter");
+      return Response.redirect(new URL(`${errorRedirectUrl}?error=${encodeURIComponent("Invalid OAuth callback")}`, req.url));
+    }
+    const targetUrl = new URL(redirectUrl, req.url);
+    targetUrl.hash = `oauth_callback=${encodeURIComponent(JSON.stringify({ code, state }))}`;
+    return Response.redirect(targetUrl);
+  };
+}
 // src/adapters/tanstack-start.ts
 function createTanStackOAuthHandler(config) {
   const handler = new OAuthHandler(config);
@@ -1590,6 +1785,7 @@ export {
   generateCodeChallenge,
   createTanStackOAuthHandler,
   createSimplePlugin,
+  createOAuthRedirectHandler,
   createNextOAuthHandler,
   createMCPClient,
   convertMCPToolsToVercelAI,

package/dist/server.js

@@ -591,6 +591,7 @@ function base64UrlEncode(array) {
 }
 
 // src/oauth/window-manager.ts
+"use client";
 function isBrowser() {
   return typeof window !== "undefined" && typeof window.document !== "undefined";
 }
@@ -699,6 +700,21 @@ class OAuthWindowManager {
       let state = params.get("state");
       let error = params.get("error");
       let errorDescription = params.get("error_description");
+      if (!code && !error && window.location.hash) {
+        try {
+          const hash = window.location.hash.substring(1);
+          const hashParams = new URLSearchParams(hash);
+          const oauthCallback = hashParams.get("oauth_callback");
+          if (oauthCallback) {
+            const parsed = JSON.parse(decodeURIComponent(oauthCallback));
+            code = parsed.code;
+            state = parsed.state;
+            window.history.replaceState(null, "", window.location.pathname + window.location.search);
+          }
+        } catch (e) {
+          console.error("Failed to parse OAuth callback params from hash:", e);
+        }
+      }
       if (!code && !error) {
         try {
           const stored = sessionStorage.getItem("oauth_callback_params");
@@ -761,6 +777,8 @@ function sendCallbackToOpener(params) {
 }
 
 // src/oauth/manager.ts
+"use client";
+
 class OAuthManager {
   pendingAuths = new Map;
   sessionToken;
@@ -824,6 +842,7 @@ class OAuthManager {
     try {
       const response = await this.exchangeCodeForToken(pendingAuth.provider, code, pendingAuth.codeVerifier, state);
       this.sessionToken = response.sessionToken;
+      this.saveSessionToken(response.sessionToken);
       this.pendingAuths.delete(state);
       return response.sessionToken;
     } catch (error) {
@@ -867,9 +886,26 @@ class OAuthManager {
   }
   setSessionToken(token) {
     this.sessionToken = token;
+    this.saveSessionToken(token);
   }
   clearSessionToken() {
     this.sessionToken = undefined;
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.removeItem("integrate_session_token");
+      } catch (error) {
+        console.error("Failed to clear session token from sessionStorage:", error);
+      }
+    }
+  }
+  saveSessionToken(token) {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.setItem("integrate_session_token", token);
+      } catch (error) {
+        console.error("Failed to save session token to sessionStorage:", error);
+      }
+    }
   }
   async getAuthorizationUrl(provider, scopes, state, codeChallenge, redirectUri) {
     const url = `${this.oauthApiBase}/authorize`;
@@ -921,6 +957,42 @@ class OAuthManager {
 }
 
 // src/client.ts
+"use client";
+
+class SimpleEventEmitter {
+  handlers = new Map;
+  on(event, handler) {
+    if (!this.handlers.has(event)) {
+      this.handlers.set(event, new Set);
+    }
+    this.handlers.get(event).add(handler);
+  }
+  off(event, handler) {
+    const handlers = this.handlers.get(event);
+    if (handlers) {
+      handlers.delete(handler);
+    }
+  }
+  emit(event, payload) {
+    const handlers = this.handlers.get(event);
+    if (handlers) {
+      handlers.forEach((handler) => {
+        try {
+          handler(payload);
+        } catch (error) {
+          console.error(`Error in event handler for ${event}:`, error);
+        }
+      });
+    }
+  }
+  removeAllListeners(event) {
+    if (event) {
+      this.handlers.delete(event);
+    } else {
+      this.handlers.clear();
+    }
+  }
+}
 var MCP_SERVER_URL = "https://mcp.integrate.dev/api/v1/mcp";
 var clientCache = new Map;
 var cleanupClients = new Set;
@@ -939,6 +1011,7 @@ class MCPClient {
   connectionMode;
   connecting = null;
   oauthManager;
+  eventEmitter = new SimpleEventEmitter;
   github;
   gmail;
   server;
@@ -957,9 +1030,16 @@ class MCPClient {
     this.maxReauthRetries = config.maxReauthRetries ?? 1;
     this.connectionMode = config.connectionMode ?? "lazy";
     this.oauthManager = new OAuthManager(config.oauthApiBase || "/api/integrate/oauth", config.oauthFlow);
-    if (config.sessionToken) {
-      this.oauthManager.setSessionToken(config.sessionToken);
-      this.transport.setHeader("X-Session-Token", config.sessionToken);
+    let sessionToken = config.sessionToken;
+    if (!sessionToken) {
+      const storedToken = this.loadSessionToken();
+      if (storedToken) {
+        sessionToken = storedToken;
+      }
+    }
+    if (sessionToken) {
+      this.oauthManager.setSessionToken(sessionToken);
+      this.transport.setHeader("X-Session-Token", sessionToken);
     }
     for (const plugin of this.plugins) {
       for (const toolName of plugin.tools) {
@@ -1175,6 +1255,42 @@ class MCPClient {
   onMessage(handler) {
     return this.transport.onMessage(handler);
   }
+  on(event, handler) {
+    this.eventEmitter.on(event, handler);
+  }
+  off(event, handler) {
+    this.eventEmitter.off(event, handler);
+  }
+  saveSessionToken(token) {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.setItem("integrate_session_token", token);
+      } catch (error) {
+        console.error("Failed to save session token to sessionStorage:", error);
+      }
+    }
+  }
+  loadSessionToken() {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        return window.sessionStorage.getItem("integrate_session_token") || undefined;
+      } catch (error) {
+        console.error("Failed to load session token from sessionStorage:", error);
+        return;
+      }
+    }
+    return;
+  }
+  clearSessionToken() {
+    if (typeof window !== "undefined" && window.sessionStorage) {
+      try {
+        window.sessionStorage.removeItem("integrate_session_token");
+      } catch (error) {
+        console.error("Failed to clear session token from sessionStorage:", error);
+      }
+    }
+    this.oauthManager.clearSessionToken();
+  }
   async disconnect() {
     for (const plugin of this.plugins) {
       if (plugin.onDisconnect) {
@@ -1218,18 +1334,44 @@ class MCPClient {
   async authorize(provider) {
     const plugin = this.plugins.find((p) => p.oauth?.provider === provider);
     if (!plugin?.oauth) {
-      throw new Error(`No OAuth configuration found for provider: ${provider}`);
+      const error = new Error(`No OAuth configuration found for provider: ${provider}`);
+      this.eventEmitter.emit("auth:error", { provider, error });
+      throw error;
+    }
+    this.eventEmitter.emit("auth:started", { provider });
+    try {
+      await this.oauthManager.initiateFlow(provider, plugin.oauth);
+      const sessionToken = this.oauthManager.getSessionToken();
+      if (sessionToken) {
+        this.saveSessionToken(sessionToken);
+        this.eventEmitter.emit("auth:complete", { provider, sessionToken });
+      }
+      this.authState.set(provider, { authenticated: true });
+    } catch (error) {
+      this.eventEmitter.emit("auth:error", { provider, error });
+      throw error;
     }
-    await this.oauthManager.initiateFlow(provider, plugin.oauth);
-    this.authState.set(provider, { authenticated: true });
   }
   async handleOAuthCallback(params) {
-    const sessionToken = await this.oauthManager.handleCallback(params.code, params.state);
-    this.transport.setHeader("X-Session-Token", sessionToken);
-    for (const plugin of this.plugins) {
-      if (plugin.oauth) {
-        this.authState.set(plugin.oauth.provider, { authenticated: true });
+    try {
+      const sessionToken = await this.oauthManager.handleCallback(params.code, params.state);
+      this.saveSessionToken(sessionToken);
+      this.transport.setHeader("X-Session-Token", sessionToken);
+      for (const plugin of this.plugins) {
+        if (plugin.oauth) {
+          this.authState.set(plugin.oauth.provider, { authenticated: true });
+          this.eventEmitter.emit("auth:complete", {
+            provider: plugin.oauth.provider,
+            sessionToken
+          });
+        }
       }
+    } catch (error) {
+      this.eventEmitter.emit("auth:error", {
+        provider: "unknown",
+        error
+      });
+      throw error;
     }
   }
   getSessionToken() {
@@ -1324,6 +1466,9 @@ function createMCPClient(config) {
         console.error("Failed to connect client:", error);
       });
     }
+    if (config.autoHandleOAuthCallback !== false) {
+      processOAuthCallbackFromHash(client);
+    }
     return client;
   } else {
     const client = new MCPClient(config);
@@ -1336,9 +1481,35 @@ function createMCPClient(config) {
         console.error("Failed to connect client:", error);
       });
     }
+    if (config.autoHandleOAuthCallback !== false) {
+      processOAuthCallbackFromHash(client);
+    }
     return client;
   }
 }
+function processOAuthCallbackFromHash(client) {
+  if (typeof window === "undefined") {
+    return;
+  }
+  try {
+    const hash = window.location.hash;
+    if (hash && hash.includes("oauth_callback=")) {
+      const hashParams = new URLSearchParams(hash.substring(1));
+      const oauthCallbackData = hashParams.get("oauth_callback");
+      if (oauthCallbackData) {
+        const callbackParams = JSON.parse(decodeURIComponent(oauthCallbackData));
+        if (callbackParams.code && callbackParams.state) {
+          client.handleOAuthCallback(callbackParams).catch((error) => {
+            console.error("Failed to process OAuth callback:", error);
+          });
+          window.history.replaceState(null, "", window.location.pathname + window.location.search);
+        }
+      }
+    }
+  } catch (error) {
+    console.error("Failed to process OAuth callback from hash:", error);
+  }
+}
 async function clearClientCache() {
   const clients = Array.from(clientCache.values());
   clientCache.clear();

package/dist/src/adapters/nextjs-oauth-redirect.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Next.js OAuth Redirect Handler
+ * Handles OAuth callback redirects and forwards parameters to the client
+ */
+type NextRequest = any;
+type NextResponse = any;
+export interface OAuthRedirectConfig {
+    /** URL to redirect to after OAuth callback (default: '/') */
+    redirectUrl?: string;
+    /** URL to redirect to on OAuth error (default: '/auth-error') */
+    errorRedirectUrl?: string;
+}
+/**
+ * Create OAuth redirect handler for Next.js
+ *
+ * This handler processes OAuth callbacks from providers and redirects
+ * to your application with the OAuth parameters encoded in the URL.
+ *
+ * @param config - Redirect configuration
+ * @returns Next.js route handler
+ *
+ * @example
+ * ```typescript
+ * // app/oauth/callback/route.ts
+ * import { createOAuthRedirectHandler } from 'integrate-sdk';
+ *
+ * export const GET = createOAuthRedirectHandler({
+ *   redirectUrl: '/dashboard',
+ * });
+ * ```
+ */
+export declare function createOAuthRedirectHandler(config?: OAuthRedirectConfig): (req: NextRequest) => Promise<NextResponse>;
+export {};
+//# sourceMappingURL=nextjs-oauth-redirect.d.ts.map

package/dist/src/adapters/nextjs-oauth-redirect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nextjs-oauth-redirect.d.ts","sourceRoot":"","sources":["../../../src/adapters/nextjs-oauth-redirect.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,KAAK,WAAW,GAAG,GAAG,CAAC;AACvB,KAAK,YAAY,GAAG,GAAG,CAAC;AAExB,MAAM,WAAW,mBAAmB;IAClC,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,CAAC,EAAE,mBAAmB,IAI3C,KAAK,WAAW,KAAG,OAAO,CAAC,YAAY,CAAC,CAkCnE"}