@ai-sdk/mcp 1.0.96 → 1.0.98

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/mcp
 
+## 1.0.98
+
+### Patch Changes
+
+- b7927f6: fix(mcp): bind OAuth client credentials to their authorization server, including when the selected server is approved by `validateAuthorizationServerURL`
+
+## 1.0.97
+
+### Patch Changes
+
+- Updated dependencies [5aa3086]
+  - @ai-sdk/provider-utils@4.0.61
+
 ## 1.0.96
 
 ### Patch Changes

package/dist/index.d.mts

@@ -119,6 +119,7 @@ declare const OAuthClientInformationSchema: z.ZodObject<{
     client_secret: z.ZodOptional<z.ZodString>;
     client_id_issued_at: z.ZodOptional<z.ZodNumber>;
     client_secret_expires_at: z.ZodOptional<z.ZodNumber>;
+    issuer: z.ZodOptional<z.ZodString>;
     authorization_server: z.ZodOptional<z.ZodString>;
     token_endpoint: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
@@ -195,6 +196,11 @@ interface OAuthClientProvider {
     }): void | Promise<void>;
     get redirectUrl(): string | URL;
     get clientMetadata(): OAuthClientMetadata;
+    /**
+     * Returns client credentials. Pre-registered confidential clients must specify
+     * their authorization server's `issuer` or provide stored authorization server
+     * information. `validateAuthorizationServerURL` does not replace this binding.
+     */
     clientInformation(): OAuthClientInformation | undefined | Promise<OAuthClientInformation | undefined>;
     /**
      * Returns whether the current client information was obtained through
@@ -212,6 +218,7 @@ interface OAuthClientProvider {
     /**
      * Validates an authorization server URL discovered from MCP protected resource
      * metadata before the client fetches its OAuth metadata.
+     * This additional restriction does not bind client credentials to that server.
      */
     validateAuthorizationServerURL?(serverUrl: string | URL, authorizationServerUrl: string | URL): void | Promise<void>;
     state?(): string | Promise<string>;

package/dist/index.d.ts

@@ -119,6 +119,7 @@ declare const OAuthClientInformationSchema: z.ZodObject<{
     client_secret: z.ZodOptional<z.ZodString>;
     client_id_issued_at: z.ZodOptional<z.ZodNumber>;
     client_secret_expires_at: z.ZodOptional<z.ZodNumber>;
+    issuer: z.ZodOptional<z.ZodString>;
     authorization_server: z.ZodOptional<z.ZodString>;
     token_endpoint: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
@@ -195,6 +196,11 @@ interface OAuthClientProvider {
     }): void | Promise<void>;
     get redirectUrl(): string | URL;
     get clientMetadata(): OAuthClientMetadata;
+    /**
+     * Returns client credentials. Pre-registered confidential clients must specify
+     * their authorization server's `issuer` or provide stored authorization server
+     * information. `validateAuthorizationServerURL` does not replace this binding.
+     */
     clientInformation(): OAuthClientInformation | undefined | Promise<OAuthClientInformation | undefined>;
     /**
      * Returns whether the current client information was obtained through
@@ -212,6 +218,7 @@ interface OAuthClientProvider {
     /**
      * Validates an authorization server URL discovered from MCP protected resource
      * metadata before the client fetches its OAuth metadata.
+     * This additional restriction does not bind client credentials to that server.
      */
     validateAuthorizationServerURL?(serverUrl: string | URL, authorizationServerUrl: string | URL): void | Promise<void>;
     state?(): string | Promise<string>;

package/dist/index.js

@@ -459,6 +459,7 @@ var OAuthClientInformationSchema = import_v43.z.object({
   client_secret: import_v43.z.string().optional(),
   client_id_issued_at: import_v43.z.number().optional(),
   client_secret_expires_at: import_v43.z.number().optional(),
+  issuer: SafeUrlSchema.optional(),
   authorization_server: SafeUrlSchema.optional(),
   token_endpoint: SafeUrlSchema.optional()
 }).strip();
