@mcp-ts/sdk 2.3.3 → 2.3.4

package/dist/server/index.mjs

@@ -2,7 +2,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { customAlphabet, nanoid } from 'nanoid';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-import { UnauthorizedError as UnauthorizedError$1, discoverOAuthProtectedResourceMetadata, discoverAuthorizationServerMetadata, refreshAuthorization } from '@modelcontextprotocol/sdk/client/auth.js';
+import { UnauthorizedError as UnauthorizedError$1 } from '@modelcontextprotocol/sdk/client/auth.js';
 import { ListToolsResultSchema, CallToolResultSchema, ListPromptsResultSchema, GetPromptResultSchema, ListResourcesResultSchema, ReadResourceResultSchema } from '@modelcontextprotocol/sdk/types.js';
 import * as fs2 from 'fs';
 import { promises } from 'fs';
@@ -859,7 +859,7 @@ var SupabaseStorageBackend = class {
     if ("active" in data) updateData.active = data.active;
     if ("headers" in data) updateData.headers = encryptObject(data.headers);
     if ("clientInformation" in data) updateData.client_information = data.clientInformation;
-    if ("tokens" in data) updateData.tokens = encryptObject(data.tokens);
+    if ("tokens" in data) updateData.tokens = data.tokens === void 0 ? null : encryptObject(data.tokens);
     if ("codeVerifier" in data) updateData.code_verifier = data.codeVerifier;
     if ("clientId" in data) updateData.client_id = data.clientId;
     const { data: updatedRows, error } = await this.supabase.from("mcp_sessions").update(updateData).eq("user_id", userId).eq("session_id", sessionId).select("id");
@@ -1061,7 +1061,7 @@ var NeonStorageBackend = class {
         updatedSession.active ?? false,
         encryptObject(updatedSession.headers),
         updatedSession.clientInformation,
-        encryptObject(updatedSession.tokens),
+        updatedSession.tokens === void 0 ? null : encryptObject(updatedSession.tokens),
         updatedSession.codeVerifier,
         updatedSession.clientId,
         expiresAt,
@@ -1642,14 +1642,7 @@ var RpcErrorCodes = {
   EXECUTION_ERROR: "EXECUTION_ERROR"};
 
 // src/server/mcp/oauth-client.ts
-function isInvalidRefreshTokenError(error) {
-  if (!(error instanceof Error)) {
-    return false;
-  }
-  const text = `${error.name} ${error.message}`.toLowerCase();
-  return text.includes("invalidgrant") || text.includes("invalid_grant") || text.includes("invalid refresh token") || /refresh\s+token\s+(?:is\s+)?(?:invalid|expired|revoked)/i.test(text);
-}
-var MCPClient = class _MCPClient {
+var MCPClient = class {
   /**
    * Creates a new MCP client instance
    * Can be initialized with minimal options (userId + sessionId) for session restoration
@@ -1983,8 +1976,6 @@ var MCPClient = class _MCPClient {
       throw new Error(error);
     }
     try {
-      this.emitProgress("Validating OAuth tokens...");
-      await this.getValidTokens();
       this.emitStateChange("CONNECTING");
       const { transportType } = await this.tryConnect();
       this.transportType = transportType;
@@ -2309,67 +2300,6 @@ var MCPClient = class _MCPClient {
     };
     return await this.client.request(request, ReadResourceResultSchema);
   }
-  /**
-   * Refreshes the OAuth access token using the refresh token
-   * Discovers OAuth metadata from server and exchanges refresh token for new access token
-   * @returns True if refresh was successful, false otherwise
-   */
-  async refreshToken() {
-    await this.initialize();
-    if (!this.oauthProvider) {
-      return false;
-    }
-    const tokens = await this.oauthProvider.tokens();
-    if (!tokens || !tokens.refresh_token) {
-      return false;
-    }
-    const clientInformation = await this.oauthProvider.clientInformation();
-    if (!clientInformation) {
-      return false;
-    }
-    try {
-      const resourceMetadata = await discoverOAuthProtectedResourceMetadata(this.serverUrl);
-      const authServerUrl = resourceMetadata?.authorization_servers?.[0] || this.serverUrl;
-      const authMetadata = await discoverAuthorizationServerMetadata(authServerUrl);
-      const newTokens = await refreshAuthorization(authServerUrl, {
-        metadata: authMetadata,
-        clientInformation,
-        refreshToken: tokens.refresh_token
-      });
-      await this.oauthProvider.saveTokens(newTokens);
-      return true;
-    } catch (error) {
-      console.error("[OAuth] Token refresh failed:", error);
-      if (isInvalidRefreshTokenError(error)) {
-        try {
-          await this.oauthProvider.invalidateCredentials?.("tokens");
-          this.emitProgress("OAuth refresh token is invalid; requesting reauthorization...");
-        } catch (invalidateError) {
-          console.warn("[OAuth] Failed to invalidate stale refresh token credentials:", invalidateError);
-        }
-      }
-      return false;
-    }
-  }
-  /**
-   * Ensures OAuth tokens are valid, refreshing them if expired
-   * Called automatically by connect() - rarely needs to be called manually
-   * @returns True if valid tokens are available, false otherwise
-   */
-  async getValidTokens() {
-    await this.initialize();
-    if (!this.oauthProvider) {
-      return false;
-    }
-    const tokens = await this.oauthProvider.tokens();
-    if (!tokens) {
-      return false;
-    }
-    if (this.oauthProvider.isTokenExpired()) {
-      return await this.refreshToken();
-    }
-    return true;
-  }
   /**
    * Reconnects to MCP server using existing OAuth provider from Redis
    * Used for session restoration in serverless environments
@@ -2501,10 +2431,14 @@ var MCPClient = class _MCPClient {
   }
   /**
    * Gets MCP server configuration for all active user sessions
-   * Loads sessions from Redis, validates OAuth tokens, refreshes if expired
-   * Returns ready-to-use configuration with valid auth headers
+   * Loads sessions from storage and returns server connection metadata.
+   * OAuth refresh is handled by SDK transports through their authProvider.
+   * @deprecated This returns legacy connection metadata only and does not
+   * include OAuth tokens or generated Authorization headers. Prefer
+   * MultiSessionClient or explicit MCPClient instances so SDK transports can
+   * own OAuth refresh and reauthorization.
    * @param userId - User ID to fetch sessions for
-   * @returns Object keyed by sanitized server labels containing transport, url, headers, etc.
+   * @returns Object keyed by sanitized server labels containing transport and url.
    * @static
    */
   static async getMcpServerConfig(userId) {
@@ -2518,29 +2452,6 @@ var MCPClient = class _MCPClient {
             await sessions.delete(userId, sessionId);
             return;
           }
-          let headers;
-          try {
-            const client = new _MCPClient({
-              userId,
-              sessionId,
-              serverId: sessionData.serverId,
-              serverUrl: sessionData.serverUrl,
-              callbackUrl: sessionData.callbackUrl,
-              serverName: sessionData.serverName,
-              transportType: sessionData.transportType,
-              headers: sessionData.headers
-            });
-            await client.initialize();
-            const hasValidTokens = await client.getValidTokens();
-            if (hasValidTokens && client.oauthProvider) {
-              const tokens = await client.oauthProvider.tokens();
-              if (tokens?.access_token) {
-                headers = { Authorization: `Bearer ${tokens.access_token}` };
-              }
-            }
-          } catch (error) {
-            console.warn(`[MCP] Failed to get OAuth tokens for ${sessionId}:`, error);
-          }
           const label = sanitizeServerLabel(
             sessionData.serverName || sessionData.serverId || "server"
           );
@@ -2550,8 +2461,7 @@ var MCPClient = class _MCPClient {
             ...sessionData.serverName && {
               serverName: sessionData.serverName,
               serverLabel: label
-            },
-            ...headers && { headers }
+            }
           };
         } catch (error) {
           await sessions.delete(userId, sessionId);