integrate-sdk 0.8.79-dev.0 → 0.8.80-dev.0

package/dist/adapters/nextjs.js

@@ -57,6 +57,108 @@ var init_logger = __esm(() => {
   };
 });
 
+// ../oauth/email-fetcher.ts
+async function fetchUserEmail(provider, tokenData) {
+  try {
+    switch (provider.toLowerCase()) {
+      case "github":
+        return await fetchGitHubEmail(tokenData.accessToken);
+      case "gmail":
+      case "google":
+        return await fetchGoogleEmail(tokenData.accessToken);
+      case "notion":
+        return await fetchNotionEmail(tokenData.accessToken);
+      default:
+        return tokenData.email;
+    }
+  } catch (error) {
+    logger.error(`Failed to fetch email for ${provider}:`, error);
+    return;
+  }
+}
+async function fetchGitHubEmail(accessToken) {
+  try {
+    const userResponse = await fetch("https://api.github.com/user", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/vnd.github.v3+json"
+      }
+    });
+    if (!userResponse.ok) {
+      return;
+    }
+    const user = await userResponse.json();
+    if (user.email) {
+      return user.email;
+    }
+    const emailsResponse = await fetch("https://api.github.com/user/emails", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/vnd.github.v3+json"
+      }
+    });
+    if (!emailsResponse.ok) {
+      return;
+    }
+    const emails = await emailsResponse.json();
+    const primaryEmail = emails.find((e) => e.primary && e.verified);
+    if (primaryEmail) {
+      return primaryEmail.email;
+    }
+    const verifiedEmail = emails.find((e) => e.verified);
+    if (verifiedEmail) {
+      return verifiedEmail.email;
+    }
+    if (emails.length > 0 && emails[0]?.email) {
+      return emails[0].email;
+    }
+    return;
+  } catch (error) {
+    logger.error("Failed to fetch GitHub email:", error);
+    return;
+  }
+}
+async function fetchGoogleEmail(accessToken) {
+  try {
+    const response = await fetch("https://www.googleapis.com/oauth2/v2/userinfo", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`
+      }
+    });
+    if (!response.ok) {
+      return;
+    }
+    const user = await response.json();
+    return user.email;
+  } catch (error) {
+    logger.error("Failed to fetch Google email:", error);
+    return;
+  }
+}
+async function fetchNotionEmail(accessToken) {
+  try {
+    const response = await fetch("https://api.notion.com/v1/users/me", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        "Notion-Version": "2022-06-28"
+      }
+    });
+    if (!response.ok) {
+      return;
+    }
+    const user = await response.json();
+    return user.person?.email;
+  } catch (error) {
+    logger.error("Failed to fetch Notion email:", error);
+    return;
+  }
+}
+var logger;
+var init_email_fetcher = __esm(() => {
+  init_logger();
+  logger = createLogger("EmailFetcher");
+});
+
 // ../protocol/jsonrpc.ts
 function parseMessage(message) {
   try {
@@ -122,7 +224,7 @@ class HttpSessionTransport {
         const sid = response.headers.get("mcp-session-id");
         if (sid) {
           this.sessionId = sid;
-          logger.debug("Session established:", sid);
+          logger2.debug("Session established:", sid);
           this.startSSEListener();
         }
       }
@@ -172,7 +274,7 @@ class HttpSessionTransport {
       if (error instanceof Error && error.name === "AbortError") {
         return;
       }
-      logger.error("SSE connection error:", error);
+      logger2.error("SSE connection error:", error);
     }
   }
   async processSSEStream(body) {
@@ -201,7 +303,7 @@ class HttpSessionTransport {
       if (error instanceof Error && error.name === "AbortError") {
         return;
       }
-      logger.error("SSE stream error:", error);
+      logger2.error("SSE stream error:", error);
     } finally {
       reader.releaseLock();
     }
@@ -213,11 +315,11 @@ class HttpSessionTransport {
         try {
           handler(message);
         } catch (error) {
-          logger.error("Error in message handler:", error);
+          logger2.error("Error in message handler:", error);
         }
       });
     } catch (error) {
-      logger.error("Failed to parse notification:", error);
+      logger2.error("Failed to parse notification:", error);
     }
   }
   onMessage(handler) {
@@ -254,10 +356,10 @@ class HttpSessionTransport {
     return { ...this.headers };
   }
 }
-var logger;
+var logger2;
 var init_http_session = __esm(() => {
   init_logger();
-  logger = createLogger("HTTPSession");
+  logger2 = createLogger("HTTPSession");
 });
 
 // ../protocol/messages.ts
@@ -617,7 +719,7 @@ class OAuthWindowManager {
     const windowName = `oauth_popup_${Date.now()}`;
     this.popupWindow = window.open(url, windowName, features);
     if (!this.popupWindow) {
-      logger2.warn("Popup was blocked by the browser. Please allow popups for this site.");
+      logger3.warn("Popup was blocked by the browser. Please allow popups for this site.");
       return null;
     }
     this.popupWindow.focus();
@@ -627,7 +729,7 @@ class OAuthWindowManager {
     if (!isBrowser()) {
       throw new Error("OAuthWindowManager.openRedirect() can only be used in browser environments");
     }
-    logger2.debug("[OAuthWindowManager] Redirecting to:", url.substring(0, 100) + (url.length > 100 ? "..." : ""));
+    logger3.debug("[OAuthWindowManager] Redirecting to:", url.substring(0, 100) + (url.length > 100 ? "..." : ""));
     window.location.href = url;
   }
   listenForCallback(mode, timeoutMs = 5 * 60 * 1000) {
@@ -706,7 +808,7 @@ class OAuthWindowManager {
             window.history.replaceState(null, "", window.location.pathname + window.location.search);
           }
         } catch (e) {
-          logger2.error("Failed to parse OAuth callback params from hash:", e);
+          logger3.error("Failed to parse OAuth callback params from hash:", e);
         }
       }
       if (!code && !error) {
@@ -719,7 +821,7 @@ class OAuthWindowManager {
             sessionStorage.removeItem("oauth_callback_params");
           }
         } catch (e) {
-          logger2.error("Failed to parse OAuth callback params from sessionStorage:", e);
+          logger3.error("Failed to parse OAuth callback params from sessionStorage:", e);
         }
       }
       if (error) {
@@ -752,10 +854,10 @@ class OAuthWindowManager {
     this.cleanup();
   }
 }
-var logger2;
+var logger3;
 var init_window_manager = __esm(() => {
   init_logger();
-  logger2 = createLogger("OAuthWindowManager");
+  logger3 = createLogger("OAuthWindowManager");
 });
 
 // ../oauth/indexeddb-storage.ts
@@ -932,108 +1034,6 @@ class IndexedDBStorage {
 }
 var DB_NAME = "integrate_oauth_tokens", DB_VERSION = 1, STORE_NAME = "tokens";
 
-// ../oauth/email-fetcher.ts
-async function fetchUserEmail(provider, tokenData) {
-  try {
-    switch (provider.toLowerCase()) {
-      case "github":
-        return await fetchGitHubEmail(tokenData.accessToken);
-      case "gmail":
-      case "google":
-        return await fetchGoogleEmail(tokenData.accessToken);
-      case "notion":
-        return await fetchNotionEmail(tokenData.accessToken);
-      default:
-        return tokenData.email;
-    }
-  } catch (error) {
-    logger3.error(`Failed to fetch email for ${provider}:`, error);
-    return;
-  }
-}
-async function fetchGitHubEmail(accessToken) {
-  try {
-    const userResponse = await fetch("https://api.github.com/user", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        Accept: "application/vnd.github.v3+json"
-      }
-    });
-    if (!userResponse.ok) {
-      return;
-    }
-    const user = await userResponse.json();
-    if (user.email) {
-      return user.email;
-    }
-    const emailsResponse = await fetch("https://api.github.com/user/emails", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        Accept: "application/vnd.github.v3+json"
-      }
-    });
-    if (!emailsResponse.ok) {
-      return;
-    }
-    const emails = await emailsResponse.json();
-    const primaryEmail = emails.find((e) => e.primary && e.verified);
-    if (primaryEmail) {
-      return primaryEmail.email;
-    }
-    const verifiedEmail = emails.find((e) => e.verified);
-    if (verifiedEmail) {
-      return verifiedEmail.email;
-    }
-    if (emails.length > 0 && emails[0]?.email) {
-      return emails[0].email;
-    }
-    return;
-  } catch (error) {
-    logger3.error("Failed to fetch GitHub email:", error);
-    return;
-  }
-}
-async function fetchGoogleEmail(accessToken) {
-  try {
-    const response = await fetch("https://www.googleapis.com/oauth2/v2/userinfo", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`
-      }
-    });
-    if (!response.ok) {
-      return;
-    }
-    const user = await response.json();
-    return user.email;
-  } catch (error) {
-    logger3.error("Failed to fetch Google email:", error);
-    return;
-  }
-}
-async function fetchNotionEmail(accessToken) {
-  try {
-    const response = await fetch("https://api.notion.com/v1/users/me", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "Notion-Version": "2022-06-28"
-      }
-    });
-    if (!response.ok) {
-      return;
-    }
-    const user = await response.json();
-    return user.person?.email;
-  } catch (error) {
-    logger3.error("Failed to fetch Notion email:", error);
-    return;
-  }
-}
-var logger3;
-var init_email_fetcher = __esm(() => {
-  init_logger();
-  logger3 = createLogger("EmailFetcher");
-});
-
 // ../oauth/manager.ts
 class OAuthManager {
   pendingAuths = new Map;
@@ -11754,7 +11754,11 @@ class OAuthHandler {
           expiresAt: result.expiresAt,
           scopes: result.scopes ? result.scopes.flatMap((s) => s.split(" ").filter(Boolean)) : result.scopes
         };
-        await this.config.setProviderToken(callbackRequest.provider, tokenData, undefined, context);
+        const email = result.email || await fetchUserEmail(callbackRequest.provider, tokenData);
+        if (email) {
+          tokenData.email = email;
+        }
+        await this.config.setProviderToken(callbackRequest.provider, tokenData, email, context);
       } catch (error) {}
     }
     if (webRequest) {
@@ -11871,6 +11875,7 @@ class OAuthHandler {
 }
 var SERVER_LOG_CONTEXT2 = "server", logger32, MCP_SERVER_URL2 = "https://mcp.integrate.dev/api/v1/mcp";
 var init_base_handler = __esm(() => {
+  init_email_fetcher();
   init_logger();
   logger32 = createLogger("OAuthHandler", SERVER_LOG_CONTEXT2);
 });

package/dist/adapters/node.js

@@ -57,6 +57,108 @@ var init_logger = __esm(() => {
   };
 });
 
