@willyim/idp 0.4.0 → 0.6.0

package/README.md

@@ -82,7 +82,8 @@ return requestHandler(request, {
 })
 ```
 
-**`app/routes/auth.$.tsx`** — serves `/auth/login`, `/auth/callback`, `/auth/logout`:
+**`app/routes/auth.$.tsx`** — serves `/auth/login`, `/auth/callback`, `/auth/logout`
+and `/auth/me`:
 
 ```ts
 import { createAuthRoute } from "@willyim/idp/react-router"
@@ -110,6 +111,17 @@ export async function loader(args: Route.LoaderArgs) {
 }
 ```
 
+For code that can't reach a loader — a client-only route, a widget mounted
+outside the router, a fetch from a worker — the same route answers `/auth/me`:
+
+```ts
+const { user } = await fetch("/auth/me").then((r) => r.json())
+// 200 { user: PublicSession }  ·  401 { user: null }
+```
+
+A server-rendered page should keep using `requireSession`: `/auth/me` is the
+same data, one network hop later.
+
 ## Env
 
 | Var                                   | Purpose                  |
@@ -205,6 +217,18 @@ type Session = {
 
 `can()` matches exactly, and honours `resource:*` and `*` grants.
 
+`image` is effectively always set against the willy.im IdP: it renders a
+deterministic [blobatar](https://blobatar.dev) for anyone who never uploaded a
+picture, so `<img src={session.image} />` needs no fallback of its own. The type
+stays nullable for other issuers. Show `session.name || session.email` — a name
+is a person, an email is a login.
+
+### `publicSession(session)`
+
+`Session` as JSON, without the methods and without the session id — the shape
+that is safe to hand a browser. This is what `/auth/me` (below) returns, and
+what your own `/me` should.
+
 ### `createIdpClient(options)` — the OIDC relying party on its own
 
 ```ts

package/dist/src/client.d.ts

@@ -21,7 +21,7 @@ export declare const DEFAULT_SCOPES: readonly IdpScope[];
 export type IdpClientOptions = {
     /**
      * The OIDC issuer, including the basepath the IdP is mounted on:
-     * `https://idp.willy.im/auth` (or a vanity domain, `https://idp.kasso.do/auth`).
+     * `https://idp.willy.im/auth` (or a vanity domain, `https://idp.app1.com/auth`).
      * Discovery is `${issuer}/.well-known/openid-configuration`.
      */
     issuer: string;

package/dist/src/index.d.ts

@@ -13,12 +13,13 @@
  *   @willyim/idp/react-router  the auth route and the loader guards
  */
 export { createIdpClient, createPkce, DEFAULT_SCOPES, IdpError, SUPPORTED_SCOPES, type AuthorizationUrlInput, type Discovery, type IdpClient, type IdpClientOptions, type IdpScope, type Tokens, } from "./client.js";
-export { createIdp, DEFAULT_SESSION_COOKIE, safeNext, type Idp, type IdpOptions, type Session, type SessionOptions, } from "./session.js";
+export { createIdp, DEFAULT_SESSION_COOKIE, publicSession, safeNext, type Idp, type IdpOptions, type PublicSession, type Session, type SessionOptions, } from "./session.js";
 export { memorySessions, type MemorySessionStore, type SessionRecord, type SessionStore, } from "./store.js";
 export { grants, normalizeClaims, PERMISSIONS_CLAIM, WORKSPACES_CLAIM, type Actor, type Claims, type Workspace, } from "./claims.js";
 export { createManagementApi, type ManagementApi, type ManagementApiOptions, } from "./api.js";
 export { createUserKeys, readApiKey, type AuthenticatedKey, type AuthenticateOptions, type AuthenticateResult, type CreateUserApiKeyInput, type ListFilter, type MintedUserApiKey, type UserApiKey, type UserKeyCacheOptions, type UserKeys, type UserKeysOptions, type UserKeyValidation, } from "./user-keys.js";
 export { createIdentities, type Identities, type IdentitiesOptions, type IdentityCacheOptions, type ResolvedIdentity, type IdentityResolution, } from "./identities.js";
+export { createResourceServer, type ResourceServer, type ResourceServerOptions, type VerifiedAccessToken, type AuthResult, } from "./resource-server.js";
 export { parseDuration, type Duration } from "./duration.js";
 export { clearCookie, parseCookies, readCookie, serializeCookie, type CookieOptions, } from "./cookie.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,eAAe,EACf,UAAU,EACV,cAAc,EACd,QAAQ,EACR,gBAAgB,EAChB,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,KAAK,MAAM,GACZ,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,QAAQ,EACR,KAAK,GAAG,EACR,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,cAAc,GACpB,MAAM,cAAc,CAAA;AAErB,OAAO,EACL,cAAc,EACd,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,YAAY,CAAA;AAEnB,OAAO,EACL,MAAM,EACN,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,SAAS,GACf,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,GAC1B,MAAM,UAAU,CAAA;AAEjB,OAAO,EACL,cAAc,EACd,UAAU,EACV,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,iBAAiB,GACvB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EACL,gBAAgB,EAChB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,GACxB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,aAAa,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EACL,WAAW,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,KAAK,aAAa,GACnB,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,eAAe,EACf,UAAU,EACV,cAAc,EACd,QAAQ,EACR,gBAAgB,EAChB,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,KAAK,MAAM,GACZ,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,aAAa,EACb,QAAQ,EACR,KAAK,GAAG,EACR,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,cAAc,GACpB,MAAM,cAAc,CAAA;AAErB,OAAO,EACL,cAAc,EACd,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,YAAY,CAAA;AAEnB,OAAO,EACL,MAAM,EACN,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,SAAS,GACf,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,GAC1B,MAAM,UAAU,CAAA;AAEjB,OAAO,EACL,cAAc,EACd,UAAU,EACV,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,iBAAiB,GACvB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EACL,gBAAgB,EAChB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,GACxB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,UAAU,GAChB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,aAAa,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EACL,WAAW,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,KAAK,aAAa,GACnB,MAAM,aAAa,CAAA"}

