skybridge 0.0.0-dev.fa77314 → 0.0.0-dev.fa95a7b

package/dist/server/auth/providers/authplane.test.js

@@ -0,0 +1,143 @@
+// @vitest-environment node
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { authplaneProvider } from "./authplane.js";
+import { lastJwksConfig as jwks } from "./verify-spy.js";
+vi.mock("../verify.js", () => import("./verify-spy.js"));
+afterEach(() => vi.restoreAllMocks());
+const ISSUER = "https://auth.acme.com";
+function discoveryDoc(issuer, scopes) {
+    return {
+        issuer,
+        authorization_endpoint: `${issuer}/authorize`,
+        token_endpoint: `${issuer}/token`,
+        registration_endpoint: `${issuer}/register`,
+        response_types_supported: ["code"],
+        scopes_supported: scopes,
+        jwks_uri: `${issuer}/.well-known/jwks.json`,
+    };
+}
+function mockDiscovery(docs) {
+    return vi
+        .spyOn(globalThis, "fetch")
+        .mockImplementation(async (input) => {
+        const url = String(input);
+        const entry = Object.entries(docs).find(([issuer]) => url === `${issuer}/.well-known/openid-configuration`);
+        if (entry === undefined) {
+            return new Response(null, { status: 404 });
+        }
+        return new Response(JSON.stringify(discoveryDoc(...entry)), {
+            headers: { "content-type": "application/json" },
+        });
+    });
+}
+describe("authplaneProvider", () => {
+    it("derives the audience from the resource the server advertises", async () => {
+        mockDiscovery({ [ISSUER]: ["checkout"] });
+        const config = await authplaneProvider({
+            issuer: ISSUER,
+            resource: "https://coffee.example.com/mcp",
+        }).resolve();
+        expect(jwks().audience).toBe("https://coffee.example.com/mcp");
+        expect(jwks().issuer).toBe(ISSUER);
+        expect(jwks().jwksUri).toBe(`${ISSUER}/.well-known/jwks.json`);
+        expect(config.baseUrl).toBe("https://coffee.example.com/mcp");
+    });
+    it.each([
+        "https://coffee.example.com/mcp",
+        "https://coffee.example.com/v2/mcp",
+        "https://coffee.example.com/",
+        "http://localhost:3000/mcp",
+        "https://coffee.example.com:8443/mcp",
+    ])("passes %s through as both resource and audience", async (resource) => {
+        mockDiscovery({ [ISSUER]: ["checkout"] });
+        const config = await authplaneProvider({
+            issuer: ISSUER,
+            resource,
+        }).resolve();
+        expect(config.baseUrl).toBe(resource);
+        expect(jwks().audience).toBe(resource);
+    });
+    // The metadata router serialises the resource identifier through `URL` before
+    // advertising it. Anything that serialisation would rewrite is refused here,
+    // so the advertised identifier is always the configured one.
+    it.each([
+        // Pathless origin — gains a root path.
+        ["https://coffee.example.com", "https://coffee.example.com/"],
+        ["http://localhost:3000", "http://localhost:3000/"],
+        // Uppercase host — lowercased.
+        ["https://COFFEE.EXAMPLE.COM/mcp", "https://coffee.example.com/mcp"],
+        // Explicit default port — dropped.
+        ["https://coffee.example.com:443/mcp", "https://coffee.example.com/mcp"],
+    ])("rejects %s and names %s instead", async (resource, published) => {
+        const fetchSpy = mockDiscovery({ [ISSUER]: ["checkout"] });
+        expect(() => authplaneProvider({ issuer: ISSUER, resource })).toThrow(`is advertised as ${JSON.stringify(published)}`);
+        expect(fetchSpy).not.toHaveBeenCalled();
+    });
+    it("lets an explicit audience override the default", async () => {
+        mockDiscovery({ [ISSUER]: ["checkout"] });
+        await authplaneProvider({
+            issuer: ISSUER,
+            resource: "https://coffee.example.com/mcp",
+            audience: "urn:acme:coffee",
+        }).resolve();
+        expect(jwks().audience).toBe("urn:acme:coffee");
+    });
+    it.each([
+        ["coffee.example.com/mcp", /must be an absolute URL/],
+        ["ftp://coffee.example.com/mcp", /must use the http or https scheme/],
+        ["https://coffee.example.com/mcp#frag", /must not include a fragment/],
+    ])("rejects the malformed resource %s", async (resource, message) => {
+        const fetchSpy = mockDiscovery({ [ISSUER]: ["checkout"] });
+        expect(() => authplaneProvider({ issuer: ISSUER, resource })).toThrow(message);
+        expect(fetchSpy).not.toHaveBeenCalled();
+    });
+    it("rejects a malformed issuer before any discovery", async () => {
+        const fetchSpy = mockDiscovery({ [ISSUER]: ["checkout"] });
+        expect(() => authplaneProvider({
+            issuer: "auth.acme.com",
+            resource: "https://coffee.example.com/mcp",
+        })).toThrow(/`issuer` must be an absolute URL/);
+        expect(fetchSpy).not.toHaveBeenCalled();
+    });
+    it("accepts an issuer carrying a trailing slash", async () => {
+        // Discovery resolves the issuer itself; the provider passes it through
+        // rather than rewriting the operator's value.
+        mockDiscovery({ [ISSUER]: ["checkout"] });
+        await authplaneProvider({
+            issuer: `${ISSUER}/`,
+            resource: "https://coffee.example.com/mcp",
+        }).resolve();
+        expect(jwks().issuer).toBe(ISSUER);
+    });
+    it("accepts a local http issuer for development", async () => {
+        const local = "http://localhost:9000";
+        mockDiscovery({ [local]: ["checkout"] });
+        await authplaneProvider({
+            issuer: local,
+            resource: "http://localhost:3000/mcp",
+        }).resolve();
+        expect(jwks().issuer).toBe(local);
+        expect(jwks().audience).toBe("http://localhost:3000/mcp");
+    });
+    it("forwards scopes and the required-scope floor", async () => {
+        mockDiscovery({ [ISSUER]: ["checkout", "profile"] });
+        const config = await authplaneProvider({
+            issuer: ISSUER,
+            resource: "https://coffee.example.com/mcp",
+            scopes: ["checkout"],
+            requiredScopes: ["checkout"],
+        }).resolve();
+        expect(config.scopesSupported).toEqual(["checkout"]);
+        expect(config.requiredScopes).toEqual(["checkout"]);
+    });
+    it("advertises the registration endpoint for dynamic client registration", async () => {
+        mockDiscovery({ [ISSUER]: ["checkout"] });
+        const config = await authplaneProvider({
+            issuer: ISSUER,
+            resource: "https://coffee.example.com/mcp",
+        }).resolve();
+        expect(config.oauthMetadata.issuer).toBe(ISSUER);
+        expect(config.oauthMetadata.registration_endpoint).toBe(`${ISSUER}/register`);
+    });
+});
+//# sourceMappingURL=authplane.test.js.map

