fix(mcp): require a verified issuer before revocation and pin fixture issuers

Author: waleedlatif1

apps/sim/lib/credential-groups/__integration__/hubspot-mcp.integration.ts

@@ -52,6 +52,7 @@ const SHARED_CLIENTS = [
     clientIdKey: 'HUBSPOT_MCP_CLIENT_ID',
     clientSecretKey: 'HUBSPOT_MCP_CLIENT_SECRET',
     url: 'https://mcp.hubspot.com',
+    authorizationServer: 'https://mcp.hubspot.com',
     tokenAuthMethod: 'client_secret_post',
     scope: undefined,
   },
@@ -61,6 +62,7 @@ const SHARED_CLIENTS = [
     clientIdKey: 'ZOOM_MCP_CLIENT_ID',
     clientSecretKey: 'ZOOM_MCP_CLIENT_SECRET',
     url: 'https://mcp.zoom.us/mcp/meeting/streamable',
+    authorizationServer: 'https://zoom.us',
     tokenAuthMethod: 'client_secret_basic',
     scope: 'meeting:read:search meeting:read:assets',
   },
@@ -208,6 +210,7 @@ describe.each(SHARED_CLIENTS)('$name shared member connector', (connector) => {
       expect(await loadPreregisteredClient(mcpServer.id)).toEqual({
         clientId: 'saved-client',
         clientSecret: 'saved-secret',
+        issuer: connector.authorizationServer,
       })
       for (const change of [
         { oauthClientId: null, oauthClientSecret: encrypted },
@@ -332,7 +335,7 @@ describe.each(SHARED_CLIENTS)('$name shared member connector', (connector) => {
       'restricts generic OAuth %s to registered read permissions',
       async (phase) => {
         const { mcpServer } = await create()
-        const issuer = 'https://oauth.fixture.test'
+        const issuer = connector.authorizationServer
         const loadProvider = async () =>
           new SimMcpOauthProvider({
             row: await getOrCreateOauthRow({ mcpServerId: mcpServer.id, organizationId: org }),
@@ -427,7 +430,7 @@ describe.each(SHARED_CLIENTS)('$name shared member connector', (connector) => {
     })
     let exchanges = 0
     let challenge: string | null = null
-    const issuer = 'https://oauth.fixture.test'
+    const issuer = connector.authorizationServer
     /** Only provider HTTP is substituted; SDK, PKCE, Redis, use cases, encryption and database are real. */
     const fetchFn: typeof fetch = async (request, init) => {
       const url = new URL(

apps/sim/lib/mcp/oauth/revoke.test.ts

@@ -73,7 +73,11 @@ describe('revokeMcpOauthTokens — SSRF guard', () => {
     resetDbChainMock()
 
     mockLoadOauthRow.mockResolvedValue({
-      tokens: { access_token: 'access-secret', refresh_token: 'refresh-secret' },
+      tokens: {
+        access_token: 'access-secret',
+        refresh_token: 'refresh-secret',
+        issuer: PUBLIC_SERVER_URL,
+      },
       clientInformation: { client_id: 'client-123' },
     })
 
@@ -84,6 +88,7 @@ describe('revokeMcpOauthTokens — SSRF guard', () => {
     })
 
     mockDiscoverOAuthServerInfo.mockResolvedValue({
+      authorizationServerUrl: PUBLIC_SERVER_URL,
       authorizationServerMetadata: {
         issuer: PUBLIC_SERVER_URL,
         revocation_endpoint: BLOCKED_ENDPOINT,

apps/sim/lib/mcp/oauth/revoke.ts

@@ -43,8 +43,8 @@ export async function revokeMcpOauthTokens(
     )
     if (
       !info ||
-      (row.tokens.issuer &&
-        !isSameAuthorizationServer(row.tokens.issuer, info.authorizationServerUrl))
+      !row.tokens.issuer ||
+      !isSameAuthorizationServer(row.tokens.issuer, info.authorizationServerUrl)
     ) {
       return
     }
@@ -87,15 +87,15 @@ export async function revokeMcpOauthTokens(
 }
 
 /**
- * Mirrors the SDK's issuer binding: tokens stamped for one authorization server are never
- * posted, with the client secret, to a different one the MCP server now advertises.
+ * Tokens are only posted, with the client secret, to the authorization server the SDK stamped
+ * them for. Unstamped legacy tokens are never revoked: their issuer cannot be verified.
  */
 function isSameAuthorizationServer(issuer: string, authorizationServerUrl: string): boolean {
   const normalize = (value: string) => {
     try {
-      return new URL(value).href.replace(/\/$/, '')
+      return new URL(value).href
     } catch {
-      return value.replace(/\/$/, '')
+      return value
     }
   }
   return normalize(issuer) === normalize(authorizationServerUrl)