package/dist/src/index.js

@@ -13,11 +13,12 @@
  *   @willyim/idp/react-router  the auth route and the loader guards
  */
 export { createIdpClient, createPkce, DEFAULT_SCOPES, IdpError, SUPPORTED_SCOPES, } from "./client.js";
-export { createIdp, DEFAULT_SESSION_COOKIE, safeNext, } from "./session.js";
+export { createIdp, DEFAULT_SESSION_COOKIE, publicSession, safeNext, } from "./session.js";
 export { memorySessions, } from "./store.js";
 export { grants, normalizeClaims, PERMISSIONS_CLAIM, WORKSPACES_CLAIM, } from "./claims.js";
 export { createManagementApi, } from "./api.js";
 export { createUserKeys, readApiKey, } from "./user-keys.js";
 export { createIdentities, } from "./identities.js";
+export { createResourceServer, } from "./resource-server.js";
 export { parseDuration } from "./duration.js";
 export { clearCookie, parseCookies, readCookie, serializeCookie, } from "./cookie.js";

package/dist/src/react-router/index.d.ts

@@ -9,6 +9,9 @@
  *   const session = await requireSession(args)
  *   const session = await requirePermission(args, "admin")
  *
+ *   // from the browser, when there's no loader to read
+ *   await fetch("/auth/me").then((r) => r.json())  // { user: PublicSession | null }
+ *
  * No react-router import: the adapter only ever produces `Response`s and
  * functions, both of which react-router already understands. That keeps the
  * subpath dependency-free too, and makes it usable from any framework whose

package/dist/src/react-router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-router/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGjD,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAC5C,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;AAEjE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,6DAA6D;IAC7D,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAA;CAC3C,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,GAAE,gBAAqB;mBA+ChE,SAAS;mBACT,SAAS;EAE3B;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,6CAA6C;IAC7C,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oCAAoC;IACpC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,kFAAkF;AAClF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,SAAS,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAEzB;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAMlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-router/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGjD,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAC5C,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;AAEjE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,6DAA6D;IAC7D,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAA;CAC3C,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,GAAE,gBAAqB;mBAmEhE,SAAS;mBACT,SAAS;EAE3B;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,6CAA6C;IAC7C,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oCAAoC;IACpC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,kFAAkF;AAClF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,SAAS,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAEzB;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAMlB"}

package/dist/src/react-router/index.js

@@ -9,12 +9,15 @@
  *   const session = await requireSession(args)
  *   const session = await requirePermission(args, "admin")
  *
+ *   // from the browser, when there's no loader to read
+ *   await fetch("/auth/me").then((r) => r.json())  // { user: PublicSession | null }
+ *
  * No react-router import: the adapter only ever produces `Response`s and
  * functions, both of which react-router already understands. That keeps the
  * subpath dependency-free too, and makes it usable from any framework whose
  * handlers take a `Request`.
  */