package/dist/server/auth/providers/authplane.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authplane.test.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/authplane.test.ts"],"names":[],"mappings":"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","sourcesContent":["// @vitest-environment node\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { authplaneProvider } from \"./authplane.js\";\nimport { lastJwksConfig as jwks } from \"./verify-spy.js\";\n\nvi.mock(\"../verify.js\", () => import(\"./verify-spy.js\"));\n\nafterEach(() => vi.restoreAllMocks());\n\nconst ISSUER = \"https://auth.acme.com\";\n\nfunction discoveryDoc(issuer: string, scopes: string[]) {\n  return {\n    issuer,\n    authorization_endpoint: `${issuer}/authorize`,\n    token_endpoint: `${issuer}/token`,\n    registration_endpoint: `${issuer}/register`,\n    response_types_supported: [\"code\"],\n    scopes_supported: scopes,\n    jwks_uri: `${issuer}/.well-known/jwks.json`,\n  };\n}\n\nfunction mockDiscovery(docs: Record<string, string[]>) {\n  return vi\n    .spyOn(globalThis, \"fetch\")\n    .mockImplementation(async (input: RequestInfo | URL) => {\n      const url = String(input);\n      const entry = Object.entries(docs).find(\n        ([issuer]) => url === `${issuer}/.well-known/openid-configuration`,\n      );\n      if (entry === undefined) {\n        return new Response(null, { status: 404 });\n      }\n      return new Response(JSON.stringify(discoveryDoc(...entry)), {\n        headers: { \"content-type\": \"application/json\" },\n      });\n    });\n}\n\ndescribe(\"authplaneProvider\", () => {\n  it(\"derives the audience from the resource the server advertises\", async () => {\n    mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    const config = await authplaneProvider({\n      issuer: ISSUER,\n      resource: \"https://coffee.example.com/mcp\",\n    }).resolve();\n\n    expect(jwks().audience).toBe(\"https://coffee.example.com/mcp\");\n    expect(jwks().issuer).toBe(ISSUER);\n    expect(jwks().jwksUri).toBe(`${ISSUER}/.well-known/jwks.json`);\n    expect(config.baseUrl).toBe(\"https://coffee.example.com/mcp\");\n  });\n\n  it.each([\n    \"https://coffee.example.com/mcp\",\n    \"https://coffee.example.com/v2/mcp\",\n    \"https://coffee.example.com/\",\n    \"http://localhost:3000/mcp\",\n    \"https://coffee.example.com:8443/mcp\",\n  ])(\"passes %s through as both resource and audience\", async (resource) => {\n    mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    const config = await authplaneProvider({\n      issuer: ISSUER,\n      resource,\n    }).resolve();\n\n    expect(config.baseUrl).toBe(resource);\n    expect(jwks().audience).toBe(resource);\n  });\n\n  // The metadata router serialises the resource identifier through `URL` before\n  // advertising it. Anything that serialisation would rewrite is refused here,\n  // so the advertised identifier is always the configured one.\n  it.each([\n    // Pathless origin — gains a root path.\n    [\"https://coffee.example.com\", \"https://coffee.example.com/\"],\n    [\"http://localhost:3000\", \"http://localhost:3000/\"],\n    // Uppercase host — lowercased.\n    [\"https://COFFEE.EXAMPLE.COM/mcp\", \"https://coffee.example.com/mcp\"],\n    // Explicit default port — dropped.\n    [\"https://coffee.example.com:443/mcp\", \"https://coffee.example.com/mcp\"],\n  ])(\"rejects %s and names %s instead\", async (resource, published) => {\n    const fetchSpy = mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    expect(() => authplaneProvider({ issuer: ISSUER, resource })).toThrow(\n      `is advertised as ${JSON.stringify(published)}`,\n    );\n    expect(fetchSpy).not.toHaveBeenCalled();\n  });\n\n  it(\"lets an explicit audience override the default\", async () => {\n    mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    await authplaneProvider({\n      issuer: ISSUER,\n      resource: \"https://coffee.example.com/mcp\",\n      audience: \"urn:acme:coffee\",\n    }).resolve();\n\n    expect(jwks().audience).toBe(\"urn:acme:coffee\");\n  });\n\n  it.each([\n    [\"coffee.example.com/mcp\", /must be an absolute URL/],\n    [\"ftp://coffee.example.com/mcp\", /must use the http or https scheme/],\n    [\"https://coffee.example.com/mcp#frag\", /must not include a fragment/],\n  ])(\"rejects the malformed resource %s\", async (resource, message) => {\n    const fetchSpy = mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    expect(() => authplaneProvider({ issuer: ISSUER, resource })).toThrow(\n      message,\n    );\n    expect(fetchSpy).not.toHaveBeenCalled();\n  });\n\n  it(\"rejects a malformed issuer before any discovery\", async () => {\n    const fetchSpy = mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    expect(() =>\n      authplaneProvider({\n        issuer: \"auth.acme.com\",\n        resource: \"https://coffee.example.com/mcp\",\n      }),\n    ).toThrow(/`issuer` must be an absolute URL/);\n    expect(fetchSpy).not.toHaveBeenCalled();\n  });\n\n  it(\"accepts an issuer carrying a trailing slash\", async () => {\n    // Discovery resolves the issuer itself; the provider passes it through\n    // rather than rewriting the operator's value.\n    mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    await authplaneProvider({\n      issuer: `${ISSUER}/`,\n      resource: \"https://coffee.example.com/mcp\",\n    }).resolve();\n\n    expect(jwks().issuer).toBe(ISSUER);\n  });\n\n  it(\"accepts a local http issuer for development\", async () => {\n    const local = \"http://localhost:9000\";\n    mockDiscovery({ [local]: [\"checkout\"] });\n\n    await authplaneProvider({\n      issuer: local,\n      resource: \"http://localhost:3000/mcp\",\n    }).resolve();\n\n    expect(jwks().issuer).toBe(local);\n    expect(jwks().audience).toBe(\"http://localhost:3000/mcp\");\n  });\n\n  it(\"forwards scopes and the required-scope floor\", async () => {\n    mockDiscovery({ [ISSUER]: [\"checkout\", \"profile\"] });\n\n    const config = await authplaneProvider({\n      issuer: ISSUER,\n      resource: \"https://coffee.example.com/mcp\",\n      scopes: [\"checkout\"],\n      requiredScopes: [\"checkout\"],\n    }).resolve();\n\n    expect(config.scopesSupported).toEqual([\"checkout\"]);\n    expect(config.requiredScopes).toEqual([\"checkout\"]);\n  });\n\n  it(\"advertises the registration endpoint for dynamic client registration\", async () => {\n    mockDiscovery({ [ISSUER]: [\"checkout\"] });\n\n    const config = await authplaneProvider({\n      issuer: ISSUER,\n      resource: \"https://coffee.example.com/mcp\",\n    }).resolve();\n\n    expect(config.oauthMetadata.issuer).toBe(ISSUER);\n    expect(config.oauthMetadata.registration_endpoint).toBe(\n      `${ISSUER}/register`,\n    );\n  });\n});\n"]}