@@ -1234,10 +1235,16 @@ async function auth(provider, options) {
       await ((_b3 = provider.invalidateCredentials) == null ? void 0 : _b3.call(provider, "all"));
       return await authInternal(provider, options);
     } else if (error instanceof InvalidGrantError && refreshAttempt.tokens) {
+      const retryAuthorizationServerInformation = getAuthorizationServerInformationFromCredentials(refreshAttempt.tokens);
       await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens", {
         tokens: refreshAttempt.tokens
       }));
-      return await authInternal(provider, options);
+      return await authInternal(
+        provider,
+        options,
+        void 0,
+        retryAuthorizationServerInformation
+      );
     }
     throw error;
   }
@@ -1270,8 +1277,8 @@ async function authInternal(provider, {
   scope,
   resourceMetadataUrl,
   fetchFn
-}, refreshAttempt) {
-  var _a3, _b3, _c;
+}, refreshAttempt, retryAuthorizationServerInformation) {
+  var _a3, _b3, _c, _d, _e;
   let resourceMetadata;
   let authorizationServerUrl;
   let clientInformation;
@@ -1326,6 +1333,12 @@ async function authInternal(provider, {
     }
   );
   const currentAuthorizationServerInformation = createAuthorizationServerInformation(authorizationServerUrl, metadata);
+  if (retryAuthorizationServerInformation) {
+    assertAuthorizationServerInformationMatches({
+      storedAuthorizationServerInformation: retryAuthorizationServerInformation,
+      currentAuthorizationServerInformation
+    });
+  }
   const clientMetadata = provider.clientMetadata;
   const selectedScope = selectScope({
     scope,
@@ -1335,6 +1348,37 @@ async function authInternal(provider, {
   if (authorizationCode === void 0) {
     clientInformation = await Promise.resolve(provider.clientInformation());
   }
+  const tokens = authorizationCode === void 0 ? await provider.tokens() : void 0;
+  if (clientInformation) {
+    if (clientInformation.issuer != null && clientInformation.issuer !== ((_c = metadata == null ? void 0 : metadata.issuer) != null ? _c : authorizationServerUrl.toString())) {
+      throw new MCPClientOAuthError({
+        message: "OAuth authorization server does not match the issuer of the client credentials"
+      });
+    }
+    const clientAuthorizationServerInformation = getAuthorizationServerInformationFromCredentials(clientInformation);
+    if (clientAuthorizationServerInformation) {
+      assertAuthorizationServerInformationMatches({
+        storedAuthorizationServerInformation: clientAuthorizationServerInformation,
+        currentAuthorizationServerInformation
+      });
+    }
+    const storedAuthorizationServerInformation = (_d = callbackAuthorizationServerInformation != null ? callbackAuthorizationServerInformation : await getStoredAuthorizationServerInformation({
+      provider,
+      clientInformation,
+      tokens
+    })) != null ? _d : retryAuthorizationServerInformation;
+    if (storedAuthorizationServerInformation) {
+      assertAuthorizationServerInformationMatches({
+        storedAuthorizationServerInformation,
+        currentAuthorizationServerInformation
+      });
+    }
+    if ((clientInformation.client_secret != null || provider.addClientAuthentication) && clientInformation.issuer == null && !storedAuthorizationServerInformation) {
+      throw new MCPClientOAuthError({
+        message: "OAuth client credentials must be bound to an authorization server: configure their issuer or store authorization server information"
+      });
+    }
+  }
   if (!clientInformation) {
     if (authorizationCode !== void 0) {
       throw new Error(
@@ -1401,7 +1445,6 @@ async function authInternal(provider, {
     );
     return "AUTHORIZED";
   }
-  const tokens = await provider.tokens();
   if (tokens == null ? void 0 : tokens.refresh_token) {
     const storedAuthorizationServerInformation = await getStoredAuthorizationServerInformation({
       provider,
@@ -1414,7 +1457,7 @@ async function authInternal(provider, {
         currentAuthorizationServerInformation
       });
     } else {
-      await ((_c = provider.invalidateCredentials) == null ? void 0 : _c.call(provider, "tokens", {
+      await ((_e = provider.invalidateCredentials) == null ? void 0 : _e.call(provider, "tokens", {
         tokens: { ...tokens }
       }));
     }