+// ../oauth/email-fetcher.ts
+async function fetchUserEmail(provider, tokenData) {
+  try {
+    switch (provider.toLowerCase()) {
+      case "github":
+        return await fetchGitHubEmail(tokenData.accessToken);
+      case "gmail":
+      case "google":
+        return await fetchGoogleEmail(tokenData.accessToken);
+      case "notion":
+        return await fetchNotionEmail(tokenData.accessToken);
+      default:
+        return tokenData.email;
+    }
+  } catch (error) {
+    logger.error(`Failed to fetch email for ${provider}:`, error);
+    return;
+  }
+}
+async function fetchGitHubEmail(accessToken) {
+  try {
+    const userResponse = await fetch("https://api.github.com/user", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/vnd.github.v3+json"
+      }
+    });
+    if (!userResponse.ok) {
+      return;
+    }
+    const user = await userResponse.json();
+    if (user.email) {
+      return user.email;
+    }
+    const emailsResponse = await fetch("https://api.github.com/user/emails", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/vnd.github.v3+json"
+      }
+    });
+    if (!emailsResponse.ok) {
+      return;
+    }
+    const emails = await emailsResponse.json();
+    const primaryEmail = emails.find((e) => e.primary && e.verified);
+    if (primaryEmail) {
+      return primaryEmail.email;
+    }
+    const verifiedEmail = emails.find((e) => e.verified);
+    if (verifiedEmail) {
+      return verifiedEmail.email;
+    }
+    if (emails.length > 0 && emails[0]?.email) {
+      return emails[0].email;
+    }
+    return;
+  } catch (error) {
+    logger.error("Failed to fetch GitHub email:", error);
+    return;
+  }
+}
+async function fetchGoogleEmail(accessToken) {
+  try {
+    const response = await fetch("https://www.googleapis.com/oauth2/v2/userinfo", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`
+      }
+    });
+    if (!response.ok) {
+      return;
+    }
+    const user = await response.json();
+    return user.email;
+  } catch (error) {
+    logger.error("Failed to fetch Google email:", error);
+    return;
+  }
+}
+async function fetchNotionEmail(accessToken) {
+  try {
+    const response = await fetch("https://api.notion.com/v1/users/me", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        "Notion-Version": "2022-06-28"
+      }
+    });
+    if (!response.ok) {
+      return;
+    }
+    const user = await response.json();
+    return user.person?.email;
+  } catch (error) {
+    logger.error("Failed to fetch Notion email:", error);
+    return;
+  }
+}
+var logger;
+var init_email_fetcher = __esm(() => {
+  init_logger();
+  logger = createLogger("EmailFetcher");
+});
+
 // ../protocol/jsonrpc.ts
 function parseMessage(message) {
   try {
@@ -122,7 +224,7 @@ class HttpSessionTransport {
         const sid = response.headers.get("mcp-session-id");
         if (sid) {
           this.sessionId = sid;
-          logger.debug("Session established:", sid);
+          logger2.debug("Session established:", sid);
           this.startSSEListener();
         }
       }
@@ -172,7 +274,7 @@ class HttpSessionTransport {
       if (error instanceof Error && error.name === "AbortError") {
         return;
       }
-      logger.error("SSE connection error:", error);
+      logger2.error("SSE connection error:", error);
     }
   }
   async processSSEStream(body) {
@@ -201,7 +303,7 @@ class HttpSessionTransport {
       if (error instanceof Error && error.name === "AbortError") {
         return;
       }
-      logger.error("SSE stream error:", error);
+      logger2.error("SSE stream error:", error);
     } finally {
       reader.releaseLock();
     }
@@ -213,11 +315,11 @@ class HttpSessionTransport {
         try {
           handler(message);
         } catch (error) {
-          logger.error("Error in message handler:", error);
+          logger2.error("Error in message handler:", error);
         }
       });
     } catch (error) {
-      logger.error("Failed to parse notification:", error);
+      logger2.error("Failed to parse notification:", error);
     }
   }
   onMessage(handler) {
@@ -254,10 +356,10 @@ class HttpSessionTransport {
     return { ...this.headers };
   }
 }
-var logger;
+var logger2;
 var init_http_session = __esm(() => {
   init_logger();
-  logger = createLogger("HTTPSession");
+  logger2 = createLogger("HTTPSession");
 });
 
 // ../protocol/messages.ts
@@ -617,7 +719,7 @@ class OAuthWindowManager {
     const windowName = `oauth_popup_${Date.now()}`;
     this.popupWindow = window.open(url, windowName, features);
     if (!this.popupWindow) {
-      logger2.warn("Popup was blocked by the browser. Please allow popups for this site.");
+      logger3.warn("Popup was blocked by the browser. Please allow popups for this site.");
       return null;
     }
     this.popupWindow.focus();
@@ -627,7 +729,7 @@ class OAuthWindowManager {
     if (!isBrowser()) {
       throw new Error("OAuthWindowManager.openRedirect() can only be used in browser environments");
     }
-    logger2.debug("[OAuthWindowManager] Redirecting to:", url.substring(0, 100) + (url.length > 100 ? "..." : ""));
+    logger3.debug("[OAuthWindowManager] Redirecting to:", url.substring(0, 100) + (url.length > 100 ? "..." : ""));
     window.location.href = url;
   }
   listenForCallback(mode, timeoutMs = 5 * 60 * 1000) {
@@ -706,7 +808,7 @@ class OAuthWindowManager {
             window.history.replaceState(null, "", window.location.pathname + window.location.search);
           }
         } catch (e) {
-          logger2.error("Failed to parse OAuth callback params from hash:", e);
+          logger3.error("Failed to parse OAuth callback params from hash:", e);
         }
       }
       if (!code && !error) {
@@ -719,7 +821,7 @@ class OAuthWindowManager {
             sessionStorage.removeItem("oauth_callback_params");
           }
         } catch (e) {
-          logger2.error("Failed to parse OAuth callback params from sessionStorage:", e);
+          logger3.error("Failed to parse OAuth callback params from sessionStorage:", e);
         }
       }
       if (error) {
@@ -752,10 +854,10 @@ class OAuthWindowManager {
     this.cleanup();
   }
 }
-var logger2;
+var logger3;
 var init_window_manager = __esm(() => {
   init_logger();
-  logger2 = createLogger("OAuthWindowManager");
+  logger3 = createLogger("OAuthWindowManager");
 });
 
 // ../oauth/indexeddb-storage.ts
@@ -932,108 +1034,6 @@ class IndexedDBStorage {
 }
 var DB_NAME = "integrate_oauth_tokens", DB_VERSION = 1, STORE_NAME = "tokens";
 
-// ../oauth/email-fetcher.ts
-async function fetchUserEmail(provider, tokenData) {
-  try {
-    switch (provider.toLowerCase()) {
-      case "github":
-        return await fetchGitHubEmail(tokenData.accessToken);
-      case "gmail":
-      case "google":
-        return await fetchGoogleEmail(tokenData.accessToken);
-      case "notion":
-        return await fetchNotionEmail(tokenData.accessToken);
-      default:
-        return tokenData.email;
-    }
-  } catch (error) {
-    logger3.error(`Failed to fetch email for ${provider}:`, error);
-    return;
-  }
-}
-async function fetchGitHubEmail(accessToken) {
-  try {
-    const userResponse = await fetch("https://api.github.com/user", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        Accept: "application/vnd.github.v3+json"
-      }
-    });
-    if (!userResponse.ok) {
-      return;
-    }
-    const user = await userResponse.json();
-    if (user.email) {
-      return user.email;
-    }
-    const emailsResponse = await fetch("https://api.github.com/user/emails", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        Accept: "application/vnd.github.v3+json"
-      }
-    });
-    if (!emailsResponse.ok) {
-      return;
-    }
-    const emails = await emailsResponse.json();
-    const primaryEmail = emails.find((e) => e.primary && e.verified);
-    if (primaryEmail) {
-      return primaryEmail.email;
-    }
-    const verifiedEmail = emails.find((e) => e.verified);
-    if (verifiedEmail) {
-      return verifiedEmail.email;
-    }
-    if (emails.length > 0 && emails[0]?.email) {
-      return emails[0].email;
-    }
-    return;
-  } catch (error) {
-    logger3.error("Failed to fetch GitHub email:", error);
-    return;
-  }
-}
-async function fetchGoogleEmail(accessToken) {
-  try {
-    const response = await fetch("https://www.googleapis.com/oauth2/v2/userinfo", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`
-      }
-    });
-    if (!response.ok) {
-      return;
-    }
-    const user = await response.json();
-    return user.email;
-  } catch (error) {
-    logger3.error("Failed to fetch Google email:", error);
-    return;
-  }
-}
-async function fetchNotionEmail(accessToken) {
-  try {
-    const response = await fetch("https://api.notion.com/v1/users/me", {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "Notion-Version": "2022-06-28"
-      }
-    });
-    if (!response.ok) {
-      return;
-    }
-    const user = await response.json();
-    return user.person?.email;
-  } catch (error) {
-    logger3.error("Failed to fetch Notion email:", error);
-    return;
-  }
-}
-var logger3;
-var init_email_fetcher = __esm(() => {
-  init_logger();
-  logger3 = createLogger("EmailFetcher");
-});
-
 // ../oauth/manager.ts
 class OAuthManager {
   pendingAuths = new Map;
@@ -11754,7 +11754,11 @@ class OAuthHandler {
           expiresAt: result.expiresAt,
           scopes: result.scopes ? result.scopes.flatMap((s) => s.split(" ").filter(Boolean)) : result.scopes
         };
-        await this.config.setProviderToken(callbackRequest.provider, tokenData, undefined, context);
+        const email = result.email || await fetchUserEmail(callbackRequest.provider, tokenData);
+        if (email) {
+          tokenData.email = email;
+        }
+        await this.config.setProviderToken(callbackRequest.provider, tokenData, email, context);
       } catch (error) {}
     }
     if (webRequest) {
@@ -11871,6 +11875,7 @@ class OAuthHandler {
 }
 var SERVER_LOG_CONTEXT2 = "server", logger32, MCP_SERVER_URL2 = "https://mcp.integrate.dev/api/v1/mcp";
 var init_base_handler = __esm(() => {
+  init_email_fetcher();
   init_logger();
   logger32 = createLogger("OAuthHandler", SERVER_LOG_CONTEXT2);
 });