package/dist/server/auth/providers/clerk.d.ts

@@ -1,5 +1,42 @@
-import type { OAuthConfig } from "../index.js";
+import type { ExtraClaims } from "../../auth.js";
+import type { OAuthProvider } from "../index.js";
+import type { RegisteredClaims } from "../verify.js";
 import { type CustomProviderOptions } from "./custom.js";
+/**
+ * Claims a Clerk session token (v2) carries. All optional: `o` and `act` appear
+ * only with organizations and impersonation, and `email` only when a JWT
+ * template adds it.
+ *
+ * @see https://clerk.com/docs/backend-requests/resources/session-tokens
+ * @see https://clerk.com/docs/backend-requests/jwt-templates
+ */
+export type ClerkClaims = {
+    /** Session id. */
+    sid?: string;
+    /** Authorized party: the origin the token was issued to. */
+    azp?: string;
+    /** Session token version. */
+    v?: number;
+    /** Factor verification age, `[since-first-factor, since-second-factor]`. */
+    fva?: number[];
+    /** Active organization, when the user has one. */
+    o?: {
+        /** Organization id. */
+        id?: string;
+        /** Organization slug. */
+        slg?: string;
+        /** Role within the organization. */
+        rol?: string;
+        /** Permissions within the organization. */
+        per?: string;
+        /** Feature-permission map backing `per`. */
+        fpm?: string;
+    };
+    /** Actor, present while a user is being impersonated. */
+    act?: Record<string, unknown>;
+    /** Only when a JWT template adds it; not a default Clerk claim. */
+    email?: string;
+};
 /**
  * OAuth provider for Clerk. `domain` is the Frontend API URL (e.g.
  * `acme.clerk.accounts.dev`, or a production custom domain). Requires Dynamic
@@ -9,6 +46,6 @@ import { type CustomProviderOptions } from "./custom.js";
  * Clerk access tokens carry no `aud` claim, so there is no `audience` option —
  * verification is issuer + JWKS only (matching Clerk's own `mcpAuthClerk`).
  */
-export declare function clerkProvider(opts: {
+export declare function clerkProvider<TCustom extends ExtraClaims = Record<never, never>>(opts: {
     domain: string;
-} & Omit<CustomProviderOptions, "issuer" | "audience">): Promise<OAuthConfig>;
+} & Omit<CustomProviderOptions, "issuer" | "audience">): OAuthProvider<ClerkClaims & TCustom & RegisteredClaims>;

package/dist/server/auth/providers/clerk.js

@@ -1,9 +1,5 @@
 import { customProvider } from "./custom.js";
-/** Normalises a bare host to an https issuer URL and strips a trailing slash. */
-function toIssuerUrl(domain) {
-    const withScheme = /^https?:\/\//.test(domain) ? domain : `https://${domain}`;
-    return withScheme.replace(/\/$/, "");
-}
+import { toIssuerUrl } from "./shared.js";
 /**
  * OAuth provider for Clerk. `domain` is the Frontend API URL (e.g.
  * `acme.clerk.accounts.dev`, or a production custom domain). Requires Dynamic
@@ -15,6 +11,9 @@ function toIssuerUrl(domain) {
  */
 export function clerkProvider(opts) {
     const { domain, ...rest } = opts;
-    return customProvider({ issuer: toIssuerUrl(domain), ...rest });
+    return customProvider({
+        issuer: toIssuerUrl(domain),
+        ...rest,
+    });
 }
 //# sourceMappingURL=clerk.js.map

package/dist/server/auth/providers/clerk.js.map

