@ian-pascoe/pi-mcp 0.3.1 → 0.3.2

package/dist/pi-mcp-cli.js

@@ -9488,7 +9488,7 @@ var McpAuthStore = class {
 import { execFile as execFileCallback } from "node:child_process";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { createServer } from "node:http";
-import { auth, resourceUrlFromServerUrl } from "@modelcontextprotocol/client";
+import { auth, checkResourceAllowed, resourceUrlFromServerUrl } from "@modelcontextprotocol/client";
 var McpOAuthPersistenceError = class extends Error {
   constructor(operation) {
     super(`MCP OAuth persistence failed during ${operation}`);
@@ -9703,7 +9703,10 @@ var McpOAuthProvider = class {
       return void 0;
     }
     const resource = discovery.protectedResourceMetadata?.resource;
-    if (resource !== void 0 && (typeof resource !== "string" || !URL.canParse(resource) || new URL(resource).href !== resourceUrlFromServerUrl(this.options.serverUrl).href)) {
+    if (resource !== void 0 && (typeof resource !== "string" || !URL.canParse(resource) || !checkResourceAllowed({
+      configuredResource: resource,
+      requestedResource: resourceUrlFromServerUrl(this.options.serverUrl)
+    }))) {
       return void 0;
     }
     const resourceMetadataUrl = discovery.resourceMetadataUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ian-pascoe/pi-mcp",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "private": false,
   "description": "A complete Model Context Protocol Host for Pi",
   "keywords": [

package/src/mcp-oauth.ts

@@ -12,7 +12,7 @@ import type {
   StoredOAuthClientInformation,
   StoredOAuthTokens,
 } from "@modelcontextprotocol/client";
-import { auth, resourceUrlFromServerUrl } from "@modelcontextprotocol/client";
+import { auth, checkResourceAllowed, resourceUrlFromServerUrl } from "@modelcontextprotocol/client";
 import { type McpAuthBinding, type McpAuthEntry, McpAuthStore } from "./mcp-auth-store.js";
 import type { McpStoreJsonObject, McpStoreJsonValue } from "./mcp-settings-store.js";
 
@@ -384,7 +384,10 @@ export class McpOAuthProvider implements OAuthClientProvider {
       resource !== undefined &&
       (typeof resource !== "string" ||
         !URL.canParse(resource) ||
-        new URL(resource).href !== resourceUrlFromServerUrl(this.options.serverUrl).href)
+        !checkResourceAllowed({
+          configuredResource: resource,
+          requestedResource: resourceUrlFromServerUrl(this.options.serverUrl),
+        }))
     ) {
       return undefined;
     }