@payloadcms/plugin-mcp 4.0.0-internal.016994f → 4.0.0-internal.0731f09

package/dist/endpoint/oauthServer.js

@@ -0,0 +1,351 @@
+import { OAuthErrorCode } from '@modelcontextprotocol/server';
+import { createHash } from 'crypto';
+import { APIError, createAuthToken } from 'payload';
+import { formatAdminURL } from 'payload/shared';
+import { getPluginConfig } from '../utils/getPluginConfig.js';
+import { getMCPURL } from './oauth.js';
+/**
+ * Turns Payload into the OAuth authorization server for MCP clients when `oauth.type` is
+ * `'builtin'`. Clients register, the user allows them after logging in to the admin panel, and
+ * the client receives the access token `issueToken` creates.
+ *
+ * Clients, consent forms, and authorization codes are encrypted and handed to the client instead
+ * of being stored, so nothing is written to the database.
+ */ export const oauthServerEndpoints = [
+    {
+        disableAuth: true,
+        handler: (req)=>withIssuer(req, (issuer)=>metadataResponse(issuer)),
+        method: 'get',
+        // OpenID discovery is the only metadata location MCP clients check below the issuer's path,
+        // which lets this work under /api without a route at the site root
+        path: '/mcp/oauth/.well-known/openid-configuration'
+    },
+    {
+        disableAuth: true,
+        handler: (req)=>withIssuer(req, ()=>Response.json({
+                    keys: []
+                })),
+        method: 'get',
+        path: '/mcp/oauth/jwks'
+    },
+    {
+        disableAuth: true,
+        handler: (req)=>withIssuer(req, ()=>register(req)),
+        method: 'post',
+        path: '/mcp/oauth/register'
+    },
+    {
+        handler: (req)=>withIssuer(req, ()=>authorize(req)),
+        method: 'get',
+        path: '/mcp/oauth/authorize'
+    },
+    {
+        handler: (req)=>withIssuer(req, ()=>approve(req)),
+        method: 'post',
+        path: '/mcp/oauth/authorize'
+    },
+    {
+        disableAuth: true,
+        handler: (req)=>withIssuer(req, ()=>token(req)),
+        method: 'post',
+        path: '/mcp/oauth/token'
+    }
+];
+/** The authorization server URL, or `undefined` when Payload isn't the authorization server. */ const getIssuer = (req)=>getPluginConfig({
+        config: req.payload.config
+    }).oauth?.type === 'builtin' ? `${getMCPURL({
+        config: req.payload.config,
+        url: req.url
+    })}/oauth` : undefined;
+const withIssuer = (req, handler)=>{
+    const issuer = getIssuer(req);
+    return issuer ? handler(issuer) : new Response(null, {
+        status: 404
+    });
+};
+const metadataResponse = (issuer)=>Response.json({
+        authorization_endpoint: `${issuer}/authorize`,
+        code_challenge_methods_supported: [
+            'S256'
+        ],
+        grant_types_supported: [
+            'authorization_code'
+        ],
+        // Required by OpenID discovery. No ID tokens are issued.
+        id_token_signing_alg_values_supported: [
+            'RS256'
+        ],
+        issuer,
+        jwks_uri: `${issuer}/jwks`,
+        registration_endpoint: `${issuer}/register`,
+        response_types_supported: [
+            'code'
+        ],
+        subject_types_supported: [
+            'public'
+        ],
+        token_endpoint: `${issuer}/token`,
+        token_endpoint_auth_methods_supported: [
+            'none'
+        ]
+    }, {
+        headers: {
+            'Access-Control-Allow-Origin': '*'
+        }
+    });
+const register = async (req)=>{
+    const { client_name, redirect_uris } = await req.json().catch(()=>({}));
+    if (!Array.isArray(redirect_uris) || !redirect_uris.length || !redirect_uris.every((uri)=>typeof uri === 'string' && URL.canParse(uri) && !uri.includes('#'))) {
+        return Response.json({
+            error: OAuthErrorCode.InvalidRedirectUri
+        }, {
+            status: 400
+        });
+    }
+    const client = {
+        name: typeof client_name === 'string' ? client_name : 'An MCP client',
+        redirectURIs: redirect_uris
+    };
+    return Response.json({
+        client_id: seal({
+            type: 'client',
+            data: client,
+            req
+        }),
+        client_name: client.name,
+        grant_types: [
+            'authorization_code'
+        ],
+        redirect_uris: client.redirectURIs,
+        response_types: [
+            'code'
+        ],
+        token_endpoint_auth_method: 'none'
+    }, {
+        status: 201
+    });
+};
+const authorize = (req)=>{
+    const url = new URL(req.url);
+    const params = url.searchParams;
+    const clientID = params.get('client_id');
+    const client = unseal({
+        type: 'client',
+        req,
+        value: clientID
+    });
+    const redirectURI = params.get('redirect_uri');
+    // Never redirect to an address the client didn't register
+    if (!client || !redirectURI || !client.redirectURIs.includes(redirectURI)) {
+        return page({
+            content: '<p>Start the sign-in again from your MCP client.</p>',
+            status: 400,
+            title: 'This sign-in link is invalid'
+        });
+    }
+    const state = params.get('state');
+    const codeChallenge = params.get('code_challenge');
+    if (params.get('response_type') !== 'code' || params.get('code_challenge_method') !== 'S256' || !codeChallenge) {
+        return redirect({
+            params: {
+                error: OAuthErrorCode.InvalidRequest,
+                state
+            },
+            redirectURI
+        });
+    }
+    if (!req.user) {
+        const loginURL = formatAdminURL({
+            adminRoute: req.payload.config.routes.admin,
+            path: '/login'
+        });
+        return new Response(null, {
+            headers: {
+                Location: `${loginURL}?redirect=${encodeURIComponent(url.pathname + url.search)}`
+            },
+            status: 302
+        });
+    }
+    const consent = {
+        clientID: clientID,
+        codeChallenge,
+        collection: req.user.collection,
+        redirectURI,
+        state,
+        userID: req.user.id
+    };
+    return page({
+        content: `<p>It will be able to use this app's MCP tools as ${escapeHTML(String(req.user.email ?? req.user.id))}, and you will return to ${escapeHTML(new URL(redirectURI).host || redirectURI)}.</p>
+<form method="post">
+<input name="consent" type="hidden" value="${seal({
+            type: 'consent',
+            data: consent,
+            expiresIn: 20 * 60 * 60,
+            req
+        })}">
+<button name="decision" type="submit" value="allow">Allow</button>
+<button name="decision" type="submit" value="deny">Deny</button>
+</form>`,
+        status: 200,
+        title: `Allow ${client.name} to use your account?`
+    });
+};
+const approve = async (req)=>{
+    const form = new URLSearchParams(await req.text());
+    const consent = unseal({
+        type: 'consent',
+        req,
+        value: form.get('consent')
+    });
+    // The form is only valid for the user it was shown to
+    if (!consent || req.user?.id !== consent.userID || req.user.collection !== consent.collection) {
+        return page({
+            content: '<p>Start the sign-in again from your MCP client.</p>',
+            status: 400,
+            title: 'This sign-in request expired'
+        });
+    }
+    const { clientID, codeChallenge, redirectURI, state } = consent;
+    if (form.get('decision') !== 'allow') {
+        return redirect({
+            params: {
+                error: OAuthErrorCode.AccessDenied,
+                state
+            },
+            redirectURI
+        });
+    }
+    const { issueToken = issueLoginToken } = getPluginConfig({
+        config: req.payload.config
+    }).oauth;
+    const { accessToken, expiresIn } = await issueToken({
+        req
+    });
+    const code = {
+        accessToken,
+        clientID,
+        codeChallenge,
+        expiresIn,
+        redirectURI
+    };
+    return redirect({
+        params: {
+            code: seal({
+                type: 'code',
+                data: code,
+                expiresIn: 60,
+                req
+            }),
+            state
+        },
+        redirectURI
+    });
+};
+const token = async (req)=>{
+    const form = new URLSearchParams(await req.text());
+    const code = unseal({
+        type: 'code',
+        req,
+        value: form.get('code')
+    });
+    if (form.get('grant_type') !== 'authorization_code' || !code || code.clientID !== form.get('client_id') || code.redirectURI !== form.get('redirect_uri') || // PKCE: only the client that started the sign-in knows the verifier
+    createHash('sha256').update(form.get('code_verifier') ?? '').digest('base64url') !== code.codeChallenge) {
+        return Response.json({
+            error: OAuthErrorCode.InvalidGrant
+        }, {
+            status: 400
+        });
+    }
+    return Response.json({
+        access_token: code.accessToken,
+        expires_in: code.expiresIn,
+        token_type: 'Bearer'
+    }, {
+        headers: {
+            'Cache-Control': 'no-store'
+        }
+    });
+};
+/** The default `issueToken`: a Payload login token, which Payload's JWT strategy accepts. */ const issueLoginToken = async ({ req })=>{
+    const collection = req.payload.collections[req.user.collection];
+    if (collection.config.auth.disableLocalStrategy) {
+        throw new APIError(`The "${collection.config.slug}" collection has its local strategy disabled, so MCP clients can't get Payload login tokens for it. Pass oauth.issueToken to the MCP plugin.`);
+    }
+    // The full document, like the one a password login starts the session on
+    const user = await req.payload.db.findOne({
+        collection: collection.config.slug,
+        req,
+        where: {
+            id: {
+                equals: req.user.id
+            }
+        }
+    });
+    const { token } = await createAuthToken({
+        collectionConfig: collection.config,
+        email: user.email,
+        req,
+        user
+    });
+    return {
+        accessToken: token,
+        expiresIn: collection.config.auth.tokenExpiration
+    };
+};
+/**
+ * Encrypts data for the client to hold, so it doesn't need to be stored. `type` keeps one kind
+ * from being used as another, e.g. a client ID as an authorization code.
+ */ const seal = ({ type, data, expiresIn, req })=>req.payload.encrypt(JSON.stringify({
+        ...data,
+        type,
+        exp: expiresIn && Date.now() + expiresIn * 1000
+    }));
+const unseal = ({ type, req, value })=>{
+    // Only the v1 format is authenticated. Older formats decrypt anything without an error.
+    if (!value?.startsWith('v1:')) {
+        return undefined;
+    }
+    try {
+        const data = JSON.parse(req.payload.decrypt(value));
+        return data.type === type && (!data.exp || data.exp > Date.now()) ? data : undefined;
+    } catch  {
+        return undefined;
+    }
+};
+const redirect = ({ params, redirectURI })=>{
+    const location = new URL(redirectURI);
+    for (const [key, value] of Object.entries(params)){
+        if (value) {
+            location.searchParams.set(key, value);
+        }
+    }
+    return new Response(null, {
+        headers: {
+            Location: location.href
+        },
+        status: 302
+    });
+};
+const page = ({ content, status, title })=>new Response(`<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>${escapeHTML(title)}</title>
+<style>
+body { font-family: system-ui, sans-serif; margin: 4rem auto; max-width: 32rem; overflow-wrap: anywhere; padding: 0 1rem }
+button { font: inherit; margin-inline-end: 0.5rem; padding: 0.5rem 1rem }
+</style>
+</head>
+<body><h1>${escapeHTML(title)}</h1>${content}</body>
+</html>`, {
+        headers: {
+            // Stop other sites from framing the page to trick users into clicking Allow
+            'Content-Security-Policy': "frame-ancestors 'none'",
+            'Content-Type': 'text/html; charset=utf-8'
+        },
+        status
+    });
+const escapeHTML = (value)=>value.replace(/[&<>"']/g, (character)=>`&#${character.charCodeAt(0)};`);
+
+//# sourceMappingURL=oauthServer.js.map

package/dist/endpoint/oauthServer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/endpoint/oauthServer.ts"],"sourcesContent":["import type {\n  OAuthClientInformationFull,\n  OAuthTokens,\n  OpenIdProviderDiscoveryMetadata,\n} from '@modelcontextprotocol/server'\nimport type { Endpoint, PayloadHandler, PayloadRequest } from 'payload'\n\nimport { OAuthErrorCode } from '@modelcontextprotocol/server'\nimport { createHash } from 'crypto'\nimport { APIError, createAuthToken } from 'payload'\nimport { formatAdminURL } from 'payload/shared'\n\nimport type { MCPBuiltinOAuthConfig } from '../types.js'\n\nimport { getPluginConfig } from '../utils/getPluginConfig.js'\nimport { getMCPURL } from './oauth.js'\n\ntype Client = { name: string; redirectURIs: string[] }\n\ntype Consent = {\n  clientID: string\n  codeChallenge: string\n  collection: string\n  redirectURI: string\n  state: null | string\n  userID: number | string\n}\n\ntype Code = {\n  accessToken: string\n  clientID: string\n  codeChallenge: string\n  expiresIn?: number\n  redirectURI: string\n}\n\n/**\n * Turns Payload into the OAuth authorization server for MCP clients when `oauth.type` is\n * `'builtin'`. Clients register, the user allows them after logging in to the admin panel, and\n * the client receives the access token `issueToken` creates.\n *\n * Clients, consent forms, and authorization codes are encrypted and handed to the client instead\n * of being stored, so nothing is written to the database.\n */\nexport const oauthServerEndpoints: Endpoint[] = [\n  {\n    disableAuth: true,\n    handler: (req) => withIssuer(req, (issuer) => metadataResponse(issuer)),\n    method: 'get',\n    // OpenID discovery is the only metadata location MCP clients check below the issuer's path,\n    // which lets this work under /api without a route at the site root\n    path: '/mcp/oauth/.well-known/openid-configuration',\n  },\n  {\n    disableAuth: true,\n    handler: (req) => withIssuer(req, () => Response.json({ keys: [] })),\n    method: 'get',\n    path: '/mcp/oauth/jwks',\n  },\n  {\n    disableAuth: true,\n    handler: (req) => withIssuer(req, () => register(req)),\n    method: 'post',\n    path: '/mcp/oauth/register',\n  },\n  {\n    handler: (req) => withIssuer(req, () => authorize(req)),\n    method: 'get',\n    path: '/mcp/oauth/authorize',\n  },\n  {\n    handler: (req) => withIssuer(req, () => approve(req)),\n    method: 'post',\n    path: '/mcp/oauth/authorize',\n  },\n  {\n    disableAuth: true,\n    handler: (req) => withIssuer(req, () => token(req)),\n    method: 'post',\n    path: '/mcp/oauth/token',\n  },\n]\n\n/** The authorization server URL, or `undefined` when Payload isn't the authorization server. */\nconst getIssuer = (req: PayloadRequest): string | undefined =>\n  getPluginConfig({ config: req.payload.config }).oauth?.type === 'builtin'\n    ? `${getMCPURL({ config: req.payload.config, url: req.url! })}/oauth`\n    : undefined\n\nconst withIssuer = (\n  req: PayloadRequest,\n  handler: (issuer: string) => Promise<Response> | Response,\n): Promise<Response> | Response => {\n  const issuer = getIssuer(req)\n  return issuer ? handler(issuer) : new Response(null, { status: 404 })\n}\n\nconst metadataResponse = (issuer: string): Response =>\n  Response.json(\n    {\n      authorization_endpoint: `${issuer}/authorize`,\n      code_challenge_methods_supported: ['S256'],\n      grant_types_supported: ['authorization_code'],\n      // Required by OpenID discovery. No ID tokens are issued.\n      id_token_signing_alg_values_supported: ['RS256'],\n      issuer,\n      jwks_uri: `${issuer}/jwks`,\n      registration_endpoint: `${issuer}/register`,\n      response_types_supported: ['code'],\n      subject_types_supported: ['public'],\n      token_endpoint: `${issuer}/token`,\n      token_endpoint_auth_methods_supported: ['none'],\n    } satisfies OpenIdProviderDiscoveryMetadata,\n    { headers: { 'Access-Control-Allow-Origin': '*' } },\n  )\n\nconst register: PayloadHandler = async (req) => {\n  const { client_name, redirect_uris } = await req.json!().catch(() => ({}))\n\n  if (\n    !Array.isArray(redirect_uris) ||\n    !redirect_uris.length ||\n    !redirect_uris.every(\n      (uri) => typeof uri === 'string' && URL.canParse(uri) && !uri.includes('#'),\n    )\n  ) {\n    return Response.json({ error: OAuthErrorCode.InvalidRedirectUri }, { status: 400 })\n  }\n\n  const client: Client = {\n    name: typeof client_name === 'string' ? client_name : 'An MCP client',\n    redirectURIs: redirect_uris,\n  }\n\n  return Response.json(\n    {\n      client_id: seal({ type: 'client', data: client, req }),\n      client_name: client.name,\n      grant_types: ['authorization_code'],\n      redirect_uris: client.redirectURIs,\n      response_types: ['code'],\n      token_endpoint_auth_method: 'none',\n    } satisfies OAuthClientInformationFull,\n    { status: 201 },\n  )\n}\n\nconst authorize: PayloadHandler = (req) => {\n  const url = new URL(req.url!)\n  const params = url.searchParams\n  const clientID = params.get('client_id')\n  const client = unseal<Client>({ type: 'client', req, value: clientID })\n  const redirectURI = params.get('redirect_uri')\n\n  // Never redirect to an address the client didn't register\n  if (!client || !redirectURI || !client.redirectURIs.includes(redirectURI)) {\n    return page({\n      content: '<p>Start the sign-in again from your MCP client.</p>',\n      status: 400,\n      title: 'This sign-in link is invalid',\n    })\n  }\n\n  const state = params.get('state')\n  const codeChallenge = params.get('code_challenge')\n\n  if (\n    params.get('response_type') !== 'code' ||\n    params.get('code_challenge_method') !== 'S256' ||\n    !codeChallenge\n  ) {\n    return redirect({ params: { error: OAuthErrorCode.InvalidRequest, state }, redirectURI })\n  }\n\n  if (!req.user) {\n    const loginURL = formatAdminURL({ adminRoute: req.payload.config.routes.admin, path: '/login' })\n\n    return new Response(null, {\n      headers: {\n        Location: `${loginURL}?redirect=${encodeURIComponent(url.pathname + url.search)}`,\n      },\n      status: 302,\n    })\n  }\n\n  const consent: Consent = {\n    clientID: clientID!,\n    codeChallenge,\n    collection: req.user.collection,\n    redirectURI,\n    state,\n    userID: req.user.id,\n  }\n\n  return page({\n    content: `<p>It will be able to use this app's MCP tools as ${escapeHTML(String(req.user.email ?? req.user.id))}, and you will return to ${escapeHTML(new URL(redirectURI).host || redirectURI)}.</p>\n<form method=\"post\">\n<input name=\"consent\" type=\"hidden\" value=\"${seal({ type: 'consent', data: consent, expiresIn: 20 * 60 * 60, req })}\">\n<button name=\"decision\" type=\"submit\" value=\"allow\">Allow</button>\n<button name=\"decision\" type=\"submit\" value=\"deny\">Deny</button>\n</form>`,\n    status: 200,\n    title: `Allow ${client.name} to use your account?`,\n  })\n}\n\nconst approve: PayloadHandler = async (req) => {\n  const form = new URLSearchParams(await req.text!())\n  const consent = unseal<Consent>({ type: 'consent', req, value: form.get('consent') })\n\n  // The form is only valid for the user it was shown to\n  if (!consent || req.user?.id !== consent.userID || req.user.collection !== consent.collection) {\n    return page({\n      content: '<p>Start the sign-in again from your MCP client.</p>',\n      status: 400,\n      title: 'This sign-in request expired',\n    })\n  }\n\n  const { clientID, codeChallenge, redirectURI, state } = consent\n\n  if (form.get('decision') !== 'allow') {\n    return redirect({ params: { error: OAuthErrorCode.AccessDenied, state }, redirectURI })\n  }\n\n  const { issueToken = issueLoginToken } = getPluginConfig({ config: req.payload.config })\n    .oauth as MCPBuiltinOAuthConfig\n  const { accessToken, expiresIn } = await issueToken({ req })\n\n  const code: Code = { accessToken, clientID, codeChallenge, expiresIn, redirectURI }\n\n  return redirect({\n    params: { code: seal({ type: 'code', data: code, expiresIn: 60, req }), state },\n    redirectURI,\n  })\n}\n\nconst token: PayloadHandler = async (req) => {\n  const form = new URLSearchParams(await req.text!())\n  const code = unseal<Code>({ type: 'code', req, value: form.get('code') })\n\n  if (\n    form.get('grant_type') !== 'authorization_code' ||\n    !code ||\n    code.clientID !== form.get('client_id') ||\n    code.redirectURI !== form.get('redirect_uri') ||\n    // PKCE: only the client that started the sign-in knows the verifier\n    createHash('sha256')\n      .update(form.get('code_verifier') ?? '')\n      .digest('base64url') !== code.codeChallenge\n  ) {\n    return Response.json({ error: OAuthErrorCode.InvalidGrant }, { status: 400 })\n  }\n\n  return Response.json(\n    {\n      access_token: code.accessToken,\n      expires_in: code.expiresIn,\n      token_type: 'Bearer',\n    } satisfies OAuthTokens,\n    { headers: { 'Cache-Control': 'no-store' } },\n  )\n}\n\n/** The default `issueToken`: a Payload login token, which Payload's JWT strategy accepts. */\nconst issueLoginToken: NonNullable<MCPBuiltinOAuthConfig['issueToken']> = async ({ req }) => {\n  const collection = req.payload.collections[req.user!.collection]!\n\n  if (collection.config.auth.disableLocalStrategy) {\n    throw new APIError(\n      `The \"${collection.config.slug}\" collection has its local strategy disabled, so MCP clients can't get Payload login tokens for it. Pass oauth.issueToken to the MCP plugin.`,\n    )\n  }\n\n  // The full document, like the one a password login starts the session on\n  const user = (await req.payload.db.findOne<NonNullable<PayloadRequest['user']>>({\n    collection: collection.config.slug,\n    req,\n    where: { id: { equals: req.user!.id } },\n  }))!\n\n  const { token } = await createAuthToken({\n    collectionConfig: collection.config,\n    email: user.email!,\n    req,\n    user,\n  })\n\n  return { accessToken: token, expiresIn: collection.config.auth.tokenExpiration }\n}\n\n/**\n * Encrypts data for the client to hold, so it doesn't need to be stored. `type` keeps one kind\n * from being used as another, e.g. a client ID as an authorization code.\n */\nconst seal = ({\n  type,\n  data,\n  expiresIn,\n  req,\n}: {\n  data: object\n  /** Seconds */\n  expiresIn?: number\n  req: PayloadRequest\n  type: string\n}): string =>\n  req.payload.encrypt(\n    JSON.stringify({ ...data, type, exp: expiresIn && Date.now() + expiresIn * 1000 }),\n  )\n\nconst unseal = <T>({\n  type,\n  req,\n  value,\n}: {\n  req: PayloadRequest\n  type: string\n  value: null | string\n}): T | undefined => {\n  // Only the v1 format is authenticated. Older formats decrypt anything without an error.\n  if (!value?.startsWith('v1:')) {\n    return undefined\n  }\n\n  try {\n    const data = JSON.parse(req.payload.decrypt(value))\n    return data.type === type && (!data.exp || data.exp > Date.now()) ? data : undefined\n  } catch {\n    return undefined\n  }\n}\n\nconst redirect = ({\n  params,\n  redirectURI,\n}: {\n  params: Record<string, null | string>\n  redirectURI: string\n}): Response => {\n  const location = new URL(redirectURI)\n\n  for (const [key, value] of Object.entries(params)) {\n    if (value) {\n      location.searchParams.set(key, value)\n    }\n  }\n\n  return new Response(null, { headers: { Location: location.href }, status: 302 })\n}\n\nconst page = ({\n  content,\n  status,\n  title,\n}: {\n  content: string\n  status: number\n  title: string\n}): Response =>\n  new Response(\n    `<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<title>${escapeHTML(title)}</title>\n<style>\nbody { font-family: system-ui, sans-serif; margin: 4rem auto; max-width: 32rem; overflow-wrap: anywhere; padding: 0 1rem }\nbutton { font: inherit; margin-inline-end: 0.5rem; padding: 0.5rem 1rem }\n</style>\n</head>\n<body><h1>${escapeHTML(title)}</h1>${content}</body>\n</html>`,\n    {\n      headers: {\n        // Stop other sites from framing the page to trick users into clicking Allow\n        'Content-Security-Policy': \"frame-ancestors 'none'\",\n        'Content-Type': 'text/html; charset=utf-8',\n      },\n      status,\n    },\n  )\n\nconst escapeHTML = (value: string): string =>\n  value.replace(/[&<>\"']/g, (character) => `&#${character.charCodeAt(0)};`)\n"],"names":["OAuthErrorCode","createHash","APIError","createAuthToken","formatAdminURL","getPluginConfig","getMCPURL","oauthServerEndpoints","disableAuth","handler","req","withIssuer","issuer","metadataResponse","method","path","Response","json","keys","register","authorize","approve","token","getIssuer","config","payload","oauth","type","url","undefined","status","authorization_endpoint","code_challenge_methods_supported","grant_types_supported","id_token_signing_alg_values_supported","jwks_uri","registration_endpoint","response_types_supported","subject_types_supported","token_endpoint","token_endpoint_auth_methods_supported","headers","client_name","redirect_uris","catch","Array","isArray","length","every","uri","URL","canParse","includes","error","InvalidRedirectUri","client","name","redirectURIs","client_id","seal","data","grant_types","response_types","token_endpoint_auth_method","params","searchParams","clientID","get","unseal","value","redirectURI","page","content","title","state","codeChallenge","redirect","InvalidRequest","user","loginURL","adminRoute","routes","admin","Location","encodeURIComponent","pathname","search","consent","collection","userID","id","escapeHTML","String","email","host","expiresIn","form","URLSearchParams","text","AccessDenied","issueToken","issueLoginToken","accessToken","code","update","digest","InvalidGrant","access_token","expires_in","token_type","collections","auth","disableLocalStrategy","slug","db","findOne","where","equals","collectionConfig","tokenExpiration","encrypt","JSON","stringify","exp","Date","now","startsWith","parse","decrypt","location","key","Object","entries","set","href","replace","character","charCodeAt"],"mappings":"AAOA,SAASA,cAAc,QAAQ,+BAA8B;AAC7D,SAASC,UAAU,QAAQ,SAAQ;AACnC,SAASC,QAAQ,EAAEC,eAAe,QAAQ,UAAS;AACnD,SAASC,cAAc,QAAQ,iBAAgB;AAI/C,SAASC,eAAe,QAAQ,8BAA6B;AAC7D,SAASC,SAAS,QAAQ,aAAY;AAqBtC;;;;;;;CAOC,GACD,OAAO,MAAMC,uBAAmC;IAC9C;QACEC,aAAa;QACbC,SAAS,CAACC,MAAQC,WAAWD,KAAK,CAACE,SAAWC,iBAAiBD;QAC/DE,QAAQ;QACR,4FAA4F;QAC5F,mEAAmE;QACnEC,MAAM;IACR;IACA;QACEP,aAAa;QACbC,SAAS,CAACC,MAAQC,WAAWD,KAAK,IAAMM,SAASC,IAAI,CAAC;oBAAEC,MAAM,EAAE;gBAAC;QACjEJ,QAAQ;QACRC,MAAM;IACR;IACA;QACEP,aAAa;QACbC,SAAS,CAACC,MAAQC,WAAWD,KAAK,IAAMS,SAAST;QACjDI,QAAQ;QACRC,MAAM;IACR;IACA;QACEN,SAAS,CAACC,MAAQC,WAAWD,KAAK,IAAMU,UAAUV;QAClDI,QAAQ;QACRC,MAAM;IACR;IACA;QACEN,SAAS,CAACC,MAAQC,WAAWD,KAAK,IAAMW,QAAQX;QAChDI,QAAQ;QACRC,MAAM;IACR;IACA;QACEP,aAAa;QACbC,SAAS,CAACC,MAAQC,WAAWD,KAAK,IAAMY,MAAMZ;QAC9CI,QAAQ;QACRC,MAAM;IACR;CACD,CAAA;AAED,8FAA8F,GAC9F,MAAMQ,YAAY,CAACb,MACjBL,gBAAgB;QAAEmB,QAAQd,IAAIe,OAAO,CAACD,MAAM;IAAC,GAAGE,KAAK,EAAEC,SAAS,YAC5D,GAAGrB,UAAU;QAAEkB,QAAQd,IAAIe,OAAO,CAACD,MAAM;QAAEI,KAAKlB,IAAIkB,GAAG;IAAE,GAAG,MAAM,CAAC,GACnEC;AAEN,MAAMlB,aAAa,CACjBD,KACAD;IAEA,MAAMG,SAASW,UAAUb;IACzB,OAAOE,SAASH,QAAQG,UAAU,IAAII,SAAS,MAAM;QAAEc,QAAQ;IAAI;AACrE;AAEA,MAAMjB,mBAAmB,CAACD,SACxBI,SAASC,IAAI,CACX;QACEc,wBAAwB,GAAGnB,OAAO,UAAU,CAAC;QAC7CoB,kCAAkC;YAAC;SAAO;QAC1CC,uBAAuB;YAAC;SAAqB;QAC7C,yDAAyD;QACzDC,uCAAuC;YAAC;SAAQ;QAChDtB;QACAuB,UAAU,GAAGvB,OAAO,KAAK,CAAC;QAC1BwB,uBAAuB,GAAGxB,OAAO,SAAS,CAAC;QAC3CyB,0BAA0B;YAAC;SAAO;QAClCC,yBAAyB;YAAC;SAAS;QACnCC,gBAAgB,GAAG3B,OAAO,MAAM,CAAC;QACjC4B,uCAAuC;YAAC;SAAO;IACjD,GACA;QAAEC,SAAS;YAAE,+BAA+B;QAAI;IAAE;AAGtD,MAAMtB,WAA2B,OAAOT;IACtC,MAAM,EAAEgC,WAAW,EAAEC,aAAa,EAAE,GAAG,MAAMjC,IAAIO,IAAI,GAAI2B,KAAK,CAAC,IAAO,CAAA,CAAC,CAAA;IAEvE,IACE,CAACC,MAAMC,OAAO,CAACH,kBACf,CAACA,cAAcI,MAAM,IACrB,CAACJ,cAAcK,KAAK,CAClB,CAACC,MAAQ,OAAOA,QAAQ,YAAYC,IAAIC,QAAQ,CAACF,QAAQ,CAACA,IAAIG,QAAQ,CAAC,OAEzE;QACA,OAAOpC,SAASC,IAAI,CAAC;YAAEoC,OAAOrD,eAAesD,kBAAkB;QAAC,GAAG;YAAExB,QAAQ;QAAI;IACnF;IAEA,MAAMyB,SAAiB;QACrBC,MAAM,OAAOd,gBAAgB,WAAWA,cAAc;QACtDe,cAAcd;IAChB;IAEA,OAAO3B,SAASC,IAAI,CAClB;QACEyC,WAAWC,KAAK;YAAEhC,MAAM;YAAUiC,MAAML;YAAQ7C;QAAI;QACpDgC,aAAaa,OAAOC,IAAI;QACxBK,aAAa;YAAC;SAAqB;QACnClB,eAAeY,OAAOE,YAAY;QAClCK,gBAAgB;YAAC;SAAO;QACxBC,4BAA4B;IAC9B,GACA;QAAEjC,QAAQ;IAAI;AAElB;AAEA,MAAMV,YAA4B,CAACV;IACjC,MAAMkB,MAAM,IAAIsB,IAAIxC,IAAIkB,GAAG;IAC3B,MAAMoC,SAASpC,IAAIqC,YAAY;IAC/B,MAAMC,WAAWF,OAAOG,GAAG,CAAC;IAC5B,MAAMZ,SAASa,OAAe;QAAEzC,MAAM;QAAUjB;QAAK2D,OAAOH;IAAS;IACrE,MAAMI,cAAcN,OAAOG,GAAG,CAAC;IAE/B,0DAA0D;IAC1D,IAAI,CAACZ,UAAU,CAACe,eAAe,CAACf,OAAOE,YAAY,CAACL,QAAQ,CAACkB,cAAc;QACzE,OAAOC,KAAK;YACVC,SAAS;YACT1C,QAAQ;YACR2C,OAAO;QACT;IACF;IAEA,MAAMC,QAAQV,OAAOG,GAAG,CAAC;IACzB,MAAMQ,gBAAgBX,OAAOG,GAAG,CAAC;IAEjC,IACEH,OAAOG,GAAG,CAAC,qBAAqB,UAChCH,OAAOG,GAAG,CAAC,6BAA6B,UACxC,CAACQ,eACD;QACA,OAAOC,SAAS;YAAEZ,QAAQ;gBAAEX,OAAOrD,eAAe6E,cAAc;gBAAEH;YAAM;YAAGJ;QAAY;IACzF;IAEA,IAAI,CAAC5D,IAAIoE,IAAI,EAAE;QACb,MAAMC,WAAW3E,eAAe;YAAE4E,YAAYtE,IAAIe,OAAO,CAACD,MAAM,CAACyD,MAAM,CAACC,KAAK;YAAEnE,MAAM;QAAS;QAE9F,OAAO,IAAIC,SAAS,MAAM;YACxByB,SAAS;gBACP0C,UAAU,GAAGJ,SAAS,UAAU,EAAEK,mBAAmBxD,IAAIyD,QAAQ,GAAGzD,IAAI0D,MAAM,GAAG;YACnF;YACAxD,QAAQ;QACV;IACF;IAEA,MAAMyD,UAAmB;QACvBrB,UAAUA;QACVS;QACAa,YAAY9E,IAAIoE,IAAI,CAACU,UAAU;QAC/BlB;QACAI;QACAe,QAAQ/E,IAAIoE,IAAI,CAACY,EAAE;IACrB;IAEA,OAAOnB,KAAK;QACVC,SAAS,CAAC,kDAAkD,EAAEmB,WAAWC,OAAOlF,IAAIoE,IAAI,CAACe,KAAK,IAAInF,IAAIoE,IAAI,CAACY,EAAE,GAAG,yBAAyB,EAAEC,WAAW,IAAIzC,IAAIoB,aAAawB,IAAI,IAAIxB,aAAa;;2CAEzJ,EAAEX,KAAK;YAAEhC,MAAM;YAAWiC,MAAM2B;YAASQ,WAAW,KAAK,KAAK;YAAIrF;QAAI,GAAG;;;OAG7G,CAAC;QACJoB,QAAQ;QACR2C,OAAO,CAAC,MAAM,EAAElB,OAAOC,IAAI,CAAC,qBAAqB,CAAC;IACpD;AACF;AAEA,MAAMnC,UAA0B,OAAOX;IACrC,MAAMsF,OAAO,IAAIC,gBAAgB,MAAMvF,IAAIwF,IAAI;IAC/C,MAAMX,UAAUnB,OAAgB;QAAEzC,MAAM;QAAWjB;QAAK2D,OAAO2B,KAAK7B,GAAG,CAAC;IAAW;IAEnF,sDAAsD;IACtD,IAAI,CAACoB,WAAW7E,IAAIoE,IAAI,EAAEY,OAAOH,QAAQE,MAAM,IAAI/E,IAAIoE,IAAI,CAACU,UAAU,KAAKD,QAAQC,UAAU,EAAE;QAC7F,OAAOjB,KAAK;YACVC,SAAS;YACT1C,QAAQ;YACR2C,OAAO;QACT;IACF;IAEA,MAAM,EAAEP,QAAQ,EAAES,aAAa,EAAEL,WAAW,EAAEI,KAAK,EAAE,GAAGa;IAExD,IAAIS,KAAK7B,GAAG,CAAC,gBAAgB,SAAS;QACpC,OAAOS,SAAS;YAAEZ,QAAQ;gBAAEX,OAAOrD,eAAemG,YAAY;gBAAEzB;YAAM;YAAGJ;QAAY;IACvF;IAEA,MAAM,EAAE8B,aAAaC,eAAe,EAAE,GAAGhG,gBAAgB;QAAEmB,QAAQd,IAAIe,OAAO,CAACD,MAAM;IAAC,GACnFE,KAAK;IACR,MAAM,EAAE4E,WAAW,EAAEP,SAAS,EAAE,GAAG,MAAMK,WAAW;QAAE1F;IAAI;IAE1D,MAAM6F,OAAa;QAAED;QAAapC;QAAUS;QAAeoB;QAAWzB;IAAY;IAElF,OAAOM,SAAS;QACdZ,QAAQ;YAAEuC,MAAM5C,KAAK;gBAAEhC,MAAM;gBAAQiC,MAAM2C;gBAAMR,WAAW;gBAAIrF;YAAI;YAAIgE;QAAM;QAC9EJ;IACF;AACF;AAEA,MAAMhD,QAAwB,OAAOZ;IACnC,MAAMsF,OAAO,IAAIC,gBAAgB,MAAMvF,IAAIwF,IAAI;IAC/C,MAAMK,OAAOnC,OAAa;QAAEzC,MAAM;QAAQjB;QAAK2D,OAAO2B,KAAK7B,GAAG,CAAC;IAAQ;IAEvE,IACE6B,KAAK7B,GAAG,CAAC,kBAAkB,wBAC3B,CAACoC,QACDA,KAAKrC,QAAQ,KAAK8B,KAAK7B,GAAG,CAAC,gBAC3BoC,KAAKjC,WAAW,KAAK0B,KAAK7B,GAAG,CAAC,mBAC9B,oEAAoE;IACpElE,WAAW,UACRuG,MAAM,CAACR,KAAK7B,GAAG,CAAC,oBAAoB,IACpCsC,MAAM,CAAC,iBAAiBF,KAAK5B,aAAa,EAC7C;QACA,OAAO3D,SAASC,IAAI,CAAC;YAAEoC,OAAOrD,eAAe0G,YAAY;QAAC,GAAG;YAAE5E,QAAQ;QAAI;IAC7E;IAEA,OAAOd,SAASC,IAAI,CAClB;QACE0F,cAAcJ,KAAKD,WAAW;QAC9BM,YAAYL,KAAKR,SAAS;QAC1Bc,YAAY;IACd,GACA;QAAEpE,SAAS;YAAE,iBAAiB;QAAW;IAAE;AAE/C;AAEA,2FAA2F,GAC3F,MAAM4D,kBAAoE,OAAO,EAAE3F,GAAG,EAAE;IACtF,MAAM8E,aAAa9E,IAAIe,OAAO,CAACqF,WAAW,CAACpG,IAAIoE,IAAI,CAAEU,UAAU,CAAC;IAEhE,IAAIA,WAAWhE,MAAM,CAACuF,IAAI,CAACC,oBAAoB,EAAE;QAC/C,MAAM,IAAI9G,SACR,CAAC,KAAK,EAAEsF,WAAWhE,MAAM,CAACyF,IAAI,CAAC,4IAA4I,CAAC;IAEhL;IAEA,yEAAyE;IACzE,MAAMnC,OAAQ,MAAMpE,IAAIe,OAAO,CAACyF,EAAE,CAACC,OAAO,CAAsC;QAC9E3B,YAAYA,WAAWhE,MAAM,CAACyF,IAAI;QAClCvG;QACA0G,OAAO;YAAE1B,IAAI;gBAAE2B,QAAQ3G,IAAIoE,IAAI,CAAEY,EAAE;YAAC;QAAE;IACxC;IAEA,MAAM,EAAEpE,KAAK,EAAE,GAAG,MAAMnB,gBAAgB;QACtCmH,kBAAkB9B,WAAWhE,MAAM;QACnCqE,OAAOf,KAAKe,KAAK;QACjBnF;QACAoE;IACF;IAEA,OAAO;QAAEwB,aAAahF;QAAOyE,WAAWP,WAAWhE,MAAM,CAACuF,IAAI,CAACQ,eAAe;IAAC;AACjF;AAEA;;;CAGC,GACD,MAAM5D,OAAO,CAAC,EACZhC,IAAI,EACJiC,IAAI,EACJmC,SAAS,EACTrF,GAAG,EAOJ,GACCA,IAAIe,OAAO,CAAC+F,OAAO,CACjBC,KAAKC,SAAS,CAAC;QAAE,GAAG9D,IAAI;QAAEjC;QAAMgG,KAAK5B,aAAa6B,KAAKC,GAAG,KAAK9B,YAAY;IAAK;AAGpF,MAAM3B,SAAS,CAAI,EACjBzC,IAAI,EACJjB,GAAG,EACH2D,KAAK,EAKN;IACC,wFAAwF;IACxF,IAAI,CAACA,OAAOyD,WAAW,QAAQ;QAC7B,OAAOjG;IACT;IAEA,IAAI;QACF,MAAM+B,OAAO6D,KAAKM,KAAK,CAACrH,IAAIe,OAAO,CAACuG,OAAO,CAAC3D;QAC5C,OAAOT,KAAKjC,IAAI,KAAKA,QAAS,CAAA,CAACiC,KAAK+D,GAAG,IAAI/D,KAAK+D,GAAG,GAAGC,KAAKC,GAAG,EAAC,IAAKjE,OAAO/B;IAC7E,EAAE,OAAM;QACN,OAAOA;IACT;AACF;AAEA,MAAM+C,WAAW,CAAC,EAChBZ,MAAM,EACNM,WAAW,EAIZ;IACC,MAAM2D,WAAW,IAAI/E,IAAIoB;IAEzB,KAAK,MAAM,CAAC4D,KAAK7D,MAAM,IAAI8D,OAAOC,OAAO,CAACpE,QAAS;QACjD,IAAIK,OAAO;YACT4D,SAAShE,YAAY,CAACoE,GAAG,CAACH,KAAK7D;QACjC;IACF;IAEA,OAAO,IAAIrD,SAAS,MAAM;QAAEyB,SAAS;YAAE0C,UAAU8C,SAASK,IAAI;QAAC;QAAGxG,QAAQ;IAAI;AAChF;AAEA,MAAMyC,OAAO,CAAC,EACZC,OAAO,EACP1C,MAAM,EACN2C,KAAK,EAKN,GACC,IAAIzD,SACF,CAAC;;;;;OAKE,EAAE2E,WAAWlB,OAAO;;;;;;UAMjB,EAAEkB,WAAWlB,OAAO,KAAK,EAAED,QAAQ;OACtC,CAAC,EACJ;QACE/B,SAAS;YACP,4EAA4E;YAC5E,2BAA2B;YAC3B,gBAAgB;QAClB;QACAX;IACF;AAGJ,MAAM6D,aAAa,CAACtB,QAClBA,MAAMkE,OAAO,CAAC,YAAY,CAACC,YAAc,CAAC,EAAE,EAAEA,UAAUC,UAAU,CAAC,GAAG,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js';
+import type { AuthorizedMCP, MCPBuiltinOAuthConfig, MCPExternalOAuthConfig, MCPOAuthConfig, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js';
 declare module 'payload' {
     interface PayloadRequestAPI {
         MCP: true;
@@ -7,8 +7,16 @@ declare module 'payload' {
         /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */
         '@payloadcms/plugin-mcp': MCPPluginConfig;
     }
+    interface RequestContext {
+        /** Set on MCP requests before they're authenticated. */
+        mcp?: {
+            /** The MCP endpoint's address, which OAuth access tokens for MCP are issued for. */
+            resource: string;
+        };
+    }
 }
-export type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig };
+export type { AuthorizedMCP, MCPBuiltinOAuthConfig, MCPExternalOAuthConfig, MCPOAuthConfig, MCPPluginConfig, SanitizedMCPPluginConfig, };
 export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
+export { oauthProtectedResourceHandler } from './endpoint/oauth.js';
 export declare const mcpPlugin: (options: MCPPluginConfig) => import("payload").Plugin;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAK1F,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,iBAAiB;QAChC,GAAG,EAAE,IAAI,CAAA;KACV;IACD,UAAU,iBAAiB;QACzB,uFAAuF;QACvF,wBAAwB,EAAE,eAAe,CAAA;KAC1C;CACF;AAED,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAA;AAExE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAElG,eAAO,MAAM,SAAS,wDAiCpB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,wBAAwB,EACzB,MAAM,YAAY,CAAA;AAOnB,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,iBAAiB;QAChC,GAAG,EAAE,IAAI,CAAA;KACV;IACD,UAAU,iBAAiB;QACzB,uFAAuF;QACvF,wBAAwB,EAAE,eAAe,CAAA;KAC1C;IACD,UAAiB,cAAc;QAC7B,wDAAwD;QACxD,GAAG,CAAC,EAAE;YACJ,oFAAoF;YACpF,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;KACF;CACF;AAED,YAAY,EACV,aAAa,EACb,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,wBAAwB,GACzB,CAAA;AAED,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAClG,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAA;AAEnE,eAAO,MAAM,SAAS,wDA0CpB,CAAA"}

package/dist/index.js

@@ -1,7 +1,10 @@
 import { definePlugin } from 'payload';
 import { mcpEndpoint } from './endpoint/index.js';
+import { oauthProtectedResourceEndpoint } from './endpoint/oauth.js';
+import { oauthServerEndpoints } from './endpoint/oauthServer.js';
 import { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js';
 export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
+export { oauthProtectedResourceHandler } from './endpoint/oauth.js';
 export const mcpPlugin = definePlugin({
     slug: '@payloadcms/plugin-mcp',
     order: 10,
@@ -23,8 +26,10 @@ export const mcpPlugin = definePlugin({
             ...config,
             endpoints: [
                 ...config.endpoints ?? [],
-                // Payload prefixes /api, so the full path is /api/mcp.
+                // Payload prefixes /api, so the full path is /api/mcp. getAuthorizedMCP authenticates the
+                // request with dev auto-login turned off, so Payload doesn't authenticate it first.
                 {
+                    disableAuth: true,
                     handler: mcpEndpoint,
                     method: 'post',
                     path: '/mcp'
@@ -32,6 +37,7 @@ export const mcpPlugin = definePlugin({
                 // Streamable HTTP's optional server=>client GET stream. We don't offer
                 // one, so answer 405 per spec-— clients then skip it cleanly
                 {
+                    disableAuth: true,
                     handler: ()=>new Response(null, {
                             headers: {
                                 Allow: 'POST'
@@ -40,7 +46,14 @@ export const mcpPlugin = definePlugin({
                         }),
                     method: 'get',
                     path: '/mcp'
-                }
+                },
+                {
+                    disableAuth: true,
+                    handler: oauthProtectedResourceEndpoint,
+                    method: 'get',
+                    path: '/mcp/oauth-protected-resource'
+                },
+                ...oauthServerEndpoints
             ]
         };
     }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { definePlugin } from 'payload'\n\nimport type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js'\n\nimport { mcpEndpoint } from './endpoint/index.js'\nimport { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js'\n\ndeclare module 'payload' {\n  export interface PayloadRequestAPI {\n    MCP: true\n  }\n  interface RegisteredPlugins {\n    /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */\n    '@payloadcms/plugin-mcp': MCPPluginConfig\n  }\n}\n\nexport type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig }\n\nexport { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js'\n\nexport const mcpPlugin = definePlugin<MCPPluginConfig>({\n  slug: '@payloadcms/plugin-mcp',\n  order: 10,\n  plugin: ({ config, options, plugins }) => {\n    const pluginConfig = sanitizeMCPConfig({ config, pluginConfig: options })\n\n    // Stash the sanitized config on plugin options so `getPluginConfig()` reads it.\n    const registered = plugins['@payloadcms/plugin-mcp']\n    if (registered) {\n      // @ts-expect-error\n      registered.sanitizedOptions = pluginConfig as unknown as typeof registered.options\n    }\n\n    if (pluginConfig.disabled) {\n      return config\n    }\n\n    return {\n      ...config,\n      endpoints: [\n        ...(config.endpoints ?? []),\n        // Payload prefixes /api, so the full path is /api/mcp.\n        { handler: mcpEndpoint, method: 'post', path: '/mcp' },\n        // Streamable HTTP's optional server=>client GET stream. We don't offer\n        // one, so answer 405 per spec-— clients then skip it cleanly\n        {\n          handler: () => new Response(null, { headers: { Allow: 'POST' }, status: 405 }),\n          method: 'get',\n          path: '/mcp',\n        },\n      ],\n    }\n  },\n})\n"],"names":["definePlugin","mcpEndpoint","sanitizeMCPConfig","defineCollectionTool","defineGlobalTool","definePrompt","defineTool","mcpPlugin","slug","order","plugin","config","options","plugins","pluginConfig","registered","sanitizedOptions","disabled","endpoints","handler","method","path","Response","headers","Allow","status"],"mappings":"AAAA,SAASA,YAAY,QAAQ,UAAS;AAItC,SAASC,WAAW,QAAQ,sBAAqB;AACjD,SAASC,iBAAiB,QAAQ,6BAA4B;AAc9D,SAASC,oBAAoB,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,UAAU,QAAQ,kBAAiB;AAElG,OAAO,MAAMC,YAAYP,aAA8B;IACrDQ,MAAM;IACNC,OAAO;IACPC,QAAQ,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE;QACnC,MAAMC,eAAeZ,kBAAkB;YAAES;YAAQG,cAAcF;QAAQ;QAEvE,gFAAgF;QAChF,MAAMG,aAAaF,OAAO,CAAC,yBAAyB;QACpD,IAAIE,YAAY;YACd,mBAAmB;YACnBA,WAAWC,gBAAgB,GAAGF;QAChC;QAEA,IAAIA,aAAaG,QAAQ,EAAE;YACzB,OAAON;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACTO,WAAW;mBACLP,OAAOO,SAAS,IAAI,EAAE;gBAC1B,uDAAuD;gBACvD;oBAAEC,SAASlB;oBAAamB,QAAQ;oBAAQC,MAAM;gBAAO;gBACrD,uEAAuE;gBACvE,6DAA6D;gBAC7D;oBACEF,SAAS,IAAM,IAAIG,SAAS,MAAM;4BAAEC,SAAS;gCAAEC,OAAO;4BAAO;4BAAGC,QAAQ;wBAAI;oBAC5EL,QAAQ;oBACRC,MAAM;gBACR;aACD;QACH;IACF;AACF,GAAE"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { definePlugin } from 'payload'\n\nimport type {\n  AuthorizedMCP,\n  MCPBuiltinOAuthConfig,\n  MCPExternalOAuthConfig,\n  MCPOAuthConfig,\n  MCPPluginConfig,\n  SanitizedMCPPluginConfig,\n} from './types.js'\n\nimport { mcpEndpoint } from './endpoint/index.js'\nimport { oauthProtectedResourceEndpoint } from './endpoint/oauth.js'\nimport { oauthServerEndpoints } from './endpoint/oauthServer.js'\nimport { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js'\n\ndeclare module 'payload' {\n  export interface PayloadRequestAPI {\n    MCP: true\n  }\n  interface RegisteredPlugins {\n    /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */\n    '@payloadcms/plugin-mcp': MCPPluginConfig\n  }\n  export interface RequestContext {\n    /** Set on MCP requests before they're authenticated. */\n    mcp?: {\n      /** The MCP endpoint's address, which OAuth access tokens for MCP are issued for. */\n      resource: string\n    }\n  }\n}\n\nexport type {\n  AuthorizedMCP,\n  MCPBuiltinOAuthConfig,\n  MCPExternalOAuthConfig,\n  MCPOAuthConfig,\n  MCPPluginConfig,\n  SanitizedMCPPluginConfig,\n}\n\nexport { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js'\nexport { oauthProtectedResourceHandler } from './endpoint/oauth.js'\n\nexport const mcpPlugin = definePlugin<MCPPluginConfig>({\n  slug: '@payloadcms/plugin-mcp',\n  order: 10,\n  plugin: ({ config, options, plugins }) => {\n    const pluginConfig = sanitizeMCPConfig({ config, pluginConfig: options })\n\n    // Stash the sanitized config on plugin options so `getPluginConfig()` reads it.\n    const registered = plugins['@payloadcms/plugin-mcp']\n    if (registered) {\n      // @ts-expect-error\n      registered.sanitizedOptions = pluginConfig\n    }\n\n    if (pluginConfig.disabled) {\n      return config\n    }\n\n    return {\n      ...config,\n      endpoints: [\n        ...(config.endpoints ?? []),\n        // Payload prefixes /api, so the full path is /api/mcp. getAuthorizedMCP authenticates the\n        // request with dev auto-login turned off, so Payload doesn't authenticate it first.\n        { disableAuth: true, handler: mcpEndpoint, method: 'post', path: '/mcp' },\n        // Streamable HTTP's optional server=>client GET stream. We don't offer\n        // one, so answer 405 per spec-— clients then skip it cleanly\n        {\n          disableAuth: true,\n          handler: () => new Response(null, { headers: { Allow: 'POST' }, status: 405 }),\n          method: 'get',\n          path: '/mcp',\n        },\n        {\n          disableAuth: true,\n          handler: oauthProtectedResourceEndpoint,\n          method: 'get',\n          path: '/mcp/oauth-protected-resource',\n        },\n        ...oauthServerEndpoints,\n      ],\n    }\n  },\n})\n"],"names":["definePlugin","mcpEndpoint","oauthProtectedResourceEndpoint","oauthServerEndpoints","sanitizeMCPConfig","defineCollectionTool","defineGlobalTool","definePrompt","defineTool","oauthProtectedResourceHandler","mcpPlugin","slug","order","plugin","config","options","plugins","pluginConfig","registered","sanitizedOptions","disabled","endpoints","disableAuth","handler","method","path","Response","headers","Allow","status"],"mappings":"AAAA,SAASA,YAAY,QAAQ,UAAS;AAWtC,SAASC,WAAW,QAAQ,sBAAqB;AACjD,SAASC,8BAA8B,QAAQ,sBAAqB;AACpE,SAASC,oBAAoB,QAAQ,4BAA2B;AAChE,SAASC,iBAAiB,QAAQ,6BAA4B;AA4B9D,SAASC,oBAAoB,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,UAAU,QAAQ,kBAAiB;AAClG,SAASC,6BAA6B,QAAQ,sBAAqB;AAEnE,OAAO,MAAMC,YAAYV,aAA8B;IACrDW,MAAM;IACNC,OAAO;IACPC,QAAQ,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE;QACnC,MAAMC,eAAeb,kBAAkB;YAAEU;YAAQG,cAAcF;QAAQ;QAEvE,gFAAgF;QAChF,MAAMG,aAAaF,OAAO,CAAC,yBAAyB;QACpD,IAAIE,YAAY;YACd,mBAAmB;YACnBA,WAAWC,gBAAgB,GAAGF;QAChC;QAEA,IAAIA,aAAaG,QAAQ,EAAE;YACzB,OAAON;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACTO,WAAW;mBACLP,OAAOO,SAAS,IAAI,EAAE;gBAC1B,0FAA0F;gBAC1F,oFAAoF;gBACpF;oBAAEC,aAAa;oBAAMC,SAAStB;oBAAauB,QAAQ;oBAAQC,MAAM;gBAAO;gBACxE,uEAAuE;gBACvE,6DAA6D;gBAC7D;oBACEH,aAAa;oBACbC,SAAS,IAAM,IAAIG,SAAS,MAAM;4BAAEC,SAAS;gCAAEC,OAAO;4BAAO;4BAAGC,QAAQ;wBAAI;oBAC5EL,QAAQ;oBACRC,MAAM;gBACR;gBACA;oBACEH,aAAa;oBACbC,SAASrB;oBACTsB,QAAQ;oBACRC,MAAM;gBACR;mBACGtB;aACJ;QACH;IACF;AACF,GAAE"}

package/dist/mcp/buildMcpServer.d.ts

@@ -1,5 +1,5 @@
+import type { PayloadRequest } from 'payload';
 import { McpServer } from '@modelcontextprotocol/server';
-import { type PayloadRequest } from 'payload';
 import type { AuthorizedMCP, SanitizedMCPPluginConfig } from '../types.js';
 /**
  * Serving-entry-agnostic core: registers every authorized MCP item onto a fresh
@@ -9,7 +9,7 @@ import type { AuthorizedMCP, SanitizedMCPPluginConfig } from '../types.js';
  *
  * `req` is the request context handlers see. For HTTP it's the live
  * `PayloadRequest` derived from the incoming HTTP request; for stdio it's a
- * synthesized one built via `createLocalReq`.
+ * synthesized one built via `createPayloadRequest`.
  */
 export declare const buildMcpServer: ({ authorizedMCP, pluginConfig, req, }: {
     authorizedMCP: AuthorizedMCP;

package/dist/mcp/buildMcpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildMcpServer.d.ts","sourceRoot":"","sources":["../../src/mcp/buildMcpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAsB,MAAM,8BAA8B,CAAA;AAC5E,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAGvD,OAAO,KAAK,EACV,aAAa,EAMb,wBAAwB,EAEzB,MAAM,aAAa,CAAA;AAKpB;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,0CAIxB;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,YAAY,EAAE,wBAAwB,CAAA;IACtC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,SAkNH,CAAA"}
+{"version":3,"file":"buildMcpServer.d.ts","sourceRoot":"","sources":["../../src/mcp/buildMcpServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,EAAE,SAAS,EAAsB,MAAM,8BAA8B,CAAA;AAG5E,OAAO,KAAK,EACV,aAAa,EAMb,wBAAwB,EAEzB,MAAM,aAAa,CAAA;AAKpB;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,0CAIxB;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,YAAY,EAAE,wBAAwB,CAAA;IACtC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,SAgNH,CAAA"}

package/dist/mcp/buildMcpServer.js

@@ -1,6 +1,5 @@
 import { McpServer } from '@modelcontextprotocol/server';
-import { APIError } from 'payload';
-import { z } from 'zod';
+import { APIError, strictObject, z } from 'payload';
 import { getLogger } from '../utils/getLogger.js';
 import { toStandardSchema } from '../utils/toStandardSchema.js';
 /**
@@ -11,8 +10,9 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
  *
  * `req` is the request context handlers see. For HTTP it's the live
  * `PayloadRequest` derived from the incoming HTTP request; for stdio it's a
- * synthesized one built via `createLocalReq`.
+ * synthesized one built via `createPayloadRequest`.
  */ export const buildMcpServer = ({ authorizedMCP, pluginConfig, req })=>{
+    z.config(z.locales.en());
     const serverOptions = pluginConfig.mcp?.serverOptions || {};
     const server = new McpServer({
         name: 'Payload MCP Server',
@@ -40,20 +40,19 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
     };
     /**
    * Runs a collection/global tool call:
-   * - reads `collectionSlug` / `globalSlug` from the input
+   * - reads `slug` from the input
    * - runs access control: errors if `authorizedMCP.items` has no entry for this tool + slug
    * - runs the tool handler and finalizes its response
    */ const callEntityTool = async ({ input, item, serverContext })=>{
         const entity = item.type === 'collectionTool' ? 'collection' : 'global';
-        const slugKey = item.type === 'collectionTool' ? 'collectionSlug' : 'globalSlug';
         const toolInput = input ?? {};
-        const slug = toolInput[slugKey];
+        const slug = toolInput.slug;
         if (!slug) {
             return {
                 content: [
                     {
                         type: 'text',
-                        text: `Error: "${item.mcpName}" requires ${slugKey}. Use getConfigInfo to inspect ${entity} slugs.`
+                        text: `Error: "${item.mcpName}" requires slug. Use getConfigInfo to inspect ${entity} slugs.`
                     }
                 ],
                 isError: true
@@ -79,10 +78,10 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
         };
         const response = await (match.type === 'collectionTool' ? match.tool.handler({
             ...handlerArgs,
-            collectionSlug: slug
+            slug
         }) : match.tool.handler({
             ...handlerArgs,
-            globalSlug: slug
+            slug
         }));
         return finalizeToolResponse({
             input: toolInput,
@@ -103,7 +102,6 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
                         }
                         registeredEntityTools.add(item.mcpName);
                         const inputSchema = withSlugInput({
-                            name: item.type === 'collectionTool' ? 'collectionSlug' : 'globalSlug',
                             input: item.tool.input
                         });
                         server.registerTool(item.mcpName, {
@@ -189,33 +187,47 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
     }
     return server;
 };
-const withSlugInput = ({ name, input })=>{
-    const description = name === 'collectionSlug' ? 'The collection slug' : 'The global slug';
-    const slugSchema = z.string().describe(description);
+const withSlugInput = ({ input })=>{
+    const description = 'The target slug.';
+    const slugSchema = z.string().check(z.describe(description));
     if (!input) {
-        return z.object({
-            [name]: slugSchema
+        return strictObject({
+            slug: slugSchema
         });
     }
-    if (input instanceof z.ZodObject) {
-        return input.extend({
-            [name]: slugSchema
+    if (typeof input === 'object' && input !== null && '~standard' in input) {
+        const schema = input['~standard'].jsonSchema.input({
+            target: 'draft-2020-12'
+        });
+        const properties = schema.properties;
+        if (properties?.slug) {
+            return input;
+        }
+        return addSlugToJSONSchema({
+            description,
+            schema
         });
     }
-    const schema = input;
+    return addSlugToJSONSchema({
+        description,
+        schema: input
+    });
+};
+const addSlugToJSONSchema = ({ description, schema })=>{
+    const objectSchema = schema;
     return {
-        ...schema,
+        ...objectSchema,
         type: 'object',
         properties: {
-            ...schema.properties,
-            [name]: {
+            ...objectSchema.properties,
+            slug: {
                 type: 'string',
                 description
             }
         },
         required: Array.from(new Set([
-            name,
-            ...schema.required ?? []
+            'slug',
+            ...objectSchema.required ?? []
         ]))
     };
 };