-import { safeNext } from "../session.js";
+import { publicSession, safeNext } from "../session.js";
 /**
  * Serves `/auth/login`, `/auth/callback` and `/auth/logout` from a single splat
  * route. `loader` covers the GET navigations; `action` covers a POSTed logout
@@ -57,6 +60,26 @@ export function createAuthRoute(getIdp, options = {}) {
             // outlives the app's.
             return redirect(endSession ?? redirectTo, headers);
         }
+        // The session as JSON, for the code that can't reach a loader: a client-only
+        // route, a widget mounted outside the router, a fetch from a worker. A
+        // server-rendered page should keep reading `requireSession` — this is the
+        // same data one network hop later.
+        if (action === "me") {
+            const session = await idp.getSession(args.request);
+            const headers = new Headers({
+                "content-type": "application/json",
+                // Per-user and revocable — never let a shared cache hold it.
+                "cache-control": "no-store, private",
+            });
+            if (!session) {
+                return new Response(JSON.stringify({ user: null }), { status: 401, headers });
+            }
+            // Polling this keeps a sliding session alive, same as any other request.
+            const renewed = session.renewCookie();
+            if (renewed)
+                headers.append("set-cookie", renewed);
+            return new Response(JSON.stringify({ user: publicSession(session) }), { status: 200, headers });
+        }
         return new Response("not found", { status: 404 });
     }
     return {

package/dist/src/resource-server.d.ts

@@ -0,0 +1,90 @@
+/**
+ * Being an OAuth 2.1 resource server against the willy.im IdP — which is what
+ * an MCP server is.
+ *
+ * The MCP authorization spec is plain OAuth with three discovery hops, and
+ * every one of them is either served by the IdP already or is a static
+ * document this module writes for you:
+ *
+ *   1. The client hits the resource without a token and gets a 401 carrying
+ *      `WWW-Authenticate: Bearer resource_metadata="…"`   → `challenge()`
+ *   2. It fetches that URL, the Protected Resource Metadata (RFC 9728), which
+ *      names the authorization server                       → `metadata()`
+ *   3. It fetches the AS metadata (RFC 8414) from the IdP, registers itself
+ *      (RFC 7591), runs authorization code + PKCE with `resource=` (RFC 8707),
+ *      and comes back with a JWT access token whose `aud` is this resource.
+ *   4. The resource server verifies that JWT against the IdP's JWKS and reads
+ *      the permissions claim                                → `authenticate()`
+ *
+ * Step 4 is the only one with any real code, and it is deliberately small:
+ * signature (EdDSA/Ed25519, ES256 or RS256 via WebCrypto — no jose, no deps),
+ * issuer, audience, time. The permissions on the token were computed by the
+ * IdP for the app that owns this resource (the same way a browser session's
+ * are), so the app looks nothing up — it reads a claim and matches it with
+ * `grants()` like everywhere else.
+ *
+ * The JWKS is cached and refetched once on an unknown `kid`, which is how a key
+ * rotation at the IdP is picked up without a restart.
+ */
+export declare const PERMISSIONS_CLAIM = "https://willy.im/permissions";
+export declare const APP_CLAIM = "https://willy.im/app";
+export type ResourceServerOptions = {
+    /** The IdP's OAuth issuer — `https://idp.willy.im/auth` (note the /auth). */
+    issuer: string;
+    /**
+     * This server's canonical URI, exactly as registered on the application in
+     * the IdP (`resources`) — e.g. `https://bender.romo.fyi/mcp`. It is the
+     * audience a token must carry, compared byte for byte.
+     */
+    resource: string;
+    /** Defaults to `${issuer}/jwks`. */
+    jwksUrl?: string;
+    /** Advertised in the metadata document. Informational only. */
+    scopesSupported?: string[];
+    /** How long a fetched JWKS is reused. Default 10 minutes. */
+    jwksTtlMs?: number;
+    /** Clock skew tolerated on exp/nbf. Default 60s. */
+    leewaySeconds?: number;
+    fetch?: typeof fetch;
+    /** Clock seam, for tests. */
+    now?: () => number;
+};
+/** A verified access token, reduced to what an app acts on. */
+export type VerifiedAccessToken = {
+    /** The IdP user id — the same `sub` a session or a wak_ key resolves to. */
+    sub: string;
+    /** The app the permissions are for (the owner of `resource`), when present. */
+    app: string | null;
+    /** The user's product permissions for that app. Match with `has()`/`grants()`. */
+    permissions: string[];
+    /** Space-delimited OAuth scopes on the token (openid/profile/…), if any. */
+    scopes: string[];
+    /** Everything else on the token, for a caller that needs a raw claim. */
+    claims: Record<string, unknown>;
+};
+export type AuthResult = {
+    ok: true;
+    token: VerifiedAccessToken;
+} | {
+    ok: false;
+    status: 401 | 403;
+    error: string;
+    description: string;
+};
+export declare function createResourceServer(options: ResourceServerOptions): {
+    verify: (token: string) => Promise<AuthResult>;
+    authenticate: (request: {
+        headers: {
+            get(name: string): string | null;
+        };
+    }, init?: {
+        permissions?: string[];
+    }) => Promise<AuthResult>;
+    challenge: (error?: {
+        error: string;
+        description: string;
+    }) => string;
+    metadata: () => Record<string, unknown>;
+};
+export type ResourceServer = ReturnType<typeof createResourceServer>;
+//# sourceMappingURL=resource-server.d.ts.map

package/dist/src/resource-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-server.d.ts","sourceRoot":"","sources":["../../src/resource-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAIH,eAAO,MAAM,iBAAiB,iCAAiC,CAAA;AAC/D,eAAO,MAAM,SAAS,yBAAyB,CAAA;AAE/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAA;IACd;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,+DAA+D;IAC/D,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;IACpB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;CACnB,CAAA;AAED,+DAA+D;AAC/D,MAAM,MAAM,mBAAmB,GAAG;IAChC,4EAA4E;IAC5E,GAAG,EAAE,MAAM,CAAA;IACX,+EAA+E;IAC/E,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,kFAAkF;IAClF,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,4EAA4E;IAC5E,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,GACxC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAgDxE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB;oBAiDpC,MAAM,KAAG,OAAO,CAAC,UAAU,CAAC;4BA8D9C;QAAE,OAAO,EAAE;YAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;SAAE,CAAA;KAAE,SACpD;QAAE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,KAC/B,OAAO,CAAC,UAAU,CAAC;wBAwBK;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAG,MAAM;oBAarD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EAU7C;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA"}

package/dist/src/resource-server.js