@@ -1 +1 @@
-{"version":3,"file":"clerk.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/clerk.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,cAAc,EAAE,MAAM,aAAa,CAAC;AAEzE,iFAAiF;AACjF,SAAS,WAAW,CAAC,MAAc;IACjC,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,MAAM,EAAE,CAAC;IAC9E,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAC3B,IAA6E;IAE7E,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;IACjC,OAAO,cAAc,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC","sourcesContent":["import type { OAuthConfig } from \"../index.js\";\nimport { type CustomProviderOptions, customProvider } from \"./custom.js\";\n\n/** Normalises a bare host to an https issuer URL and strips a trailing slash. */\nfunction toIssuerUrl(domain: string): string {\n  const withScheme = /^https?:\\/\\//.test(domain) ? domain : `https://${domain}`;\n  return withScheme.replace(/\\/$/, \"\");\n}\n\n/**\n * OAuth provider for Clerk. `domain` is the Frontend API URL (e.g.\n * `acme.clerk.accounts.dev`, or a production custom domain). Requires Dynamic\n * Client Registration enabled on the instance, and the OAuth application set to\n * issue JWT access tokens (opaque tokens can't be JWKS-verified).\n *\n * Clerk access tokens carry no `aud` claim, so there is no `audience` option —\n * verification is issuer + JWKS only (matching Clerk's own `mcpAuthClerk`).\n */\nexport function clerkProvider(\n  opts: { domain: string } & Omit<CustomProviderOptions, \"issuer\" | \"audience\">,\n): Promise<OAuthConfig> {\n  const { domain, ...rest } = opts;\n  return customProvider({ issuer: toIssuerUrl(domain), ...rest });\n}\n"]}
+{"version":3,"file":"clerk.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/clerk.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8B,cAAc,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAsC1C;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAG3B,IAA6E;IAE7E,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;IACjC,OAAO,cAAc,CAAwB;QAC3C,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;QAC3B,GAAG,IAAI;KACR,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { ExtraClaims } from \"../../auth.js\";\nimport type { OAuthProvider } from \"../index.js\";\nimport type { RegisteredClaims } from \"../verify.js\";\nimport { type CustomProviderOptions, customProvider } from \"./custom.js\";\nimport { toIssuerUrl } from \"./shared.js\";\n\n/**\n * Claims a Clerk session token (v2) carries. All optional: `o` and `act` appear\n * only with organizations and impersonation, and `email` only when a JWT\n * template adds it.\n *\n * @see https://clerk.com/docs/backend-requests/resources/session-tokens\n * @see https://clerk.com/docs/backend-requests/jwt-templates\n */\nexport type ClerkClaims = {\n  /** Session id. */\n  sid?: string;\n  /** Authorized party: the origin the token was issued to. */\n  azp?: string;\n  /** Session token version. */\n  v?: number;\n  /** Factor verification age, `[since-first-factor, since-second-factor]`. */\n  fva?: number[];\n  /** Active organization, when the user has one. */\n  o?: {\n    /** Organization id. */\n    id?: string;\n    /** Organization slug. */\n    slg?: string;\n    /** Role within the organization. */\n    rol?: string;\n    /** Permissions within the organization. */\n    per?: string;\n    /** Feature-permission map backing `per`. */\n    fpm?: string;\n  };\n  /** Actor, present while a user is being impersonated. */\n  act?: Record<string, unknown>;\n  /** Only when a JWT template adds it; not a default Clerk claim. */\n  email?: string;\n};\n\n/**\n * OAuth provider for Clerk. `domain` is the Frontend API URL (e.g.\n * `acme.clerk.accounts.dev`, or a production custom domain). Requires Dynamic\n * Client Registration enabled on the instance, and the OAuth application set to\n * issue JWT access tokens (opaque tokens can't be JWKS-verified).\n *\n * Clerk access tokens carry no `aud` claim, so there is no `audience` option —\n * verification is issuer + JWKS only (matching Clerk's own `mcpAuthClerk`).\n */\nexport function clerkProvider<\n  TCustom extends ExtraClaims = Record<never, never>,\n>(\n  opts: { domain: string } & Omit<CustomProviderOptions, \"issuer\" | \"audience\">,\n): OAuthProvider<ClerkClaims & TCustom & RegisteredClaims> {\n  const { domain, ...rest } = opts;\n  return customProvider<ClerkClaims & TCustom>({\n    issuer: toIssuerUrl(domain),\n    ...rest,\n  });\n}\n"]}

package/dist/server/auth/providers/clerk.test.js

@@ -1,8 +1,10 @@
 // @vitest-environment node
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { clerkProvider } from "./clerk.js";
+import { lastJwksConfig as jwks } from "./verify-spy.js";
+vi.mock("../verify.js", () => import("./verify-spy.js"));
 afterEach(() => vi.restoreAllMocks());
