Fix MCP SDK build errors

src/services/mcpClient.ts

@@ -153,9 +153,7 @@ export class MCPClientService {
           version: MCP_CLIENT_CONFIG.VERSION,
         },
         {
-          capabilities: {
-            tools: {},
-          },
+          capabilities: {},
         }
       );
 
@@ -324,9 +322,7 @@ export class MCPClientService {
           version: MCP_CLIENT_CONFIG.VERSION,
         },
         {
-          capabilities: {
-            tools: {},
-          },
+          capabilities: {},
         }
       );
 

src/services/oauth.ts

@@ -5,8 +5,20 @@ import {
   exchangeAuthorization,
   registerClient,
 } from "@modelcontextprotocol/sdk/client/auth.js";
+import type {
+  AuthorizationServerMetadata,
+  OAuthClientInformationMixed,
+} from "@modelcontextprotocol/sdk/shared/auth.js";
 import { secureStorage } from "../utils/storage";
 import { MCP_CLIENT_CONFIG, STORAGE_KEYS, DEFAULTS } from "../config/constants";
+
+type OAuthMetadataOverrides = AuthorizationServerMetadata & {
+  client_id?: string;
+  client_secret?: string;
+  redirect_uri?: string;
+  scopes?: string[];
+};
+
 // Utility to fetch .well-known/modelcontextprotocol for OAuth endpoints
 export async function discoverOAuthEndpoints(serverUrl: string) {
   // ...existing code...
@@ -42,8 +54,34 @@ export async function discoverOAuthEndpoints(serverUrl: string) {
     throw new Error("Missing OAuth endpoints in authorization server metadata");
   }
 
-  // If client_id is missing, register client dynamically
-  if (!authMetadata.client_id && authMetadata.registration_endpoint) {
+  const metadataOverrides = authMetadata as OAuthMetadataOverrides;
+  const redirectUri =
+    metadataOverrides.redirect_uri ||
+    window.location.origin + "/#" + DEFAULTS.OAUTH_REDIRECT_PATH;
+  let clientInformation: OAuthClientInformationMixed | undefined;
+  const persistedClientId = localStorage.getItem(STORAGE_KEYS.OAUTH_CLIENT_ID);
+  const persistedClientSecret = await secureStorage.getItem(
+    STORAGE_KEYS.OAUTH_CLIENT_SECRET
+  );
+
+  if (persistedClientId) {
+    clientInformation = {
+      client_id: persistedClientId,
+      ...(persistedClientSecret
+        ? { client_secret: persistedClientSecret }
+        : {}),
+    };
+  } else if (metadataOverrides.client_id) {
+    clientInformation = {
+      client_id: metadataOverrides.client_id,
+      ...(metadataOverrides.client_secret
+        ? { client_secret: metadataOverrides.client_secret }
+        : {}),
+    };
+  }
+
+  // If client credentials are missing, register client dynamically
+  if (!clientInformation?.client_id && authMetadata.registration_endpoint) {
     // Determine token endpoint auth method
     let tokenEndpointAuthMethod = "none";
     if (
@@ -60,12 +98,7 @@ export async function discoverOAuthEndpoints(serverUrl: string) {
       tokenEndpointAuthMethod = "client_secret_basic";
     }
     const clientMetadata = {
-      redirect_uris: [
-        String(
-          authMetadata.redirect_uri ||
-            window.location.origin + "/#/oauth/callback"
-        ),
-      ],
+      redirect_uris: [redirectUri],
       client_name: MCP_CLIENT_CONFIG.NAME,
       grant_types: ["authorization_code"],
       response_types: ["code"],
@@ -75,17 +108,14 @@ export async function discoverOAuthEndpoints(serverUrl: string) {
       metadata: authMetadata,
       clientMetadata,
     });
-    authMetadata.client_id = clientInfo.client_id;
-    if (clientInfo.client_secret) {
-      authMetadata.client_secret = clientInfo.client_secret;
-    }
+    clientInformation = clientInfo;
     // Persist client credentials for later use
     localStorage.setItem(STORAGE_KEYS.OAUTH_CLIENT_ID, clientInfo.client_id);
     if (clientInfo.client_secret) {
       await secureStorage.setItem(STORAGE_KEYS.OAUTH_CLIENT_SECRET, clientInfo.client_secret);
     }
   }
-  if (!authMetadata.client_id) {
+  if (!clientInformation?.client_id) {
     throw new Error(
       "Missing client_id and registration not supported by authorization server"
     );
@@ -104,7 +134,7 @@ export async function discoverOAuthEndpoints(serverUrl: string) {
   localStorage.setItem(STORAGE_KEYS.OAUTH_TOKEN_ENDPOINT, authMetadata.token_endpoint);
   localStorage.setItem(
     STORAGE_KEYS.OAUTH_REDIRECT_URI,
-    (authMetadata.redirect_uri ||window.location.origin + "/#" + DEFAULTS.OAUTH_REDIRECT_PATH).toString()
+    redirectUri
   );
   localStorage.setItem(STORAGE_KEYS.OAUTH_MCP_SERVER_URL, serverUrl);
   localStorage.setItem(
@@ -117,11 +147,14 @@ export async function discoverOAuthEndpoints(serverUrl: string) {
   return {
     authorizationEndpoint: authMetadata.authorization_endpoint,
     tokenEndpoint: authMetadata.token_endpoint,
-    clientId: authMetadata.client_id,
-    clientSecret: authMetadata.client_secret,
-    scopes: authMetadata.scopes || [],
-    redirectUri:
-      authMetadata.redirect_uri || window.location.origin + "/#/oauth/callback",
+    clientId: clientInformation.client_id,
+    clientSecret: clientInformation.client_secret,
+    scopes:
+      metadataOverrides.scopes ||
+      authMetadata.scopes_supported ||
+      resourceMetadata?.scopes_supported ||
+      [],
+    redirectUri,
     resource,
   };
 }