@@ -0,0 +1,206 @@
+/**
+ * Being an OAuth 2.1 resource server against the willy.im IdP — which is what
+ * an MCP server is.
+ *
+ * The MCP authorization spec is plain OAuth with three discovery hops, and
+ * every one of them is either served by the IdP already or is a static
+ * document this module writes for you:
+ *
+ *   1. The client hits the resource without a token and gets a 401 carrying
+ *      `WWW-Authenticate: Bearer resource_metadata="…"`   → `challenge()`
+ *   2. It fetches that URL, the Protected Resource Metadata (RFC 9728), which
+ *      names the authorization server                       → `metadata()`
+ *   3. It fetches the AS metadata (RFC 8414) from the IdP, registers itself
+ *      (RFC 7591), runs authorization code + PKCE with `resource=` (RFC 8707),
+ *      and comes back with a JWT access token whose `aud` is this resource.
+ *   4. The resource server verifies that JWT against the IdP's JWKS and reads
+ *      the permissions claim                                → `authenticate()`
+ *
+ * Step 4 is the only one with any real code, and it is deliberately small:
+ * signature (EdDSA/Ed25519, ES256 or RS256 via WebCrypto — no jose, no deps),
+ * issuer, audience, time. The permissions on the token were computed by the
+ * IdP for the app that owns this resource (the same way a browser session's
+ * are), so the app looks nothing up — it reads a claim and matches it with
+ * `grants()` like everywhere else.
+ *
+ * The JWKS is cached and refetched once on an unknown `kid`, which is how a key
+ * rotation at the IdP is picked up without a restart.
+ */
+import { grants } from "./claims.js";
+export const PERMISSIONS_CLAIM = "https://willy.im/permissions";
+export const APP_CLAIM = "https://willy.im/app";
+const DEFAULT_JWKS_TTL_MS = 600_000;
+const DEFAULT_LEEWAY_S = 60;
+function b64urlToBytes(s) {
+    const pad = s.length % 4 === 0 ? "" : "=".repeat(4 - (s.length % 4));
+    const b = atob(s.replace(/-/g, "+").replace(/_/g, "/") + pad);
+    const out = new Uint8Array(b.length);
+    for (let i = 0; i < b.length; i++)
+        out[i] = b.charCodeAt(i);
+    return out;
+}
+function decodeJson(segment) {
+    return JSON.parse(new TextDecoder().decode(b64urlToBytes(segment)));
+}
+/** The WebCrypto import + verify params for the algorithms the IdP may sign with. */
+function algParams(alg, jwk) {
+    switch (alg) {
+        case "EdDSA":
+            return { importAlg: { name: "Ed25519" }, verifyAlg: { name: "Ed25519" } };
+        case "ES256":
+            return { importAlg: { name: "ECDSA", namedCurve: "P-256" }, verifyAlg: { name: "ECDSA", hash: "SHA-256" } };
+        case "RS256":
+            return {
+                importAlg: { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
+                verifyAlg: { name: "RSASSA-PKCS1-v1_5" },
+            };
+        default:
+            return jwk.kty ? null : null;
+    }
+}
+export function createResourceServer(options) {
+    const doFetch = options.fetch ?? fetch;
+    const now = options.now ?? (() => Date.now());
+    const jwksUrl = options.jwksUrl ?? `${options.issuer.replace(/\/$/, "")}/jwks`;
+    const jwksTtlMs = options.jwksTtlMs ?? DEFAULT_JWKS_TTL_MS;
+    const leeway = (options.leewaySeconds ?? DEFAULT_LEEWAY_S) * 1000;
+    let jwks = null;
+    async function loadJwks(force) {
+        if (!force && jwks && now() - jwks.at < jwksTtlMs)
+            return jwks.keys;
+        const res = await doFetch(jwksUrl);
+        if (!res.ok)
+            throw new Error(`jwks fetch failed: ${res.status}`);
+        const body = (await res.json());
+        jwks = { at: now(), keys: body.keys ?? [] };
+        return jwks.keys;
+    }
+    /** Find the signing key by kid, refetching ONCE on a miss to catch rotation. */
+    async function keyFor(kid) {
+        const pick = (keys) => keys.find((k) => (kid ? k.kid === kid : true)) ?? null;
+        let key = pick(await loadJwks(false));
+        if (!key)
+            key = pick(await loadJwks(true));
+        return key;
+    }
+    async function verifySignature(header, signingInput, signature) {
+        const jwk = await keyFor(header.kid);
+        if (!jwk)
+            return false;
+        const params = algParams(header.alg, jwk);
+        if (!params)
+            return false;
+        const key = await crypto.subtle.importKey("jwk", jwk, params.importAlg, false, ["verify"]);
+        return crypto.subtle.verify(params.verifyAlg, key, signature, new TextEncoder().encode(signingInput));
+    }
+    /**
+     * Verifies a raw bearer token. Returns a discriminated result rather than
+     * throwing, so the caller owns the response shape. `insufficient_scope` is a
+     * 403; everything about the token being absent or bad is a 401.
+     */
+    async function verify(token) {
+        const parts = token.split(".");
+        if (parts.length !== 3) {
+            return { ok: false, status: 401, error: "invalid_token", description: "Not a JWT." };
+        }
+        let header;
+        let claims;
+        try {
+            header = decodeJson(parts[0]);
+            claims = decodeJson(parts[1]);
+        }
+        catch {
+            return { ok: false, status: 401, error: "invalid_token", description: "Malformed JWT." };
+        }
+        let valid = false;
+        try {
+            valid = await verifySignature(header, `${parts[0]}.${parts[1]}`, b64urlToBytes(parts[2]));
+        }
+        catch {
+            valid = false;
+        }
+        if (!valid) {
+            return { ok: false, status: 401, error: "invalid_token", description: "Bad signature." };
+        }
+        if (claims.iss !== options.issuer) {
+            return { ok: false, status: 401, error: "invalid_token", description: "Wrong issuer." };
+        }
+        const aud = claims.aud;
+        const audOk = Array.isArray(aud) ? aud.includes(options.resource) : aud === options.resource;
+        if (!audOk) {
+            return { ok: false, status: 401, error: "invalid_token", description: "Token is for a different resource." };
+        }
+        const t = now();
+        if (typeof claims.exp === "number" && t > claims.exp * 1000 + leeway) {
+            return { ok: false, status: 401, error: "invalid_token", description: "Token expired." };
+        }
+        if (typeof claims.nbf === "number" && t < claims.nbf * 1000 - leeway) {
+            return { ok: false, status: 401, error: "invalid_token", description: "Token not yet valid." };
+        }
+        const permissions = Array.isArray(claims[PERMISSIONS_CLAIM])
+            ? claims[PERMISSIONS_CLAIM].filter((p) => typeof p === "string")
+            : [];
+        const scopes = typeof claims.scope === "string" ? claims.scope.split(" ").filter(Boolean) : [];
+        return {
+            ok: true,
+            token: {
+                sub: String(claims.sub ?? ""),
+                app: typeof claims[APP_CLAIM] === "string" ? claims[APP_CLAIM] : null,
+                permissions,
+                scopes,
+                claims,
+            },
+        };
+    }
+    /**
+     * The whole check off a `Request`: pull the bearer, verify it, and confirm
+     * every required permission (wildcard-aware via `grants()`). Returns a
+     * result rather than throwing.
+     */
+    async function authenticate(request, init = {}) {
+        const authz = request.headers.get("authorization");
+        const bearer = authz && /^Bearer\s+(.+)$/i.exec(authz.trim())?.[1];
+        if (!bearer) {
+            return { ok: false, status: 401, error: "invalid_token", description: "No bearer token." };
+        }
+        const verified = await verify(bearer.trim());
+        if (!verified.ok)
+            return verified;
+        const missing = (init.permissions ?? []).filter((p) => !grants(verified.token.permissions, p));
+        if (missing.length) {
+            return {
+                ok: false,
+                status: 403,
+                error: "insufficient_scope",
+                description: `Missing permission(s): ${missing.join(", ")}.`,
+            };
+        }
+        return verified;
+    }
+    /**
+     * The `WWW-Authenticate` value for a 401, pointing a client at the metadata
+     * document so it can discover how to get a token (RFC 9728 §5.1).
+     */
+    function challenge(error) {
+        const parts = [
+            `Bearer resource_metadata="${options.resource}/.well-known/oauth-protected-resource"`,
+        ];
+        if (error)
+            parts.push(`error="${error.error}"`, `error_description="${error.description}"`);
+        return parts.join(", ");
+    }
+    /**
+     * The Protected Resource Metadata document (RFC 9728) — served at
+     * `/.well-known/oauth-protected-resource`. It names this resource and the
+     * IdP as its authorization server; the client takes it from there.
+     */
+    function metadata() {
+        return {
+            resource: options.resource,
+            authorization_servers: [options.issuer],
+            bearer_methods_supported: ["header"],
+            ...(options.scopesSupported ? { scopes_supported: options.scopesSupported } : {}),
+        };
+    }
+    return { verify, authenticate, challenge, metadata };
+}

package/dist/src/schemas/index.d.ts

@@ -16,6 +16,7 @@ export declare const ApplicationSchema: z.ZodObject<{
     app: z.ZodNullable<z.ZodString>;
     allowSignup: z.ZodBoolean;
     permissions: z.ZodArray<z.ZodString>;
+    resources: z.ZodArray<z.ZodString>;
     redirectUris: z.ZodArray<z.ZodString>;
     disabled: z.ZodBoolean;
     createdAt: z.ZodString;
@@ -24,6 +25,7 @@ export declare const UserSchema: z.ZodObject<{
     id: z.ZodString;
     email: z.ZodString;
     name: z.ZodNullable<z.ZodString>;
+    image: z.ZodString;
     emailVerified: z.ZodBoolean;
     createdAt: z.ZodString;
 }, z.core.$strip>;
@@ -41,6 +43,7 @@ export declare const ApplicationListSchema: z.ZodObject<{
         app: z.ZodNullable<z.ZodString>;
         allowSignup: z.ZodBoolean;
         permissions: z.ZodArray<z.ZodString>;
+        resources: z.ZodArray<z.ZodString>;
         redirectUris: z.ZodArray<z.ZodString>;
         disabled: z.ZodBoolean;
         createdAt: z.ZodString;
@@ -66,6 +69,7 @@ export declare const UpdateApplicationInput: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     redirectUris: z.ZodOptional<z.ZodArray<z.ZodString>>;
     allowSignup: z.ZodOptional<z.ZodBoolean>;
+    resources: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 export declare const ClientSecretSchema: z.ZodObject<{
     clientSecret: z.ZodString;
@@ -82,6 +86,7 @@ export declare const UserListSchema: z.ZodObject<{
         id: z.ZodString;
         email: z.ZodString;
         name: z.ZodNullable<z.ZodString>;
+        image: z.ZodString;
         emailVerified: z.ZodBoolean;
         createdAt: z.ZodString;
     }, z.core.$strip>>;

package/dist/src/schemas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schemas/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,iBAAiB;;;;;;;;;iBAS5B,CAAA;AAEF,eAAO,MAAM,UAAU;;;;;;iBAMrB,CAAA;AAEF,eAAO,MAAM,eAAe;;;;;;iBAM1B,CAAA;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;iBAAyD,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;iBAejC,CAAA;AACF,eAAO,MAAM,wBAAwB;;;;iBAInC,CAAA;AAEF,uEAAuE;AACvE,eAAO,MAAM,sBAAsB;;;;iBAIjC,CAAA;AAEF,eAAO,MAAM,kBAAkB;;iBAE7B,CAAA;AAEF,+DAA+D;AAC/D,eAAO,MAAM,sBAAsB;;iBAEjC,CAAA;AACF,eAAO,MAAM,oBAAoB;;iBAAiD,CAAA;AAClF,eAAO,MAAM,cAAc;;;;;;;;iBAA2C,CAAA;AACtE,eAAO,MAAM,mBAAmB;;;;;;;;iBAAqD,CAAA;AAIrF,eAAO,MAAM,UAAU;;;EAA8B,CAAA;AAErD,eAAO,MAAM,YAAY;;;;;;;;;iBAMvB,CAAA;AACF,eAAO,MAAM,gBAAgB;;;;;;;;;;;iBAA+C,CAAA;AAE5E,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB;;;;;;;iBAI5B,CAAA;AACF,eAAO,MAAM,kBAAkB;;;;;iBAG7B,CAAA;AAEF,eAAO,MAAM,iBAAiB;;;;;;iBAG5B,CAAA;AAEF,eAAO,MAAM,oBAAoB;;;iBAM/B,CAAA;AACF,eAAO,MAAM,sBAAsB;;;;iBAIjC,CAAA;AAEF,eAAO,MAAM,QAAQ;;iBAAoC,CAAA;AAIzD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;iBAW3B,CAAA;AACF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;iBAAgD,CAAA;AAEjF,eAAO,MAAM,qBAAqB;;;;;;iBAMhC,CAAA;AACF,eAAO,MAAM,uBAAuB;;;;iBAIlC,CAAA;AAEF,eAAO,MAAM,uBAAuB;;iBAAyC,CAAA;AAC7E,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;mBAUrC,CAAA;AAIF,eAAO,MAAM,oBAAoB;;;;;;;iBAO/B,CAAA;AACF,eAAO,MAAM,wBAAwB;;;;;;;;;iBAA0D,CAAA;AAE/F,eAAO,MAAM,iBAAiB;;;;iBAI5B,CAAA;AACF,eAAO,MAAM,2BAA2B;;;iBAGtC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;mBAWnC,CAAA;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;iBAQ3B,CAAA;AACF,eAAO,MAAM,eAAe;;;;;;;;;;iBAAmD,CAAA;AAI/E,eAAO,MAAM,YAAY;;;;;;;;;;;;;;iBAUvB,CAAA;AACF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;iBAA4C,CAAA;AAEzE,eAAO,MAAM,iBAAiB;;;;iBAM5B,CAAA;AACF,eAAO,MAAM,mBAAmB;;;;iBAI9B,CAAA;AAIF,eAAO,MAAM,cAAc;;;;;;;;;;;;;iBASzB,CAAA;AACF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;iBAA8C,CAAA;AAE7E,eAAO,MAAM,mBAAmB;;;iBAG9B,CAAA;AACF,eAAO,MAAM,qBAAqB;;;;iBAIhC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schemas/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,iBAAiB;;;;;;;;;;iBAY5B,CAAA;AAEF,eAAO,MAAM,UAAU;;;;;;;iBASrB,CAAA;AAEF,eAAO,MAAM,eAAe;;;;;;iBAM1B,CAAA;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;iBAAyD,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;iBAejC,CAAA;AACF,eAAO,MAAM,wBAAwB;;;;iBAInC,CAAA;AAEF,uEAAuE;AACvE,eAAO,MAAM,sBAAsB;;;;;iBAQjC,CAAA;AAEF,eAAO,MAAM,kBAAkB;;iBAE7B,CAAA;AAEF,+DAA+D;AAC/D,eAAO,MAAM,sBAAsB;;iBAEjC,CAAA;AACF,eAAO,MAAM,oBAAoB;;iBAAiD,CAAA;AAClF,eAAO,MAAM,cAAc;;;;;;;;;iBAA2C,CAAA;AACtE,eAAO,MAAM,mBAAmB;;;;;;;;iBAAqD,CAAA;AAIrF,eAAO,MAAM,UAAU;;;EAA8B,CAAA;AAErD,eAAO,MAAM,YAAY;;;;;;;;;iBAMvB,CAAA;AACF,eAAO,MAAM,gBAAgB;;;;;;;;;;;iBAA+C,CAAA;AAE5E,+DAA+D;AAC/D,eAAO,MAAM,iBAAiB;;;;;;;iBAI5B,CAAA;AACF,eAAO,MAAM,kBAAkB;;;;;iBAG7B,CAAA;AAEF,eAAO,MAAM,iBAAiB;;;;;;iBAG5B,CAAA;AAEF,eAAO,MAAM,oBAAoB;;;iBAM/B,CAAA;AACF,eAAO,MAAM,sBAAsB;;;;iBAIjC,CAAA;AAEF,eAAO,MAAM,QAAQ;;iBAAoC,CAAA;AAIzD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;iBAW3B,CAAA;AACF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;iBAAgD,CAAA;AAEjF,eAAO,MAAM,qBAAqB;;;;;;iBAMhC,CAAA;AACF,eAAO,MAAM,uBAAuB;;;;iBAIlC,CAAA;AAEF,eAAO,MAAM,uBAAuB;;iBAAyC,CAAA;AAC7E,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;mBAUrC,CAAA;AAIF,eAAO,MAAM,oBAAoB;;;;;;;iBAO/B,CAAA;AACF,eAAO,MAAM,wBAAwB;;;;;;;;;iBAA0D,CAAA;AAE/F,eAAO,MAAM,iBAAiB;;;;iBAI5B,CAAA;AACF,eAAO,MAAM,2BAA2B;;;iBAGtC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;mBAWnC,CAAA;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;iBAQ3B,CAAA;AACF,eAAO,MAAM,eAAe;;;;;;;;;;iBAAmD,CAAA;AAI/E,eAAO,MAAM,YAAY;;;;;;;;;;;;;;iBAUvB,CAAA;AACF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;iBAA4C,CAAA;AAEzE,eAAO,MAAM,iBAAiB;;;;iBAM5B,CAAA;AACF,eAAO,MAAM,mBAAmB;;;;iBAI9B,CAAA;AAIF,eAAO,MAAM,cAAc;;;;;;;;;;;;;iBASzB,CAAA;AACF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;iBAA8C,CAAA;AAE7E,eAAO,MAAM,mBAAmB;;;iBAG9B,CAAA;AACF,eAAO,MAAM,qBAAqB;;;;iBAIhC,CAAA"}

package/dist/src/schemas/index.js

@@ -16,6 +16,9 @@ export const ApplicationSchema = z.object({
     app: z.string().nullable().describe("Application key; consumer workspace claims are filtered by this"),
     allowSignup: z.boolean().describe("Whether unknown users may sign themselves up"),
     permissions: z.array(z.string()).describe("The app's declared product-permission catalog"),
+    resources: z
+        .array(z.string())
+        .describe("Protected resource URIs (e.g. the app's MCP server) — valid `resource` audiences for access tokens"),
     redirectUris: z.array(z.string()),
     disabled: z.boolean(),
     createdAt: z.string().describe("ISO 8601 timestamp"),
@@ -24,6 +27,9 @@ export const UserSchema = z.object({
     id: z.string(),
     email: z.string(),
     name: z.string().nullable(),
+    image: z
+        .string()
+        .describe("Avatar URL — the user's own picture, or the blobatar the IdP renders for them"),
     emailVerified: z.boolean(),
     createdAt: z.string(),
 });
@@ -63,6 +69,10 @@ export const UpdateApplicationInput = z.object({
     name: z.string().min(1).optional(),
     redirectUris: z.array(z.string().min(1)).min(1).optional(),
     allowSignup: z.boolean().optional(),
+    resources: z
+        .array(z.string().url())
+        .optional()
+        .describe("Replace the app's protected resource URIs — absolute https, no fragment"),
 });
 export const ClientSecretSchema = z.object({
     clientSecret: z.string().describe("Plaintext client secret — shown exactly once, never stored"),

package/dist/src/schemas/operations.d.ts

@@ -43,6 +43,7 @@ export declare const operations: {
                 app: z.ZodNullable<z.ZodString>;
                 allowSignup: z.ZodBoolean;
                 permissions: z.ZodArray<z.ZodString>;
+                resources: z.ZodArray<z.ZodString>;
                 redirectUris: z.ZodArray<z.ZodString>;
                 disabled: z.ZodBoolean;
                 createdAt: z.ZodString;
@@ -79,6 +80,7 @@ export declare const operations: {
             app: z.ZodNullable<z.ZodString>;
             allowSignup: z.ZodBoolean;
             permissions: z.ZodArray<z.ZodString>;
+            resources: z.ZodArray<z.ZodString>;
             redirectUris: z.ZodArray<z.ZodString>;
             disabled: z.ZodBoolean;
             createdAt: z.ZodString;
@@ -95,6 +97,7 @@ export declare const operations: {
             name: z.ZodOptional<z.ZodString>;
             redirectUris: z.ZodOptional<z.ZodArray<z.ZodString>>;
             allowSignup: z.ZodOptional<z.ZodBoolean>;
+            resources: z.ZodOptional<z.ZodArray<z.ZodString>>;
         }, z.core.$strip>;
         readonly successCode: "200";
         readonly success: z.ZodObject<{
@@ -103,6 +106,7 @@ export declare const operations: {
             app: z.ZodNullable<z.ZodString>;
             allowSignup: z.ZodBoolean;
             permissions: z.ZodArray<z.ZodString>;
+            resources: z.ZodArray<z.ZodString>;
             redirectUris: z.ZodArray<z.ZodString>;
             disabled: z.ZodBoolean;
             createdAt: z.ZodString;
@@ -258,6 +262,7 @@ export declare const operations: {
                 id: z.ZodString;
                 email: z.ZodString;
                 name: z.ZodNullable<z.ZodString>;
+                image: z.ZodString;
                 emailVerified: z.ZodBoolean;
                 createdAt: z.ZodString;
             }, z.core.$strip>>;

package/dist/src/schemas/operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../../src/schemas/operations.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAsCvB,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAA;AAEpE,iFAAiF;AACjF,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEnF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,UAAU,EAAE,CAAA;IAC7B,wEAAwE;IACxE,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAA;IACjB,WAAW,EAAE,KAAK,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,CAAC,CAAC,OAAO,CAAA;CACnB,CAAA;AAKD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+O0B,CAAA;AAEjD,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAA;AAC1C,MAAM,MAAM,YAAY,GAAG,MAAM,UAAU,CAAA;AAE3C,mEAAmE;AACnE,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,IAAI,YAAY,SAAS,MAAM,CAAC,GACrE,CAAC,SAAS,GAAG,CAAC,IAAI,MAAM,CAAC,EAAE,GACzB,CAAC,GACD,KAAK,GACP,KAAK,CAAA;AAET,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,YAAY,GAC/F,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GACvB,KAAK,CAAA;AAET,iFAAiF;AACjF,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,IAAI,IAAI,MAAM,IAAI,EAAE,GAC5F,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,GAC3B,KAAK,CAAA;AAET,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAE7E"}
+{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../../src/schemas/operations.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAsCvB,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAA;AAEpE,iFAAiF;AACjF,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEnF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,UAAU,EAAE,CAAA;IAC7B,wEAAwE;IACxE,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAA;IACjB,WAAW,EAAE,KAAK,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,CAAC,CAAC,OAAO,CAAA;CACnB,CAAA;AAKD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+O0B,CAAA;AAEjD,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAA;AAC1C,MAAM,MAAM,YAAY,GAAG,MAAM,UAAU,CAAA;AAE3C,mEAAmE;AACnE,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,IAAI,YAAY,SAAS,MAAM,CAAC,GACrE,CAAC,SAAS,GAAG,CAAC,IAAI,MAAM,CAAC,EAAE,GACzB,CAAC,GACD,KAAK,GACP,KAAK,CAAA;AAET,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,YAAY,GAC/F,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GACvB,KAAK,CAAA;AAET,iFAAiF;AACjF,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,IAAI,IAAI,MAAM,IAAI,EAAE,GAC5F,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,GAC3B,KAAK,CAAA;AAET,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAE7E"}

package/dist/src/session.d.ts

@@ -64,6 +64,26 @@ export type Session = {
      */
     renewCookie(): string | null;
 };
+/**
+ * A `Session` as JSON — the shape that is safe to hand a browser.
+ *
+ * Two deliberate omissions. The methods are gone because they don't serialize.
+ * The session *id* is gone because it is the thing the signed cookie resolves
+ * to: it never needs to be in reach of script, and a projection that leaves it
+ * out can't leak it by accident later.
+ */
+export type PublicSession = {
+    sub: string;
+    email: string;
+    name: string | null;
+    image: string | null;
+    permissions: string[];
+    workspaces: Workspace[];
+    actor: Actor | null;
+    expiresAt: string;
+};
+/** `Session` -> `PublicSession`. What `/auth/me` returns, and what an app's own `/me` should. */
+export declare function publicSession(session: Session): PublicSession;
 export type Idp = ReturnType<typeof createIdp>;
 export declare function createIdp(options: IdpOptions): {
     /** The Layer 0 client, for anything the session layer doesn't wrap. */

package/dist/src/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"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"}

package/dist/src/session.js

@@ -17,6 +17,19 @@ import { parseDuration } from "./duration.js";
 export const DEFAULT_SESSION_COOKIE = "idp_session";
 /** How long the login handshake may take before its state cookie is stale. */
 const STATE_COOKIE_MAX_AGE_MS = 10 * 60_000;
+/** `Session` -> `PublicSession`. What `/auth/me` returns, and what an app's own `/me` should. */
+export function publicSession(session) {
+    return {
+        sub: session.sub,
+        email: session.email,
+        name: session.name,
+        image: session.image,
+        permissions: session.permissions,
+        workspaces: session.workspaces,
+        actor: session.actor,
+        expiresAt: session.expiresAt.toISOString(),
+    };
+}
 /**
  * What rides in the login state cookie. HMAC-signed, so tampering is caught
  * before this ever parses — the schema is here to catch a cookie left over

package/openapi/idp-api.json

@@ -78,6 +78,13 @@
                             },
                             "description": "The app's declared product-permission catalog"
                           },
+                          "resources": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            },
+                            "description": "Protected resource URIs (e.g. the app's MCP server) — valid `resource` audiences for access tokens"
+                          },
                           "redirectUris": {
                             "type": "array",
                             "items": {
@@ -98,6 +105,7 @@
                           "app",
                           "allowSignup",
                           "permissions",
+                          "resources",
                           "redirectUris",
                           "disabled",
                           "createdAt"
@@ -283,6 +291,13 @@
                       },
                       "description": "The app's declared product-permission catalog"
                     },
+                    "resources": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "description": "Protected resource URIs (e.g. the app's MCP server) — valid `resource` audiences for access tokens"
+                    },
                     "redirectUris": {
                       "type": "array",
                       "items": {
@@ -303,6 +318,7 @@
                     "app",
                     "allowSignup",
                     "permissions",
+                    "resources",
                     "redirectUris",
                     "disabled",
                     "createdAt"
@@ -364,6 +380,14 @@
                   },
                   "allowSignup": {
                     "type": "boolean"
+                  },
+                  "resources": {
+                    "description": "Replace the app's protected resource URIs — absolute https, no fragment",
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "format": "uri"
+                    }
                   }
                 }
               }
@@ -414,6 +438,13 @@
                       },
                       "description": "The app's declared product-permission catalog"
                     },
+                    "resources": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "description": "Protected resource URIs (e.g. the app's MCP server) — valid `resource` audiences for access tokens"
+                    },
                     "redirectUris": {
                       "type": "array",
                       "items": {
@@ -434,6 +465,7 @@
                     "app",
                     "allowSignup",
                     "permissions",
+                    "resources",
                     "redirectUris",
                     "disabled",
                     "createdAt"
@@ -1242,6 +1274,10 @@
                               }
                             ]
                           },
+                          "image": {
+                            "type": "string",
+                            "description": "Avatar URL — the user's own picture, or the blobatar the IdP renders for them"
+                          },
                           "emailVerified": {
                             "type": "boolean"
                           },
@@ -1253,6 +1289,7 @@
                           "id",
                           "email",
                           "name",
+                          "image",
                           "emailVerified",
                           "createdAt"
                         ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willyim/idp",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Login for apps that don't own identity \u2014 OIDC client, server sessions, and react-router guards against the willy.im IdP",
   "type": "module",
   "main": "./dist/src/index.js",