fixing tests and types

Author: pcarleton

client/src/components/__tests__/AuthDebugger.test.tsx

@@ -320,6 +320,7 @@ describe("AuthDebugger", () => {
         isInitiatingAuth: false,
         resourceMetadata: null,
         resourceMetadataError: null,
+        resource: null,
         oauthTokens: null,
         oauthStep: "metadata_discovery",
         latestError: null,

client/src/lib/auth-types.ts

@@ -30,7 +30,7 @@ export interface AuthDebuggerState {
   oauthStep: OAuthStep;
   resourceMetadata: OAuthProtectedResourceMetadata | null;
   resourceMetadataError: Error | null;
-  resource: string | null;
+  resource: URL | null;
   authServerUrl: URL | null;
   oauthMetadata: OAuthMetadata | null;
   oauthClientInfo: OAuthClientInformationFull | OAuthClientInformation | null;
@@ -48,6 +48,7 @@ export const EMPTY_DEBUGGER_STATE: AuthDebuggerState = {
   oauthMetadata: null,
   resourceMetadata: null,
   resourceMetadataError: null,
+  resource: null,
   authServerUrl: null,
   oauthClientInfo: null,
   authorizationUrl: null,

client/src/lib/oauth-state-machine.ts

@@ -7,9 +7,7 @@ import {
   exchangeAuthorization,
   discoverOAuthProtectedResourceMetadata,
 } from "@modelcontextprotocol/sdk/client/auth.js";
-import {
-  resourceUrlFromServerUrl
-} from "@modelcontextprotocol/sdk/shared/auth-utils.js";
+import { resourceUrlFromServerUrl } from "@modelcontextprotocol/sdk/shared/auth-utils.js";
 import {
   OAuthMetadataSchema,
   OAuthProtectedResourceMetadata,
@@ -51,11 +49,11 @@ export const oauthTransitions: Record<OAuthStep, StateTransition> = {
         }
       }
 
-      let resource: string| undefined;
+      let resource: URL | undefined;
       if (resourceMetadata) {
-        resource = resourceUrlFromServerUrl(context.serverUrl);
         // TODO: use SDK function selectResourceURL once version bump lands to be consistent
-        if (resource !== resourceMetadata.resource)
+        resource = resourceUrlFromServerUrl(new URL(context.serverUrl));
+        if (resource.href !== resourceMetadata.resource) {
           resourceMetadataError = new Error(
             `Warning: metadata resource ${resourceMetadata.resource} does not match serverUrl ${context.serverUrl}`,
           );
@@ -126,7 +124,7 @@ export const oauthTransitions: Record<OAuthStep, StateTransition> = {
           clientInformation,
           redirectUrl: context.provider.redirectUrl,
           scope,
-          resource: context.state.resource,
+          resource: context.state.resource ?? undefined,
         },
       );
 
@@ -177,7 +175,7 @@ export const oauthTransitions: Record<OAuthStep, StateTransition> = {
         authorizationCode: context.state.authorizationCode,
         codeVerifier,
         redirectUri: context.provider.redirectUrl,
-        resource: context.state.resource,
+        resource: context.state.resource ?? undefined,
       });
 
       context.provider.saveTokens(tokens);