-function doc(issuer, extra = {}) {
+function doc(issuer) {
     return {
         issuer,
         authorization_endpoint: `${issuer}/oauth/authorize`,
@@ -11,38 +13,18 @@ function doc(issuer, extra = {}) {
         response_types_supported: ["code"],
         scopes_supported: ["profile", "email"],
         jwks_uri: `${issuer}/.well-known/jwks.json`,
-        ...extra,
     };
 }
 describe("clerkProvider", () => {
-    it("builds the issuer from the Frontend API domain", async () => {
+    it("verifies issuer + JWKS with no audience (Clerk tokens carry no aud)", async () => {
         const issuer = "https://acme.clerk.accounts.dev";
         const fetchSpy = vi.spyOn(globalThis, "fetch").mockResolvedValue(new Response(JSON.stringify(doc(issuer)), {
             headers: { "content-type": "application/json" },
         }));
-        const config = await clerkProvider({
-            domain: "acme.clerk.accounts.dev",
-        });
+        await clerkProvider({ domain: "acme.clerk.accounts.dev" }).resolve();
         expect(fetchSpy).toHaveBeenCalledWith(`${issuer}/.well-known/openid-configuration`, expect.anything());
-        expect(config.verify.issuer).toBe(issuer);
-        // Clerk tokens carry no aud — the provider configures no audience check.
-        expect(config.verify.audience).toBeUndefined();
-    });
-    it("uses oauth-authorization-server when oidc omits the registration_endpoint", async () => {
-        const issuer = "https://acme.clerk.accounts.dev";
-        vi.spyOn(globalThis, "fetch").mockImplementation(async (input) => {
-            const url = String(input);
-            if (url.endsWith("/.well-known/openid-configuration")) {
-                return new Response(JSON.stringify(doc(issuer, { registration_endpoint: undefined })), { headers: { "content-type": "application/json" } });
-            }
-            return new Response(JSON.stringify(doc(issuer)), {
-                headers: { "content-type": "application/json" },
-            });
-        });
-        const config = await clerkProvider({
-            domain: "acme.clerk.accounts.dev",
-        });
-        expect(config.oauthMetadata.registration_endpoint).toBe(`${issuer}/oauth/register`);
+        expect(jwks().issuer).toBe(issuer);
+        expect(jwks().audience).toBeUndefined();
     });
 });
 //# sourceMappingURL=clerk.test.js.map

package/dist/server/auth/providers/clerk.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"clerk.test.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/clerk.test.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC;AAEtC,SAAS,GAAG,CAAC,MAAc,EAAE,QAAiC,EAAE;IAC9D,OAAO;QACL,MAAM;QACN,sBAAsB,EAAE,GAAG,MAAM,kBAAkB;QACnD,cAAc,EAAE,GAAG,MAAM,cAAc;QACvC,qBAAqB,EAAE,GAAG,MAAM,iBAAiB;QACjD,wBAAwB,EAAE,CAAC,MAAM,CAAC;QAClC,gBAAgB,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;QACtC,QAAQ,EAAE,GAAG,MAAM,wBAAwB;QAC3C,GAAG,KAAK;KACT,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,MAAM,GAAG,iCAAiC,CAAC;QACjD,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,iBAAiB,CAC9D,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE;YACxC,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CACH,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;YACjC,MAAM,EAAE,yBAAyB;SAClC,CAAC,CAAC;QAEH,MAAM,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACnC,GAAG,MAAM,mCAAmC,EAC5C,MAAM,CAAC,QAAQ,EAAE,CAClB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1C,yEAAyE;QACzE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,MAAM,GAAG,iCAAiC,CAAC;QACjD,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,GAAG,CAAC,QAAQ,CAAC,mCAAmC,CAAC,EAAE,CAAC;gBACtD,OAAO,IAAI,QAAQ,CACjB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,qBAAqB,EAAE,SAAS,EAAE,CAAC,CAAC,EACjE,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CACpD,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE;gBAC/C,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;aAChD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;YACjC,MAAM,EAAE,yBAAyB;SAClC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC,IAAI,CACrD,GAAG,MAAM,iBAAiB,CAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// @vitest-environment node\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { clerkProvider } from \"./clerk.js\";\n\nafterEach(() => vi.restoreAllMocks());\n\nfunction doc(issuer: string, extra: Record<string, unknown> = {}) {\n  return {\n    issuer,\n    authorization_endpoint: `${issuer}/oauth/authorize`,\n    token_endpoint: `${issuer}/oauth/token`,\n    registration_endpoint: `${issuer}/oauth/register`,\n    response_types_supported: [\"code\"],\n    scopes_supported: [\"profile\", \"email\"],\n    jwks_uri: `${issuer}/.well-known/jwks.json`,\n    ...extra,\n  };\n}\n\ndescribe(\"clerkProvider\", () => {\n  it(\"builds the issuer from the Frontend API domain\", async () => {\n    const issuer = \"https://acme.clerk.accounts.dev\";\n    const fetchSpy = vi.spyOn(globalThis, \"fetch\").mockResolvedValue(\n      new Response(JSON.stringify(doc(issuer)), {\n        headers: { \"content-type\": \"application/json\" },\n      }),\n    );\n\n    const config = await clerkProvider({\n      domain: \"acme.clerk.accounts.dev\",\n    });\n\n    expect(fetchSpy).toHaveBeenCalledWith(\n      `${issuer}/.well-known/openid-configuration`,\n      expect.anything(),\n    );\n    expect(config.verify.issuer).toBe(issuer);\n    // Clerk tokens carry no aud — the provider configures no audience check.\n    expect(config.verify.audience).toBeUndefined();\n  });\n\n  it(\"uses oauth-authorization-server when oidc omits the registration_endpoint\", async () => {\n    const issuer = \"https://acme.clerk.accounts.dev\";\n    vi.spyOn(globalThis, \"fetch\").mockImplementation(async (input) => {\n      const url = String(input);\n      if (url.endsWith(\"/.well-known/openid-configuration\")) {\n        return new Response(\n          JSON.stringify(doc(issuer, { registration_endpoint: undefined })),\n          { headers: { \"content-type\": \"application/json\" } },\n        );\n      }\n      return new Response(JSON.stringify(doc(issuer)), {\n        headers: { \"content-type\": \"application/json\" },\n      });\n    });\n\n    const config = await clerkProvider({\n      domain: \"acme.clerk.accounts.dev\",\n    });\n\n    expect(config.oauthMetadata.registration_endpoint).toBe(\n      `${issuer}/oauth/register`,\n    );\n  });\n});\n"]}
+{"version":3,"file":"clerk.test.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/clerk.test.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,cAAc,IAAI,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEzD,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAEzD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC;AAEtC,SAAS,GAAG,CAAC,MAAc;IACzB,OAAO;QACL,MAAM;QACN,sBAAsB,EAAE,GAAG,MAAM,kBAAkB;QACnD,cAAc,EAAE,GAAG,MAAM,cAAc;QACvC,qBAAqB,EAAE,GAAG,MAAM,iBAAiB;QACjD,wBAAwB,EAAE,CAAC,MAAM,CAAC;QAClC,gBAAgB,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;QACtC,QAAQ,EAAE,GAAG,MAAM,wBAAwB;KAC5C,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACnF,MAAM,MAAM,GAAG,iCAAiC,CAAC;QACjD,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,iBAAiB,CAC9D,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE;YACxC,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CACH,CAAC;QAEF,MAAM,aAAa,CAAC,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;QAErE,MAAM,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACnC,GAAG,MAAM,mCAAmC,EAC5C,MAAM,CAAC,QAAQ,EAAE,CAClB,CAAC;QACF,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// @vitest-environment node\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { clerkProvider } from \"./clerk.js\";\nimport { lastJwksConfig as jwks } from \"./verify-spy.js\";\n\nvi.mock(\"../verify.js\", () => import(\"./verify-spy.js\"));\n\nafterEach(() => vi.restoreAllMocks());\n\nfunction doc(issuer: string) {\n  return {\n    issuer,\n    authorization_endpoint: `${issuer}/oauth/authorize`,\n    token_endpoint: `${issuer}/oauth/token`,\n    registration_endpoint: `${issuer}/oauth/register`,\n    response_types_supported: [\"code\"],\n    scopes_supported: [\"profile\", \"email\"],\n    jwks_uri: `${issuer}/.well-known/jwks.json`,\n  };\n}\n\ndescribe(\"clerkProvider\", () => {\n  it(\"verifies issuer + JWKS with no audience (Clerk tokens carry no aud)\", async () => {\n    const issuer = \"https://acme.clerk.accounts.dev\";\n    const fetchSpy = vi.spyOn(globalThis, \"fetch\").mockResolvedValue(\n      new Response(JSON.stringify(doc(issuer)), {\n        headers: { \"content-type\": \"application/json\" },\n      }),\n    );\n\n    await clerkProvider({ domain: \"acme.clerk.accounts.dev\" }).resolve();\n\n    expect(fetchSpy).toHaveBeenCalledWith(\n      `${issuer}/.well-known/openid-configuration`,\n      expect.anything(),\n    );\n    expect(jwks().issuer).toBe(issuer);\n    expect(jwks().audience).toBeUndefined();\n  });\n});\n"]}

package/dist/server/auth/providers/custom.d.ts

@@ -1,5 +1,7 @@
-import type { OAuthMetadata } from "@modelcontextprotocol/sdk/shared/auth.js";
-import type { OAuthConfig } from "../index.js";
+import type { OAuthMetadata } from "@modelcontextprotocol/server";
+import type { ExtraClaims } from "../../auth.js";
+import type { OAuthProvider } from "../index.js";
+import { type RegisteredClaims } from "../verify.js";
 /** Options accepted by {@link customProvider} and the branded providers. */
 export type CustomProviderOptions = {
     issuer: string;
@@ -9,9 +11,30 @@ export type CustomProviderOptions = {
     audience?: string;
     /** Omit to let the server infer the resource origin from request headers. */
     baseUrl?: string;
+    /** Advertise THIS server as the authorization server (skybridge-as-AS): the
+     * served AS metadata `issuer` and the PRM `authorization_servers` use this URL
+     * instead of the IdP's. Needed when skybridge must sit in the auth path — Auth0
+     * (the `audience` must be baked into `/authorize`) or the Alpic DCR proxy (Alpic
+     * injects the registration endpoint). Use the static public URL; `verify.issuer`
+     * stays the IdP (the token's real `iss`). */
+    serverUrl?: string;
+    /** Advertise this URL as the authorization server (served AS metadata `issuer`
+     * and PRM `authorization_servers`). Its own discovery document supplies the
+     * advertised endpoints, DCR registration, scopes and the `iss` tokens are
+     * verified against; only `jwks_uri` still comes from `issuer`'s document. Use
+     * when DCR/authorize/token live at a different URL than the discovery issuer
+     * (e.g. Descope's agentic URL vs. its base-project URL). `serverUrl` wins if
+     * both are set. */
+    authorizationServer?: string;
     scopes?: string[];
     requiredScopes?: string[];
     metadataOverrides?: Omit<Partial<OAuthMetadata>, "issuer">;
 };
-/** Builds a complete {@link OAuthConfig} for a DCR-compatible IdP via discovery. */
-export declare function customProvider(opts: CustomProviderOptions): Promise<OAuthConfig>;
+/**
+ * Builds a complete {@link OAuthConfig} from an IdP's OAuth discovery document.
+ *
+ * @typeParam TExtra - Claims the IdP puts in the access token, reaching handlers
+ * as `extra.http?.authInfo.extra`. The branded providers pass their documented claims;
+ * pass your own when wiring an IdP by hand.
+ */
+export declare function customProvider<TExtra extends ExtraClaims = ExtraClaims>(opts: CustomProviderOptions): OAuthProvider<TExtra & RegisteredClaims>;

package/dist/server/auth/providers/custom.js

@@ -1,27 +1,58 @@
 import { discoverAuthorizationServer, } from "../discovery.js";
-/** Builds a complete {@link OAuthConfig} for a DCR-compatible IdP via discovery. */
-export async function customProvider(opts) {
+import { createJwksVerifier } from "../verify.js";
+/**
+ * Builds a complete {@link OAuthConfig} from an IdP's OAuth discovery document.
+ *
+ * @typeParam TExtra - Claims the IdP puts in the access token, reaching handlers
+ * as `extra.http?.authInfo.extra`. The branded providers pass their documented claims;
+ * pass your own when wiring an IdP by hand.
+ */
+export function customProvider(opts) {
+    return { resolve: () => resolveCustomProvider(opts) };
+}
+async function resolveCustomProvider(opts) {
     const discovered = await discoverAuthorizationServer(opts.issuer);
-    // The IdP's own discovery must advertise DCR and a JWKS; overrides can't fake it.
-    if (!discovered.registration_endpoint) {
-        throw new Error(`${opts.issuer} is not DCR-compatible (no registration_endpoint); customProvider only supports DCR IdPs.`);
-    }
+    // JWKS verification needs a signing-key URL; without it the server can't verify
+    // tokens. (`registration_endpoint` is optional per RFC 8414 — a no-DCR IdP simply
+    // omits it; a proxy like Alpic, or pre-registered clients, supply registration.)
     if (!discovered.jwks_uri) {
         throw new Error(`${opts.issuer} discovery has no jwks_uri; JWKS verification requires it.`);
     }
-    // Overrides adjust only advertised metadata (e.g. proxied endpoints). The
-    // trust anchor (issuer, jwks_uri) always comes from validated discovery.
-    const { issuer: _issuer, jwks_uri: _jwks, ...overrides } = (opts.metadataOverrides ?? {});
-    const oauthMetadata = { ...discovered, ...overrides };
+    // Overrides adjust only advertised metadata; the trust anchor (issuer, jwks_uri)
+    // always comes from validated discovery.
+    const { issuer: _issuer, jwks_uri: _jwks, ...overrides } = opts.metadataOverrides ?? {};
+    let advertised = discovered;
+    if (opts.authorizationServer) {
+        try {
+            advertised = await discoverAuthorizationServer(opts.authorizationServer);
+        }
+        catch (err) {
+            console.warn(`OAuth discovery failed for authorizationServer ${opts.authorizationServer}; advertising ${opts.issuer} metadata instead: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    const base = { ...advertised, ...overrides };
+    const scopesSupported = opts.scopes ?? base.scopes_supported;
+    // serverUrl (skybridge-as-AS) overrides the advertised issuer, keeping the
+    // IdP as the token issuer. authorizationServer re-asserts its own URL so a
+    // failed AS discovery still points clients at the AS. serverUrl wins.
+    const advertisedIssuer = opts.serverUrl?.replace(/\/$/, "") ??
+        opts.authorizationServer?.replace(/\/$/, "");
+    const oauthMetadata = advertisedIssuer
+        ? {
+            ...base,
+            issuer: advertisedIssuer,
+            scopes_supported: scopesSupported,
+        }
+        : base;
     return {
         baseUrl: opts.baseUrl,
         oauthMetadata,
-        verify: {
-            issuer: discovered.issuer,
+        verifier: createJwksVerifier({
+            issuer: advertised.issuer,
             audience: opts.audience,
-            jwksUri: discovered.jwks_uri,
-        },
-        scopesSupported: opts.scopes ?? oauthMetadata.scopes_supported,
+            jwksUri: advertised.jwks_uri ?? discovered.jwks_uri,
+        }),
+        scopesSupported,
         requiredScopes: opts.requiredScopes,
     };
 }

package/dist/server/auth/providers/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/custom.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AAiBzB,oFAAoF;AACpF,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,IAA2B;IAE3B,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAElE,kFAAkF;IAClF,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,CAAC,MAAM,2FAA2F,CAC1G,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,CAAC,MAAM,4DAA4D,CAC3E,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,yEAAyE;IACzE,MAAM,EACJ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,KAAK,EACf,GAAG,SAAS,EACb,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAgC,CAAC;IAClE,MAAM,aAAa,GAAuB,EAAE,GAAG,UAAU,EAAE,GAAG,SAAS,EAAE,CAAC;IAE1E,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa;QACb,MAAM,EAAE;YACN,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,UAAU,CAAC,QAAQ;SAC7B;QACD,eAAe,EAAE,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC,gBAAgB;QAC9D,cAAc,EAAE,IAAI,CAAC,cAAc;KACpC,CAAC;AACJ,CAAC","sourcesContent":["import type { OAuthMetadata } from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport {\n  type DiscoveredMetadata,\n  discoverAuthorizationServer,\n} from \"../discovery.js\";\nimport type { OAuthConfig } from \"../index.js\";\n\n/** Options accepted by {@link customProvider} and the branded providers. */\nexport type CustomProviderOptions = {\n  issuer: string;\n  /** Expected token `aud`. Omit to skip audience verification — only for IdPs\n   * that don't bind an audience (e.g. Clerk). Branded providers whose IdP does\n   * bind an audience re-require it in their own options. */\n  audience?: string;\n  /** Omit to let the server infer the resource origin from request headers. */\n  baseUrl?: string;\n  scopes?: string[];\n  requiredScopes?: string[];\n  metadataOverrides?: Omit<Partial<OAuthMetadata>, \"issuer\">;\n};\n\n/** Builds a complete {@link OAuthConfig} for a DCR-compatible IdP via discovery. */\nexport async function customProvider(\n  opts: CustomProviderOptions,\n): Promise<OAuthConfig> {\n  const discovered = await discoverAuthorizationServer(opts.issuer);\n\n  // The IdP's own discovery must advertise DCR and a JWKS; overrides can't fake it.\n  if (!discovered.registration_endpoint) {\n    throw new Error(\n      `${opts.issuer} is not DCR-compatible (no registration_endpoint); customProvider only supports DCR IdPs.`,\n    );\n  }\n  if (!discovered.jwks_uri) {\n    throw new Error(\n      `${opts.issuer} discovery has no jwks_uri; JWKS verification requires it.`,\n    );\n  }\n\n  // Overrides adjust only advertised metadata (e.g. proxied endpoints). The\n  // trust anchor (issuer, jwks_uri) always comes from validated discovery.\n  const {\n    issuer: _issuer,\n    jwks_uri: _jwks,\n    ...overrides\n  } = (opts.metadataOverrides ?? {}) as Partial<DiscoveredMetadata>;\n  const oauthMetadata: DiscoveredMetadata = { ...discovered, ...overrides };\n\n  return {\n    baseUrl: opts.baseUrl,\n    oauthMetadata,\n    verify: {\n      issuer: discovered.issuer,\n      audience: opts.audience,\n      jwksUri: discovered.jwks_uri,\n    },\n    scopesSupported: opts.scopes ?? oauthMetadata.scopes_supported,\n    requiredScopes: opts.requiredScopes,\n  };\n}\n"]}
+{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../src/server/auth/providers/custom.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,kBAAkB,EAAyB,MAAM,cAAc,CAAC;AA+BzE;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,IAA2B;IAE3B,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAS,IAAI,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,IAA2B;IAE3B,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAElE,gFAAgF;IAChF,kFAAkF;IAClF,iFAAiF;IACjF,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,CAAC,MAAM,4DAA4D,CAC3E,CAAC;IACJ,CAAC;IAED,iFAAiF;IACjF,yCAAyC;IACzC,MAAM,EACJ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,KAAK,EACf,GAAG,SAAS,EACb,GAAgC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;IAC9D,IAAI,UAAU,GAAG,UAAU,CAAC;IAC5B,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,UAAU,GAAG,MAAM,2BAA2B,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CACV,kDAAkD,IAAI,CAAC,mBAAmB,iBAAiB,IAAI,CAAC,MAAM,sBAAsB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC/K,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAuB,EAAE,GAAG,UAAU,EAAE,GAAG,SAAS,EAAE,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC;IAE7D,2EAA2E;IAC3E,2EAA2E;IAC3E,sEAAsE;IACtE,MAAM,gBAAgB,GACpB,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAuB,gBAAgB;QACxD,CAAC,CAAC;YACE,GAAG,IAAI;YACP,MAAM,EAAE,gBAAgB;YACxB,gBAAgB,EAAE,eAAe;SAClC;QACH,CAAC,CAAC,IAAI,CAAC;IAET,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa;QACb,QAAQ,EAAE,kBAAkB,CAAS;YACnC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ;SACpD,CAAC;QACF,eAAe;QACf,cAAc,EAAE,IAAI,CAAC,cAAc;KACpC,CAAC;AACJ,CAAC","sourcesContent":["import type { OAuthMetadata } from \"@modelcontextprotocol/server\";\nimport type { ExtraClaims } from \"../../auth.js\";\nimport {\n  type DiscoveredMetadata,\n  discoverAuthorizationServer,\n} from \"../discovery.js\";\nimport type { OAuthConfig, OAuthProvider } from \"../index.js\";\nimport { createJwksVerifier, type RegisteredClaims } from \"../verify.js\";\n\n/** Options accepted by {@link customProvider} and the branded providers. */\nexport type CustomProviderOptions = {\n  issuer: string;\n  /** Expected token `aud`. Omit to skip audience verification — only for IdPs\n   * that don't bind an audience (e.g. Clerk). Branded providers whose IdP does\n   * bind an audience re-require it in their own options. */\n  audience?: string;\n  /** Omit to let the server infer the resource origin from request headers. */\n  baseUrl?: string;\n  /** Advertise THIS server as the authorization server (skybridge-as-AS): the\n   * served AS metadata `issuer` and the PRM `authorization_servers` use this URL\n   * instead of the IdP's. Needed when skybridge must sit in the auth path — Auth0\n   * (the `audience` must be baked into `/authorize`) or the Alpic DCR proxy (Alpic\n   * injects the registration endpoint). Use the static public URL; `verify.issuer`\n   * stays the IdP (the token's real `iss`). */\n  serverUrl?: string;\n  /** Advertise this URL as the authorization server (served AS metadata `issuer`\n   * and PRM `authorization_servers`). Its own discovery document supplies the\n   * advertised endpoints, DCR registration, scopes and the `iss` tokens are\n   * verified against; only `jwks_uri` still comes from `issuer`'s document. Use\n   * when DCR/authorize/token live at a different URL than the discovery issuer\n   * (e.g. Descope's agentic URL vs. its base-project URL). `serverUrl` wins if\n   * both are set. */\n  authorizationServer?: string;\n  scopes?: string[];\n  requiredScopes?: string[];\n  metadataOverrides?: Omit<Partial<OAuthMetadata>, \"issuer\">;\n};\n\n/**\n * Builds a complete {@link OAuthConfig} from an IdP's OAuth discovery document.\n *\n * @typeParam TExtra - Claims the IdP puts in the access token, reaching handlers\n * as `extra.http?.authInfo.extra`. The branded providers pass their documented claims;\n * pass your own when wiring an IdP by hand.\n */\nexport function customProvider<TExtra extends ExtraClaims = ExtraClaims>(\n  opts: CustomProviderOptions,\n): OAuthProvider<TExtra & RegisteredClaims> {\n  return { resolve: () => resolveCustomProvider<TExtra>(opts) };\n}\n\nasync function resolveCustomProvider<TExtra extends ExtraClaims>(\n  opts: CustomProviderOptions,\n): Promise<OAuthConfig<TExtra & RegisteredClaims>> {\n  const discovered = await discoverAuthorizationServer(opts.issuer);\n\n  // JWKS verification needs a signing-key URL; without it the server can't verify\n  // tokens. (`registration_endpoint` is optional per RFC 8414 — a no-DCR IdP simply\n  // omits it; a proxy like Alpic, or pre-registered clients, supply registration.)\n  if (!discovered.jwks_uri) {\n    throw new Error(\n      `${opts.issuer} discovery has no jwks_uri; JWKS verification requires it.`,\n    );\n  }\n\n  // Overrides adjust only advertised metadata; the trust anchor (issuer, jwks_uri)\n  // always comes from validated discovery.\n  const {\n    issuer: _issuer,\n    jwks_uri: _jwks,\n    ...overrides\n  }: Partial<DiscoveredMetadata> = opts.metadataOverrides ?? {};\n  let advertised = discovered;\n  if (opts.authorizationServer) {\n    try {\n      advertised = await discoverAuthorizationServer(opts.authorizationServer);\n    } catch (err) {\n      console.warn(\n        `OAuth discovery failed for authorizationServer ${opts.authorizationServer}; advertising ${opts.issuer} metadata instead: ${err instanceof Error ? err.message : String(err)}`,\n      );\n    }\n  }\n  const base: DiscoveredMetadata = { ...advertised, ...overrides };\n  const scopesSupported = opts.scopes ?? base.scopes_supported;\n\n  // serverUrl (skybridge-as-AS) overrides the advertised issuer, keeping the\n  // IdP as the token issuer. authorizationServer re-asserts its own URL so a\n  // failed AS discovery still points clients at the AS. serverUrl wins.\n  const advertisedIssuer =\n    opts.serverUrl?.replace(/\\/$/, \"\") ??\n    opts.authorizationServer?.replace(/\\/$/, \"\");\n  const oauthMetadata: DiscoveredMetadata = advertisedIssuer\n    ? {\n        ...base,\n        issuer: advertisedIssuer,\n        scopes_supported: scopesSupported,\n      }\n    : base;\n\n  return {\n    baseUrl: opts.baseUrl,\n    oauthMetadata,\n    verifier: createJwksVerifier<TExtra>({\n      issuer: advertised.issuer,\n      audience: opts.audience,\n      jwksUri: advertised.jwks_uri ?? discovered.jwks_uri,\n    }),\n    scopesSupported,\n    requiredScopes: opts.requiredScopes,\n  };\n}\n"]}