@atproto/oauth-provider 0.15.16 → 0.16.1

package/dist/result/authorization-result-authorize-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorization-result-authorize-page.d.ts","sourceRoot":"","sources":["../../src/result/authorization-result-authorize-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAE3D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,mCAAmC,CAAA;IAC/C,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;IAEjD,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;CAC7B,CAAA"}
+{"version":3,"file":"authorization-result-authorize-page.d.ts","sourceRoot":"","sources":["../../src/result/authorization-result-authorize-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAE3D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,mCAAmC,CAAA;IAC/C,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;IAEjD,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;CAC7B,CAAA"}

package/dist/result/authorization-result-authorize-page.js.map

@@ -1 +1 @@
-{"version":3,"file":"authorization-result-authorize-page.js","sourceRoot":"","sources":["../../src/result/authorization-result-authorize-page.ts"],"names":[],"mappings":"","sourcesContent":["import type { LexiconPermissionSet } from '@atproto/lex-document'\nimport type { Session } from '@atproto/oauth-provider-api'\nimport type { OAuthAuthorizationRequestParameters } from '@atproto/oauth-types'\nimport type { Client } from '../client/client.js'\nimport type { RequestUri } from '../request/request-uri.js'\n\nexport type AuthorizationResultAuthorizePage = {\n  issuer: string\n  client: Client\n  parameters: OAuthAuthorizationRequestParameters\n  permissionSets: Map<string, LexiconPermissionSet>\n\n  requestUri: RequestUri\n  sessions: readonly Session[]\n}\n"]}
+{"version":3,"file":"authorization-result-authorize-page.js","sourceRoot":"","sources":["../../src/result/authorization-result-authorize-page.ts"],"names":[],"mappings":"","sourcesContent":["import type { LexiconPermissionSet } from '@atproto/lex-document'\nimport type { Account, Session } from '@atproto/oauth-provider-api'\nimport type { OAuthAuthorizationRequestParameters } from '@atproto/oauth-types'\nimport type { Client } from '../client/client.js'\nimport type { RequestUri } from '../request/request-uri.js'\n\nexport type AuthorizationResultAuthorizePage = {\n  issuer: string\n  client: Client\n  parameters: OAuthAuthorizationRequestParameters\n  permissionSets: Map<string, LexiconPermissionSet>\n\n  requestUri: RequestUri\n  sessions: readonly Session[]\n  selectedSub?: Account['sub']\n}\n"]}

package/dist/router/assets/assets.d.ts

@@ -1,11 +1,10 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { HydrationData as FeHydrationData } from '@atproto/oauth-provider-frontend/hydration-data';
 import type { HydrationData as UiHydrationData } from '@atproto/oauth-provider-ui/hydration-data';
 import { Customization } from '../../customization/customization.js';
 import { WriteResponseOptions } from '../../lib/http/response.js';
 import { SecurityHeadersOptions } from '../../lib/http/security-headers.js';
 import { Simplify } from '../../lib/util/type.js';
-type HydrationData = Simplify<UiHydrationData & FeHydrationData>;
+type HydrationData = Simplify<UiHydrationData>;
 export declare const assetsMiddleware: import("../../lib/http/types.js").Middleware;
 export type SendWebAppOptions = SecurityHeadersOptions & WriteResponseOptions;
 export declare function sendWebAppFactory<P extends keyof HydrationData>(page: P, customization: Customization, defaults?: SendWebAppOptions): (req: IncomingMessage, res: ServerResponse, options: SendWebAppOptions & {

package/dist/router/assets/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../src/router/assets/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,iDAAiD,CAAA;AACvG,OAAO,KAAK,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAGjG,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAKpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAEL,sBAAsB,EACvB,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAmBjD,KAAK,aAAa,GAAG,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC,CAAA;AAUhE,eAAO,MAAM,gBAAgB,8CAG3B,CAAA;AAqBF,MAAM,MAAM,iBAAiB,GAAG,sBAAsB,GAAG,oBAAoB,CAAA;AAE7E,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,aAAa,EAC7D,IAAI,EAAE,CAAC,EACP,aAAa,EAAE,aAAa,EAC5B,QAAQ,GAAE,iBAAsB,IAa9B,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,SAAS,iBAAiB,GAAG;IAC3B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAA;CACpD,KACA,OAAO,CAAC,IAAI,CAAC,CAwBjB"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../src/router/assets/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,IAAI,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAGjG,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAIpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAEL,sBAAsB,EACvB,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAgBjD,KAAK,aAAa,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAA;AAU9C,eAAO,MAAM,gBAAgB,8CAAsB,CAAA;AAqBnD,MAAM,MAAM,iBAAiB,GAAG,sBAAsB,GAAG,oBAAoB,CAAA;AAE7E,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,aAAa,EAC7D,IAAI,EAAE,CAAC,EACP,aAAa,EAAE,aAAa,EAC5B,QAAQ,GAAE,iBAAsB,IA6B9B,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,SAAS,iBAAiB,GAAG;IAC3B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAA;CACpD,KACA,OAAO,CAAC,IAAI,CAAC,CAqBjB"}

package/dist/router/assets/assets.js

@@ -7,7 +7,6 @@ const build_customization_data_js_1 = require("../../customization/build-customi
 const index_js_1 = require("../../lib/csp/index.js");
 const hydration_data_js_1 = require("../../lib/html/hydration-data.js");
 const index_js_2 = require("../../lib/html/index.js");
-const middleware_js_1 = require("../../lib/http/middleware.js");
 const security_headers_js_1 = require("../../lib/http/security-headers.js");
 const object_js_1 = require("../../lib/util/object.js");
 const write_html_js_1 = require("../../lib/write-html.js");
@@ -20,18 +19,14 @@ const csrf_js_1 = require("./csrf.js");
 //   require.resolve('@atproto/oauth-provider-ui/bundle-manifest.json'),
 // )
 const ui = (0, assets_manifest_js_1.parseAssetsManifest)(require.resolve('@atproto/oauth-provider-ui/bundle-manifest.json'));
-const fe = (0, assets_manifest_js_1.parseAssetsManifest)(require.resolve('@atproto/oauth-provider-frontend/bundle-manifest.json'));
 function getAssets(entryName) {
-    const assetRef = ui.getAssets(entryName) || fe.getAssets(entryName);
+    const assetRef = ui.getAssets(entryName);
     if (assetRef)
         return assetRef;
     // Fool-proof. Should never happen.
     throw new Error(`Entry "${entryName}" not found in assets`);
 }
-exports.assetsMiddleware = (0, middleware_js_1.combineMiddlewares)([
-    ui.assetsMiddleware,
-    fe.assetsMiddleware,
-]);
+exports.assetsMiddleware = ui.assetsMiddleware;
 const SPA_CSP = {
     // API calls are made to the same origin
     'connect-src': ["'self'"],
@@ -54,7 +49,22 @@ function sendWebAppFactory(page, customization, defaults = {}) {
     const customizationData = (0, build_customization_data_js_1.buildCustomizationData)(customization);
     const customizationCss = (0, index_js_2.cssCode)((0, build_customization_css_js_1.buildCustomizationCss)(customization));
     const { scripts, styles } = getAssets(page);
-    const csp = (0, index_js_1.mergeCsp)(SPA_CSP, customization?.hcaptcha ? HCAPTCHA_CSP : undefined);
+    const csp = (0, index_js_1.mergeCsp)(SPA_CSP, customization.hcaptcha ? HCAPTCHA_CSP : undefined);
+    const coep = customization.hcaptcha
+        ? // hCaptcha's implementation of COEP is currently broken. Let's disable it
+            // to avoid breaking the entire page.
+            //
+            // https://github.com/hCaptcha/react-hcaptcha/issues/259
+            // https://github.com/hCaptcha/react-hcaptcha/issues/380
+            security_headers_js_1.CrossOriginEmbedderPolicy.unsafeNone
+        : // Since we are loading avatars form other origins, which might not have
+            // CORP headers, we need to use the "credentialless" value, which allows
+            // loading cross-origin resources without credentials (cookies, client
+            // certificates, etc.). This is a more secure alternative to
+            // "unsafe-none". Ideally, we would want to set COEP to "require-corp" and
+            // ensure that all cross-origin resources have the appropriate CORP
+            // headers.
+            security_headers_js_1.CrossOriginEmbedderPolicy.credentialless;
     return async function sendWebApp(req, res, options) {
         await (0, csrf_js_1.setupCsrfToken)(req, res);
         const script = (0, hydration_data_js_1.declareHydrationData)({
@@ -62,11 +72,9 @@ function sendWebAppFactory(page, customization, defaults = {}) {
             __customizationData: customizationData,
         });
         return (0, write_html_js_1.writeHtml)(res, (0, object_js_1.mergeDefaults)(defaults, options, {
-            bodyAttrs: {
-                class: 'bg-white text-slate-900 dark:bg-slate-900 dark:text-slate-100',
-            },
+            bodyAttrs: { class: 'text-text-default bg-contrast-0' },
             csp: options?.csp ? (0, index_js_1.mergeCsp)(csp, options.csp) : csp,
-            coep: options?.coep ?? security_headers_js_1.CrossOriginEmbedderPolicy.credentialless,
+            coep: options?.coep ?? coep,
             meta: [{ name: 'robots', content: 'noindex' }],
             body: (0, index_js_2.html) `<div id="root"></div>`,
             scripts: [script, ...scripts],

package/dist/router/assets/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/router/assets/assets.ts"],"names":[],"mappings":";;;AAuEA,8CA6CC;AAjHD,+FAAsF;AACtF,iGAAwF;AAExF,qDAA4D;AAC5D,wEAAuE;AACvE,sDAAuD;AACvD,gEAAiE;AAEjE,4EAG2C;AAC3C,wDAAwD;AAExD,2DAAqE;AACrE,6DAA0D;AAC1D,uCAA0C;AAE1C,6EAA6E;AAC7E,4BAA4B;AAC5B,EAAE;AACF,+DAA+D;AAC/D,wEAAwE;AACxE,IAAI;AAEJ,MAAM,EAAE,GAAG,IAAA,wCAAmB,EAC5B,OAAO,CAAC,OAAO,CAAC,iDAAiD,CAAC,CACnE,CAAA;AACD,MAAM,EAAE,GAAG,IAAA,wCAAmB,EAC5B,OAAO,CAAC,OAAO,CAAC,uDAAuD,CAAC,CACzE,CAAA;AAID,SAAS,SAAS,CAAC,SAA8B;IAC/C,MAAM,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACnE,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAE7B,mCAAmC;IACnC,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,uBAAuB,CAAC,CAAA;AAC7D,CAAC;AAEY,QAAA,gBAAgB,GAAG,IAAA,kCAAkB,EAAC;IACjD,EAAE,CAAC,gBAAgB;IACnB,EAAE,CAAC,gBAAgB;CACpB,CAAC,CAAA;AAEF,MAAM,OAAO,GAAc;IACzB,wCAAwC;IACxC,aAAa,EAAE,CAAC,QAAQ,CAAC;IACzB,2CAA2C;IAC3C,SAAS,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC9B,+BAA+B;IAC/B,iBAAiB,EAAE,CAAC,QAAQ,CAAC;CAC9B,CAAA;AAED;;GAEG;AACH,MAAM,YAAY,GAAc;IAC9B,YAAY,EAAE,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAChE,WAAW,EAAE,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAC/D,WAAW,EAAE,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAC/D,aAAa,EAAE,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;CAClE,CAAA;AAID,SAAgB,iBAAiB,CAC/B,IAAO,EACP,aAA4B,EAC5B,WAA8B,EAAE;IAEhC,wBAAwB;IACxB,MAAM,iBAAiB,GAAG,IAAA,oDAAsB,EAAC,aAAa,CAAC,CAAA;IAC/D,MAAM,gBAAgB,GAAG,IAAA,kBAAO,EAAC,IAAA,kDAAqB,EAAC,aAAa,CAAC,CAAC,CAAA;IACtE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;IAE3C,MAAM,GAAG,GAAG,IAAA,mBAAQ,EAClB,OAAO,EACP,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CACnD,CAAA;IAED,OAAO,KAAK,UAAU,UAAU,CAC9B,GAAoB,EACpB,GAAmB,EACnB,OAEC;QAED,MAAM,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAE9B,MAAM,MAAM,GAAG,IAAA,wCAAoB,EAAC;YAClC,GAAG,OAAO,CAAC,IAAI;YACf,mBAAmB,EAAE,iBAAiB;SACvC,CAAC,CAAA;QAEF,OAAO,IAAA,yBAAS,EACd,GAAG,EACH,IAAA,yBAAa,EAAmB,QAAQ,EAAE,OAAO,EAAE;YACjD,SAAS,EAAE;gBACT,KAAK,EACH,+DAA+D;aAClE;YACD,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;YACpD,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,+CAAyB,CAAC,cAAc;YAC/D,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;YAC9C,IAAI,EAAE,IAAA,eAAI,EAAA,uBAAuB;YACjC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC;YAC7B,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,gBAAgB,CAAC;SACtC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;AACH,CAAC","sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport type { HydrationData as FeHydrationData } from '@atproto/oauth-provider-frontend/hydration-data'\nimport type { HydrationData as UiHydrationData } from '@atproto/oauth-provider-ui/hydration-data'\nimport { buildCustomizationCss } from '../../customization/build-customization-css.js'\nimport { buildCustomizationData } from '../../customization/build-customization-data.js'\nimport { Customization } from '../../customization/customization.js'\nimport { CspConfig, mergeCsp } from '../../lib/csp/index.js'\nimport { declareHydrationData } from '../../lib/html/hydration-data.js'\nimport { cssCode, html } from '../../lib/html/index.js'\nimport { combineMiddlewares } from '../../lib/http/middleware.js'\nimport { WriteResponseOptions } from '../../lib/http/response.js'\nimport {\n  CrossOriginEmbedderPolicy,\n  SecurityHeadersOptions,\n} from '../../lib/http/security-headers.js'\nimport { mergeDefaults } from '../../lib/util/object.js'\nimport { Simplify } from '../../lib/util/type.js'\nimport { WriteHtmlOptions, writeHtml } from '../../lib/write-html.js'\nimport { parseAssetsManifest } from './assets-manifest.js'\nimport { setupCsrfToken } from './csrf.js'\n\n// If the \"ui\" and \"frontend\" packages are ever unified, this can be replaced\n// with a single expression:\n//\n// const { getAssets, assetsMiddleware } = parseAssetsManifest(\n//   require.resolve('@atproto/oauth-provider-ui/bundle-manifest.json'),\n// )\n\nconst ui = parseAssetsManifest(\n  require.resolve('@atproto/oauth-provider-ui/bundle-manifest.json'),\n)\nconst fe = parseAssetsManifest(\n  require.resolve('@atproto/oauth-provider-frontend/bundle-manifest.json'),\n)\n\ntype HydrationData = Simplify<UiHydrationData & FeHydrationData>\n\nfunction getAssets(entryName: keyof HydrationData) {\n  const assetRef = ui.getAssets(entryName) || fe.getAssets(entryName)\n  if (assetRef) return assetRef\n\n  // Fool-proof. Should never happen.\n  throw new Error(`Entry \"${entryName}\" not found in assets`)\n}\n\nexport const assetsMiddleware = combineMiddlewares([\n  ui.assetsMiddleware,\n  fe.assetsMiddleware,\n])\n\nconst SPA_CSP: CspConfig = {\n  // API calls are made to the same origin\n  'connect-src': [\"'self'\"],\n  // Allow loading of PDS logo & User avatars\n  'img-src': ['data:', 'https:'],\n  // Prevent embedding in iframes\n  'frame-ancestors': [\"'none'\"],\n}\n\n/**\n * @see {@link https://docs.hcaptcha.com/#content-security-policy-settings}\n */\nconst HCAPTCHA_CSP: CspConfig = {\n  'script-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n  'frame-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n  'style-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n  'connect-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n}\n\nexport type SendWebAppOptions = SecurityHeadersOptions & WriteResponseOptions\n\nexport function sendWebAppFactory<P extends keyof HydrationData>(\n  page: P,\n  customization: Customization,\n  defaults: SendWebAppOptions = {},\n) {\n  // Pre-computed options:\n  const customizationData = buildCustomizationData(customization)\n  const customizationCss = cssCode(buildCustomizationCss(customization))\n  const { scripts, styles } = getAssets(page)\n\n  const csp = mergeCsp(\n    SPA_CSP,\n    customization?.hcaptcha ? HCAPTCHA_CSP : undefined,\n  )\n\n  return async function sendWebApp(\n    req: IncomingMessage,\n    res: ServerResponse,\n    options: SendWebAppOptions & {\n      data: Omit<HydrationData[P], '__customizationData'>\n    },\n  ): Promise<void> {\n    await setupCsrfToken(req, res)\n\n    const script = declareHydrationData({\n      ...options.data,\n      __customizationData: customizationData,\n    })\n\n    return writeHtml(\n      res,\n      mergeDefaults<WriteHtmlOptions>(defaults, options, {\n        bodyAttrs: {\n          class:\n            'bg-white text-slate-900 dark:bg-slate-900 dark:text-slate-100',\n        },\n        csp: options?.csp ? mergeCsp(csp, options.csp) : csp,\n        coep: options?.coep ?? CrossOriginEmbedderPolicy.credentialless,\n        meta: [{ name: 'robots', content: 'noindex' }],\n        body: html`<div id=\"root\"></div>`,\n        scripts: [script, ...scripts],\n        styles: [...styles, customizationCss],\n      }),\n    )\n  }\n}\n"]}
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/router/assets/assets.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport type { HydrationData as UiHydrationData } from '@atproto/oauth-provider-ui/hydration-data'\nimport { buildCustomizationCss } from '../../customization/build-customization-css.js'\nimport { buildCustomizationData } from '../../customization/build-customization-data.js'\nimport { Customization } from '../../customization/customization.js'\nimport { CspConfig, mergeCsp } from '../../lib/csp/index.js'\nimport { declareHydrationData } from '../../lib/html/hydration-data.js'\nimport { cssCode, html } from '../../lib/html/index.js'\nimport { WriteResponseOptions } from '../../lib/http/response.js'\nimport {\n  CrossOriginEmbedderPolicy,\n  SecurityHeadersOptions,\n} from '../../lib/http/security-headers.js'\nimport { mergeDefaults } from '../../lib/util/object.js'\nimport { Simplify } from '../../lib/util/type.js'\nimport { WriteHtmlOptions, writeHtml } from '../../lib/write-html.js'\nimport { parseAssetsManifest } from './assets-manifest.js'\nimport { setupCsrfToken } from './csrf.js'\n\n// If the \"ui\" and \"frontend\" packages are ever unified, this can be replaced\n// with a single expression:\n//\n// const { getAssets, assetsMiddleware } = parseAssetsManifest(\n//   require.resolve('@atproto/oauth-provider-ui/bundle-manifest.json'),\n// )\n\nconst ui = parseAssetsManifest(\n  require.resolve('@atproto/oauth-provider-ui/bundle-manifest.json'),\n)\n\ntype HydrationData = Simplify<UiHydrationData>\n\nfunction getAssets(entryName: keyof HydrationData) {\n  const assetRef = ui.getAssets(entryName)\n  if (assetRef) return assetRef\n\n  // Fool-proof. Should never happen.\n  throw new Error(`Entry \"${entryName}\" not found in assets`)\n}\n\nexport const assetsMiddleware = ui.assetsMiddleware\n\nconst SPA_CSP: CspConfig = {\n  // API calls are made to the same origin\n  'connect-src': [\"'self'\"],\n  // Allow loading of PDS logo & User avatars\n  'img-src': ['data:', 'https:'],\n  // Prevent embedding in iframes\n  'frame-ancestors': [\"'none'\"],\n}\n\n/**\n * @see {@link https://docs.hcaptcha.com/#content-security-policy-settings}\n */\nconst HCAPTCHA_CSP: CspConfig = {\n  'script-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n  'frame-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n  'style-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n  'connect-src': ['https://hcaptcha.com', 'https://*.hcaptcha.com'],\n}\n\nexport type SendWebAppOptions = SecurityHeadersOptions & WriteResponseOptions\n\nexport function sendWebAppFactory<P extends keyof HydrationData>(\n  page: P,\n  customization: Customization,\n  defaults: SendWebAppOptions = {},\n) {\n  // Pre-computed options:\n  const customizationData = buildCustomizationData(customization)\n  const customizationCss = cssCode(buildCustomizationCss(customization))\n  const { scripts, styles } = getAssets(page)\n\n  const csp = mergeCsp(\n    SPA_CSP,\n    customization.hcaptcha ? HCAPTCHA_CSP : undefined,\n  )\n\n  const coep = customization.hcaptcha\n    ? // hCaptcha's implementation of COEP is currently broken. Let's disable it\n      // to avoid breaking the entire page.\n      //\n      // https://github.com/hCaptcha/react-hcaptcha/issues/259\n      // https://github.com/hCaptcha/react-hcaptcha/issues/380\n      CrossOriginEmbedderPolicy.unsafeNone\n    : // Since we are loading avatars form other origins, which might not have\n      // CORP headers, we need to use the \"credentialless\" value, which allows\n      // loading cross-origin resources without credentials (cookies, client\n      // certificates, etc.). This is a more secure alternative to\n      // \"unsafe-none\". Ideally, we would want to set COEP to \"require-corp\" and\n      // ensure that all cross-origin resources have the appropriate CORP\n      // headers.\n      CrossOriginEmbedderPolicy.credentialless\n\n  return async function sendWebApp(\n    req: IncomingMessage,\n    res: ServerResponse,\n    options: SendWebAppOptions & {\n      data: Omit<HydrationData[P], '__customizationData'>\n    },\n  ): Promise<void> {\n    await setupCsrfToken(req, res)\n\n    const script = declareHydrationData({\n      ...options.data,\n      __customizationData: customizationData,\n    })\n\n    return writeHtml(\n      res,\n      mergeDefaults<WriteHtmlOptions>(defaults, options, {\n        bodyAttrs: { class: 'text-text-default bg-contrast-0' },\n        csp: options?.csp ? mergeCsp(csp, options.csp) : csp,\n        coep: options?.coep ?? coep,\n        meta: [{ name: 'robots', content: 'noindex' }],\n        body: html`<div id=\"root\"></div>`,\n        scripts: [script, ...scripts],\n        styles: [...styles, customizationCss],\n      }),\n    )\n  }\n}\n"]}

package/dist/router/assets/send-authorization-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send-authorization-page.d.ts","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,qDAAqD,CAAA;AACtG,OAAO,EAAE,iBAAiB,EAAqB,MAAM,aAAa,CAAA;AAElE,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,iBAAiB,IASzB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,MAAM,gCAAgC,KACrC,OAAO,CAAC,IAAI,CAAC,CAqBjB"}
+{"version":3,"file":"send-authorization-page.d.ts","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,qDAAqD,CAAA;AACtG,OAAO,EAAE,iBAAiB,EAAqB,MAAM,aAAa,CAAA;AAElE,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,iBAAiB,IASzB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,MAAM,gCAAgC,KACrC,OAAO,CAAC,IAAI,CAAC,CAsBjB"}

package/dist/router/assets/send-authorization-page.js

@@ -18,6 +18,7 @@ function sendAuthorizePageFactory(customization, options) {
                     loginHint: data.parameters.login_hint,
                     promptMode: data.parameters.prompt,
                     permissionSets: Object.fromEntries(data.permissionSets),
+                    selectedSub: data.selectedSub,
                 },
                 __sessions: data.sessions,
             },

package/dist/router/assets/send-authorization-page.js.map

@@ -1 +1 @@
-{"version":3,"file":"send-authorization-page.js","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":";;AAKA,4DAmCC;AArCD,2CAAkE;AAElE,SAAgB,wBAAwB,CACtC,aAA4B,EAC5B,OAA2B;IAE3B,MAAM,OAAO,GAAG,IAAA,6BAAiB,EAC/B,oBAAoB,EACpB,aAAa,EACb,OAAO,CACR,CAAA;IAED,OAAO,KAAK,UAAU,iBAAiB,CACrC,GAAoB,EACpB,GAAmB,EACnB,IAAsC;QAEtC,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE;YACvB,IAAI,EAAE;gBACJ,eAAe,EAAE;oBACf,UAAU,EAAE,IAAI,CAAC,UAAU;oBAE3B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;oBACxB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;oBACpC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS;oBACzC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY;oBAE/C,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;oBAC5B,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;oBACrC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;oBACrC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;oBAClC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC;iBACxD;gBACD,UAAU,EAAE,IAAI,CAAC,QAAQ;aAC1B;SACF,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC","sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport { Customization } from '../../customization/customization.js'\nimport { AuthorizationResultAuthorizePage } from '../../result/authorization-result-authorize-page.js'\nimport { SendWebAppOptions, sendWebAppFactory } from './assets.js'\n\nexport function sendAuthorizePageFactory(\n  customization: Customization,\n  options?: SendWebAppOptions,\n) {\n  const sendApp = sendWebAppFactory(\n    'authorization-page',\n    customization,\n    options,\n  )\n\n  return async function sendAuthorizePage(\n    req: IncomingMessage,\n    res: ServerResponse,\n    data: AuthorizationResultAuthorizePage,\n  ): Promise<void> {\n    return sendApp(req, res, {\n      data: {\n        __authorizeData: {\n          requestUri: data.requestUri,\n\n          clientId: data.client.id,\n          clientMetadata: data.client.metadata,\n          clientTrusted: data.client.info.isTrusted,\n          clientFirstParty: data.client.info.isFirstParty,\n\n          scope: data.parameters.scope,\n          uiLocales: data.parameters.ui_locales,\n          loginHint: data.parameters.login_hint,\n          promptMode: data.parameters.prompt,\n          permissionSets: Object.fromEntries(data.permissionSets),\n        },\n        __sessions: data.sessions,\n      },\n    })\n  }\n}\n"]}
+{"version":3,"file":"send-authorization-page.js","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":";;AAKA,4DAoCC;AAtCD,2CAAkE;AAElE,SAAgB,wBAAwB,CACtC,aAA4B,EAC5B,OAA2B;IAE3B,MAAM,OAAO,GAAG,IAAA,6BAAiB,EAC/B,oBAAoB,EACpB,aAAa,EACb,OAAO,CACR,CAAA;IAED,OAAO,KAAK,UAAU,iBAAiB,CACrC,GAAoB,EACpB,GAAmB,EACnB,IAAsC;QAEtC,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE;YACvB,IAAI,EAAE;gBACJ,eAAe,EAAE;oBACf,UAAU,EAAE,IAAI,CAAC,UAAU;oBAE3B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;oBACxB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;oBACpC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS;oBACzC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY;oBAE/C,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;oBAC5B,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;oBACrC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;oBACrC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;oBAClC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC;oBACvD,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B;gBACD,UAAU,EAAE,IAAI,CAAC,QAAQ;aAC1B;SACF,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC","sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport { Customization } from '../../customization/customization.js'\nimport { AuthorizationResultAuthorizePage } from '../../result/authorization-result-authorize-page.js'\nimport { SendWebAppOptions, sendWebAppFactory } from './assets.js'\n\nexport function sendAuthorizePageFactory(\n  customization: Customization,\n  options?: SendWebAppOptions,\n) {\n  const sendApp = sendWebAppFactory(\n    'authorization-page',\n    customization,\n    options,\n  )\n\n  return async function sendAuthorizePage(\n    req: IncomingMessage,\n    res: ServerResponse,\n    data: AuthorizationResultAuthorizePage,\n  ): Promise<void> {\n    return sendApp(req, res, {\n      data: {\n        __authorizeData: {\n          requestUri: data.requestUri,\n\n          clientId: data.client.id,\n          clientMetadata: data.client.metadata,\n          clientTrusted: data.client.info.isTrusted,\n          clientFirstParty: data.client.info.isFirstParty,\n\n          scope: data.parameters.scope,\n          uiLocales: data.parameters.ui_locales,\n          loginHint: data.parameters.login_hint,\n          promptMode: data.parameters.prompt,\n          permissionSets: Object.fromEntries(data.permissionSets),\n          selectedSub: data.selectedSub,\n        },\n        __sessions: data.sessions,\n      },\n    })\n  }\n}\n"]}

package/dist/router/create-api-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-api-middleware.d.ts","sourceRoot":"","sources":["../../src/router/create-api-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AA8BhE,OAAO,EAEL,UAAU,EAaX,MAAM,sBAAsB,CAAA;AAK7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAUzD,OAAO,EAEL,oBAAoB,EAMrB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAIhE,wBAAgB,mBAAmB,CACjC,GAAG,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,EAChC,GAAG,SAAS,eAAe,GAAG,eAAe,EAC7C,GAAG,SAAS,cAAc,GAAG,cAAc,EAE3C,MAAM,EAAE,aAAa,EACrB,EAAE,OAAO,EAAE,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GACvC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CA0rB3B;AA2BD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,oBAAoB,CA4C/D"}
+{"version":3,"file":"create-api-middleware.d.ts","sourceRoot":"","sources":["../../src/router/create-api-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AA8BhE,OAAO,EAEL,UAAU,EAaX,MAAM,sBAAsB,CAAA;AAK7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAUzD,OAAO,EAEL,oBAAoB,EAMrB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAIhE,wBAAgB,mBAAmB,CACjC,GAAG,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,EAChC,GAAG,SAAS,eAAe,GAAG,eAAe,EAC7C,GAAG,SAAS,cAAc,GAAG,cAAc,EAE3C,MAAM,EAAE,aAAa,EACrB,EAAE,OAAO,EAAE,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GACvC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAqsB3B;AA2BD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,oBAAoB,CA4C/D"}

package/dist/router/create-api-middleware.js

@@ -79,7 +79,12 @@ function createApiMiddleware(server, { onError }) {
             const { deviceId, deviceMetadata, requestUri } = this;
             // Remember when not in the context of a request by default
             const { remember = requestUri == null, ...input } = this.input;
-            const account = await server.accountManager.authenticateAccount(deviceId, deviceMetadata, input);
+            // Look up the client identifier associated with the pending OAuth
+            // request, if any, so it can be surfaced to the sign-in hooks.
+            const clientId = requestUri
+                ? await server.requestManager.peekClientId(requestUri)
+                : undefined;
+            const account = await server.accountManager.authenticateAccount(deviceId, deviceMetadata, input, clientId);
             if (remember) {
                 await server.accountManager.upsertDeviceAccount(deviceId, account.sub);
             }
@@ -366,13 +371,13 @@ function createApiMiddleware(server, { onError }) {
         },
     }));
     return router.buildMiddleware();
-    async function authenticate(req, res) {
-        const authorization = req.headers.authorization?.split(' ');
-        if (authorization?.[0].toLowerCase() === 'bearer') {
+    async function authenticate(req, _res) {
+        if (req.headers.authorization?.startsWith('Bearer ')) {
             try {
                 // If there is an authorization header, verify that the ephemeral token it
                 // contains is a jwt bound to the right [sub, device, request].
-                const ephemeralToken = jwk_1.signedJwtSchema.parse(authorization[1]);
+                const bearer = req.headers.authorization.slice(7);
+                const ephemeralToken = jwk_1.signedJwtSchema.parse(bearer);
                 const { payload } = await server.signer.verifyEphemeralToken(ephemeralToken);
                 if (payload.sub === this.input.sub &&
                     payload.deviceId === this.deviceId &&
@@ -381,8 +386,7 @@ function createApiMiddleware(server, { onError }) {
                 }
             }
             catch (err) {
-                onError?.(req, res, err, 'Failed to authenticate ephemeral token');
-                // Fall back to session based authentication
+                throw new www_authenticate_error_js_1.WWWAuthenticateError('unauthorized', `Invalid or expired bearer token`, { Bearer: {} }, err);
             }
         }
         try {

package/dist/router/create-api-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-api-middleware.js","sourceRoot":"","sources":["../../src/router/create-api-middleware.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport createHttpError from 'http-errors'\nimport { z } from 'zod'\nimport { signedJwtSchema } from '@atproto/jwk'\nimport {\n  API_ENDPOINT_PREFIX,\n  ActiveAccountSession,\n  ActiveDeviceSession,\n  ActiveOAuthSession,\n  ApiEndpoints,\n  ISODateString,\n} from '@atproto/oauth-provider-api'\nimport {\n  OAuthAuthorizationRequestParameters,\n  OAuthRedirectUri,\n  OAuthResponseMode,\n  oauthRedirectUriSchema,\n  oauthResponseModeSchema,\n} from '@atproto/oauth-types'\nimport { signInDataSchema } from '../account/sign-in-data.js'\nimport { signUpInputSchema } from '../account/sign-up-input.js'\nimport { DeviceId, deviceIdSchema } from '../device/device-id.js'\nimport { AuthorizationError } from '../errors/authorization-error.js'\nimport {\n  ErrorPayload,\n  buildErrorPayload,\n  buildErrorStatus,\n} from '../errors/error-parser.js'\nimport { InvalidRequestError } from '../errors/invalid-request-error.js'\nimport { WWWAuthenticateError } from '../errors/www-authenticate-error.js'\nimport {\n  JsonResponse,\n  Middleware,\n  RequestMetadata,\n  Router,\n  RouterCtx,\n  SubCtx,\n  flushStream,\n  jsonHandler,\n  parseHttpRequest,\n  subCtx,\n  validateFetchMode,\n  validateFetchSite,\n  validateOrigin,\n  validateReferrer,\n} from '../lib/http/index.js'\nimport { RouteCtx, createRoute } from '../lib/http/route.js'\nimport { asArray } from '../lib/util/cast.js'\nimport { localeSchema } from '../lib/util/locale.js'\nimport type { Awaitable } from '../lib/util/type.js'\nimport type { OAuthProvider } from '../oauth-provider.js'\nimport { Sub, subSchema } from '../oidc/sub.js'\nimport { RequestUri, requestUriSchema } from '../request/request-uri.js'\nimport { AuthorizationRedirectParameters } from '../result/authorization-redirect-parameters.js'\nimport { tokenIdSchema } from '../token/token-id.js'\nimport { emailOtpSchema } from '../types/email-otp.js'\nimport { emailSchema } from '../types/email.js'\nimport { handleSchema } from '../types/handle.js'\nimport { newPasswordSchema } from '../types/password.js'\nimport { validateCsrfToken } from './assets/csrf.js'\nimport {\n  ERROR_REDIRECT_KEYS,\n  OAuthRedirectOptions,\n  OAuthRedirectQueryParameter,\n  SUCCESS_REDIRECT_KEYS,\n  buildRedirectMode,\n  buildRedirectParams,\n  buildRedirectUri,\n} from './assets/send-redirect.js'\nimport type { MiddlewareOptions } from './middleware-options.js'\n\nconst verifyHandleSchema = z.object({ handle: handleSchema }).strict()\n\nexport function createApiMiddleware<\n  Ctx extends object | void = void,\n  Req extends IncomingMessage = IncomingMessage,\n  Res extends ServerResponse = ServerResponse,\n>(\n  server: OAuthProvider,\n  { onError }: MiddlewareOptions<Req, Res>,\n): Middleware<Ctx, Req, Res> {\n  const issuerUrl = new URL(server.issuer)\n  const issuerOrigin = issuerUrl.origin\n  const router = new Router<Ctx, Req, Res>(issuerUrl)\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/verify-handle-availability',\n      schema: verifyHandleSchema,\n      async handler() {\n        await server.accountManager.verifyHandleAvailability(this.input.handle)\n        return { json: { available: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/sign-up',\n      schema: signUpInputSchema,\n      rotateDeviceCookies: true,\n      async handler() {\n        const { deviceId, deviceMetadata, input, requestUri } = this\n\n        const account = await server.accountManager.createAccount(\n          deviceId,\n          deviceMetadata,\n          input,\n        )\n\n        // Remember when not in the context of a request by default\n        const remember = requestUri == null\n\n        // Only \"remember\" the newly created account if it was not created during an\n        // OAuth flow.\n        if (remember) {\n          await server.accountManager.upsertDeviceAccount(deviceId, account.sub)\n        }\n\n        const ephemeralToken = remember\n          ? undefined\n          : await server.signer.createEphemeralToken({\n              sub: account.sub,\n              deviceId,\n              requestUri: this.requestUri,\n            })\n\n        const json = { account, ephemeralToken }\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/sign-in',\n      schema: signInDataSchema.extend({ remember: z.boolean().optional() }),\n      rotateDeviceCookies: true,\n      async handler() {\n        const { deviceId, deviceMetadata, requestUri } = this\n\n        // Remember when not in the context of a request by default\n        const { remember = requestUri == null, ...input } = this.input\n\n        const account = await server.accountManager.authenticateAccount(\n          deviceId,\n          deviceMetadata,\n          input,\n        )\n\n        if (remember) {\n          await server.accountManager.upsertDeviceAccount(deviceId, account.sub)\n        } else {\n          // In case the user was already signed in, and signed in again, this\n          // time without \"remember me\", let's sign them off of the device.\n          await server.accountManager.removeDeviceAccount(deviceId, account.sub)\n        }\n\n        const ephemeralToken = remember\n          ? undefined\n          : await server.signer.createEphemeralToken({\n              sub: account.sub,\n              deviceId,\n              requestUri,\n            })\n\n        if (requestUri) {\n          // Check if a consent is required for the client, but only if this\n          // call is made within the context of an oauth request.\n\n          const { clientId, parameters } = await server.requestManager.get(\n            requestUri,\n            deviceId,\n          )\n\n          const { authorizedClients } = await server.accountManager.getAccount(\n            account.sub,\n          )\n\n          const json = {\n            account,\n            ephemeralToken,\n            consentRequired: server.checkConsentRequired(\n              parameters,\n              authorizedClients.get(clientId),\n            ),\n          }\n\n          return { json }\n        }\n\n        const json = { account, ephemeralToken }\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/sign-out',\n      schema: z\n        .object({\n          sub: z.union([subSchema, z.array(subSchema)]),\n        })\n        .strict(),\n      rotateDeviceCookies: true,\n      async handler() {\n        const uniqueSubs = new Set(asArray(this.input.sub))\n\n        for (const sub of uniqueSubs) {\n          await server.accountManager.removeDeviceAccount(this.deviceId, sub)\n        }\n\n        return { json: { success: true as const } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/reset-password-request',\n      schema: z\n        .object({\n          locale: localeSchema,\n          email: emailSchema,\n        })\n        .strict(),\n      async handler() {\n        await server.accountManager.resetPasswordRequest(\n          this.deviceId,\n          this.deviceMetadata,\n          this.input,\n        )\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/reset-password-confirm',\n      schema: z\n        .object({\n          token: emailOtpSchema,\n          password: newPasswordSchema,\n        })\n        .strict(),\n      async handler() {\n        await server.accountManager.resetPasswordConfirm(\n          this.deviceId,\n          this.deviceMetadata,\n          this.input,\n        )\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'GET',\n      endpoint: '/device-sessions',\n      schema: undefined,\n      async handler() {\n        const deviceAccounts = await server.accountManager.listDeviceAccounts(\n          this.deviceId,\n        )\n\n        const json = deviceAccounts.map(\n          (deviceAccount): ActiveDeviceSession => ({\n            account: deviceAccount.account,\n            loginRequired: server.checkLoginRequired(deviceAccount),\n          }),\n        )\n\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'GET',\n      endpoint: '/oauth-sessions',\n      schema: z.object({ sub: subSchema }).strict(),\n      async handler(req, res) {\n        const { account } = await authenticate.call(this, req, res)\n\n        const tokenInfos = await server.tokenManager.listAccountTokens(\n          account.sub,\n        )\n\n        const clientIds = tokenInfos.map((tokenInfo) => tokenInfo.data.clientId)\n\n        const clients = await server.clientManager.loadClients(clientIds, {\n          onError: (err, clientId) => {\n            onError?.(req, res, err, `Failed to load client ${clientId}`)\n            return undefined // metadata won't be available in the UI\n          },\n        })\n\n        // @TODO: We should ideally filter sessions that are expired (or even\n        // expose the expiration date). This requires a change to the way\n        // TokenInfo are stored (see TokenManager#isTokenExpired and\n        // TokenManager#isTokenInactive).\n        const json = tokenInfos.map(({ id, data }): ActiveOAuthSession => {\n          return {\n            tokenId: id,\n\n            createdAt: data.createdAt.toISOString() as ISODateString,\n            updatedAt: data.updatedAt.toISOString() as ISODateString,\n\n            clientId: data.clientId,\n            clientMetadata: clients.get(data.clientId)?.metadata,\n\n            scope: data.parameters.scope,\n          }\n        })\n\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'GET',\n      endpoint: '/account-sessions',\n      schema: z.object({ sub: subSchema }).strict(),\n      async handler(req, res) {\n        const { account } = await authenticate.call(this, req, res)\n\n        const deviceAccounts = await server.accountManager.listAccountDevices(\n          account.sub,\n        )\n\n        const json = deviceAccounts.map(\n          (accountSession): ActiveAccountSession => ({\n            deviceId: accountSession.deviceId,\n            deviceMetadata: {\n              ipAddress: accountSession.deviceData.ipAddress,\n              userAgent: accountSession.deviceData.userAgent,\n              lastSeenAt:\n                accountSession.deviceData.lastSeenAt.toISOString() as ISODateString,\n            },\n\n            isCurrentDevice: accountSession.deviceId === this.deviceId,\n          }),\n        )\n\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/revoke-account-session',\n      schema: z.object({ sub: subSchema, deviceId: deviceIdSchema }).strict(),\n      async handler() {\n        // @NOTE This route is not authenticated. If a user is able to steal\n        // another user's session cookie, we allow them to revoke the device\n        // session.\n\n        await server.accountManager.removeDeviceAccount(\n          this.input.deviceId,\n          this.input.sub,\n        )\n\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/revoke-oauth-session',\n      schema: z.object({ sub: subSchema, tokenId: tokenIdSchema }).strict(),\n      async handler(req, res) {\n        const { account } = await authenticate.call(this, req, res)\n\n        const tokenInfo = await server.tokenManager.getTokenInfo(\n          this.input.tokenId,\n        )\n\n        if (!tokenInfo || tokenInfo.account.sub !== account.sub) {\n          // report this as though the token was not found\n          throw new InvalidRequestError(`Invalid token`)\n        }\n\n        await server.tokenManager.deleteToken(tokenInfo.id)\n\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/consent',\n      schema: z\n        .object({\n          sub: z.union([subSchema, signedJwtSchema]),\n          scope: z.string().optional(),\n        })\n        .strict(),\n      async handler(req, res) {\n        if (!this.requestUri) {\n          throw new InvalidRequestError(\n            'This endpoint can only be used in the context of an OAuth request',\n          )\n        }\n\n        // Any AuthorizationError caught in this block will result in a redirect\n        // to the client's redirect_uri with an error.\n        try {\n          const { clientId, parameters } = await server.requestManager.get(\n            this.requestUri,\n            this.deviceId,\n          )\n\n          // Any error thrown in this block will be transformed into an\n          // AuthorizationError.\n          try {\n            const { account, authorizedClients } = await authenticate.call(\n              this,\n              req,\n              res,\n            )\n\n            const client = await server.clientManager.getClient(clientId)\n\n            const code = await server.requestManager.setAuthorized(\n              this.requestUri,\n              client,\n              account,\n              this.deviceId,\n              this.deviceMetadata,\n              this.input.scope,\n            )\n\n            const clientData = authorizedClients.get(clientId)\n            if (server.checkConsentRequired(parameters, clientData)) {\n              const scopes = new Set(clientData?.authorizedScopes)\n\n              // Add the newly accepted scopes to the authorized scopes\n\n              // @NOTE `oauthScopeSchema` ensures that `scope` contains no\n              // leading/trailing/duplicate spaces.\n              for (const s of parameters.scope?.split(' ') ?? []) scopes.add(s)\n\n              await server.accountManager.setAuthorizedClient(account, client, {\n                ...clientData,\n                authorizedScopes: [...scopes],\n              })\n            }\n\n            const url = buildRedirectUrl(server.issuer, parameters, { code })\n\n            return { json: { url } }\n          } catch (err) {\n            // Since we have access to the parameters, we can re-throw an\n            // AuthorizationError with the redirect_uri parameter.\n            throw AuthorizationError.from(parameters, err)\n          }\n        } catch (err) {\n          onError?.(req, res, err, 'Failed to consent authorization request')\n\n          // If any error happened (unauthenticated, invalid request, etc.),\n          // lets make sure the request can no longer be used.\n          try {\n            await server.requestManager.delete(this.requestUri)\n          } catch (err) {\n            onError?.(req, res, err, 'Failed to delete request')\n          }\n\n          if (err instanceof AuthorizationError) {\n            try {\n              const url = buildRedirectUrl(\n                server.issuer,\n                err.parameters,\n                err.toJSON(),\n              )\n\n              return { json: { url } }\n            } catch {\n              // Unable to build redirect URL, ignore\n            }\n          }\n\n          // @NOTE Not re-throwing the error here, as the error was already\n          // handled by the `onError` callback, and apiRoute (`apiMiddleware`)\n          // would call `onError` again.\n          return buildErrorJsonResponse(err)\n        }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/reject',\n      schema: z.object({}).strict(),\n      rotateDeviceCookies: true,\n      async handler(req, res) {\n        const { requestUri } = this\n        if (!requestUri) {\n          throw new InvalidRequestError(\n            'This endpoint can only be used in the context of an OAuth request',\n          )\n        }\n\n        // Once this endpoint is called, the request will definitely be\n        // rejected.\n        try {\n          // No need to authenticate the user here as they are not authorizing a\n          // particular account (CSRF protection is enough).\n\n          // @NOTE that the client could *technically* trigger this endpoint while\n          // the user is on the authorize page by forging the request (because the\n          // client knows the RequestURI from PAR and has all the info needed to\n          // forge the request, including CSRF). This cannot be used as DoS attack\n          // as the request ID is not guessable and would only result in a bad UX\n          // for misbehaving clients, only for the users of those clients.\n\n          const { parameters } = await server.requestManager.get(\n            requestUri,\n            this.deviceId,\n          )\n\n          const url = buildRedirectUrl(server.issuer, parameters, {\n            error: 'access_denied',\n            error_description: 'The user rejected the request',\n          })\n\n          return { json: { url } }\n        } catch (err) {\n          onError?.(req, res, err, 'Failed to reject authorization request')\n\n          if (err instanceof AuthorizationError) {\n            try {\n              const url = buildRedirectUrl(\n                server.issuer,\n                err.parameters,\n                err.toJSON(),\n              )\n\n              return { json: { url } }\n            } catch {\n              // Unable to build redirect URL, ignore\n            }\n          }\n\n          return buildErrorJsonResponse(err)\n        } finally {\n          await server.requestManager.delete(requestUri).catch((err) => {\n            onError?.(req, res, err, 'Failed to delete request')\n          })\n        }\n      },\n    }),\n  )\n\n  return router.buildMiddleware()\n\n  async function authenticate(\n    this: ApiContext<void, { sub: Sub }>,\n    req: Req,\n    res: Res,\n  ) {\n    const authorization = req.headers.authorization?.split(' ')\n    if (authorization?.[0].toLowerCase() === 'bearer') {\n      try {\n        // If there is an authorization header, verify that the ephemeral token it\n        // contains is a jwt bound to the right [sub, device, request].\n        const ephemeralToken = signedJwtSchema.parse(authorization[1])\n        const { payload } =\n          await server.signer.verifyEphemeralToken(ephemeralToken)\n\n        if (\n          payload.sub === this.input.sub &&\n          payload.deviceId === this.deviceId &&\n          payload.requestUri === this.requestUri\n        ) {\n          return await server.accountManager.getAccount(payload.sub)\n        }\n      } catch (err) {\n        onError?.(req, res, err, 'Failed to authenticate ephemeral token')\n        // Fall back to session based authentication\n      }\n    }\n\n    try {\n      // Ensures the \"sub\" has an active session on the device\n      const deviceAccount = await server.accountManager.getDeviceAccount(\n        this.deviceId,\n        this.input.sub,\n      )\n\n      // The session exists but was created too long ago\n      if (server.checkLoginRequired(deviceAccount)) {\n        throw new InvalidRequestError('Login required')\n      }\n\n      return deviceAccount\n    } catch (err) {\n      throw new WWWAuthenticateError(\n        'unauthorized',\n        `User ${this.input.sub} not authenticated on this device`,\n        { Bearer: {} },\n        err,\n      )\n    }\n  }\n\n  type ApiContext<T extends object | void, I = void> = SubCtx<\n    T,\n    {\n      deviceId: DeviceId\n      deviceMetadata: RequestMetadata\n\n      /**\n       * The parsed input data (json payload if \"POST\", query params if \"GET\").\n       */\n      input: I\n\n      /**\n       * When defined, the request originated from the authorize page.\n       */\n      requestUri?: RequestUri\n    }\n  >\n\n  type InferValidation<S extends void | z.ZodTypeAny> = S extends z.ZodTypeAny\n    ? z.infer<S>\n    : void\n\n  /**\n   * The main purpose of this function is to ensure that the endpoint\n   * implementation matches its type definition from {@link ApiEndpoints}.\n   * @private\n   */\n  function apiRoute<\n    C extends RouterCtx<Ctx>,\n    M extends 'GET' | 'POST',\n    E extends `/${string}` &\n      // Extract all the endpoint path that match the method (allows for\n      // auto-complete & better error reporting)\n      {\n        [E in keyof ApiEndpoints]: ApiEndpoints[E] extends { method: M }\n          ? E\n          : never\n      }[keyof ApiEndpoints],\n    S extends // A schema that validates the POST input or GET params\n      ApiEndpoints[E] extends { method: 'POST'; input: infer I }\n        ? z.ZodType<I>\n        : ApiEndpoints[E] extends { method: 'GET'; params: infer P }\n          ? z.ZodType<P>\n          : void,\n  >(options: {\n    method: M\n    endpoint: E\n    schema: S\n    rotateDeviceCookies?: boolean\n    handler: (\n      this: ApiContext<RouteCtx<C>, InferValidation<S>>,\n      req: Req,\n      res: Res,\n    ) => Awaitable<JsonResponse<ErrorPayload | ApiEndpoints[E]['output']>>\n  }): Middleware<C, Req, Res> {\n    return createRoute(\n      options.method,\n      `${API_ENDPOINT_PREFIX}${options.endpoint}`,\n      apiMiddleware(options),\n    )\n  }\n\n  function apiMiddleware<C extends RouterCtx, S extends void | z.ZodTypeAny>({\n    method,\n    schema,\n    rotateDeviceCookies,\n    handler,\n  }: {\n    method: 'GET' | 'POST'\n    schema: S\n    rotateDeviceCookies?: boolean\n    handler: (\n      this: ApiContext<C, InferValidation<S>>,\n      req: Req,\n      res: Res,\n    ) => Awaitable<JsonResponse>\n  }): Middleware<C, Req, Res> {\n    const parseInput: (this: C, req: Req) => Promise<InferValidation<S>> =\n      schema == null // No schema means endpoint doesn't accept any input\n        ? async function (req) {\n            await flushStream(req)\n            return undefined\n          }\n        : method === 'POST'\n          ? async function (req) {\n              const body = await parseHttpRequest(req, ['json'])\n              return schema.parseAsync(body, { path: ['body'] })\n            }\n          : async function (req) {\n              await flushStream(req)\n              const query = Object.fromEntries(this.url.searchParams)\n              return schema.parseAsync(query, { path: ['query'] })\n            }\n\n    return jsonHandler<C, Req, Res>(async function (req, res) {\n      try {\n        // Prevent caching of API routes\n        res.setHeader('Cache-Control', 'no-store')\n        res.setHeader('Pragma', 'no-cache')\n\n        // Prevent CORS requests\n        validateFetchMode(req, ['same-origin'])\n        validateFetchSite(req, ['same-origin'])\n        validateOrigin(req, issuerOrigin)\n        const referrer = validateReferrer(req, { origin: issuerOrigin })\n\n        // Ensure we are one the right page\n        if (\n          // trailing slashes are not allowed\n          referrer.pathname !== '/oauth/authorize' &&\n          referrer.pathname !== '/account' &&\n          !referrer.pathname.startsWith(`/account/`)\n        ) {\n          throw createHttpError(400, `Invalid referrer ${referrer}`)\n        }\n\n        // Check if the request originated from the authorize page\n        const requestUri =\n          referrer.pathname === '/oauth/authorize'\n            ? await requestUriSchema.parseAsync(\n                referrer.searchParams.get('request_uri'),\n              )\n            : undefined\n\n        // Validate CSRF token\n        await validateCsrfToken(req, res)\n\n        // Parse and validate the input data\n        const input = await parseInput.call(this, req)\n\n        // Load session data, rotating the session cookie if needed\n        const { deviceId, deviceMetadata } = await server.deviceManager.load(\n          req,\n          res,\n          rotateDeviceCookies,\n        )\n\n        const context: ApiContext<C, InferValidation<S>> = subCtx(this, {\n          input,\n          requestUri,\n          deviceId,\n          deviceMetadata,\n        })\n\n        return await handler.call(context, req, res)\n      } catch (err) {\n        onError?.(req, res, err, `Failed to handle API request`)\n\n        // Make sore to always return a JSON response\n        return buildErrorJsonResponse(err)\n      }\n    })\n  }\n}\n\nfunction buildErrorJsonResponse(err: unknown) {\n  // @TODO Rework the API error responses (relying on codes)\n  const json = buildErrorPayload(err)\n  const status = buildErrorStatus(err)\n\n  return { json, status }\n}\n\nfunction buildRedirectUrl(\n  iss: string,\n  parameters: OAuthAuthorizationRequestParameters,\n  redirect: AuthorizationRedirectParameters,\n): string {\n  const url = new URL('/oauth/authorize/redirect', iss)\n\n  url.searchParams.set('redirect_mode', buildRedirectMode(parameters))\n  url.searchParams.set('redirect_uri', buildRedirectUri(parameters))\n\n  for (const [key, value] of buildRedirectParams(iss, parameters, redirect)) {\n    url.searchParams.set(key, value)\n  }\n\n  return url.href\n}\n\nexport function parseRedirectUrl(url: URL): OAuthRedirectOptions {\n  if (url.pathname !== '/oauth/authorize/redirect') {\n    throw new InvalidRequestError(\n      `Invalid redirect URL: ${url.pathname} is not a valid path`,\n    )\n  }\n\n  const params: [OAuthRedirectQueryParameter, string][] = []\n\n  const state = url.searchParams.get('state')\n  if (state) params.push(['state', state])\n\n  const iss = url.searchParams.get('iss')\n  if (iss) params.push(['iss', iss])\n\n  if (url.searchParams.has('code')) {\n    for (const key of SUCCESS_REDIRECT_KEYS) {\n      const value = url.searchParams.get(key)\n      if (value != null) params.push([key, value])\n    }\n  } else if (url.searchParams.has('error')) {\n    for (const key of ERROR_REDIRECT_KEYS) {\n      const value = url.searchParams.get(key)\n      if (value != null) params.push([key, value])\n    }\n  } else {\n    throw new InvalidRequestError(\n      'Invalid redirect URL: neither code nor error found',\n    )\n  }\n\n  try {\n    const mode: OAuthResponseMode = oauthResponseModeSchema.parse(\n      url.searchParams.get('redirect_mode'),\n    )\n\n    const redirectUri: OAuthRedirectUri = oauthRedirectUriSchema.parse(\n      url.searchParams.get('redirect_uri'),\n    )\n\n    return { mode, redirectUri, params }\n  } catch (err) {\n    throw InvalidRequestError.from(err, 'Invalid redirect URL')\n  }\n}\n"]}
+{"version":3,"file":"create-api-middleware.js","sourceRoot":"","sources":["../../src/router/create-api-middleware.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IncomingMessage, ServerResponse } from 'node:http'\nimport createHttpError from 'http-errors'\nimport { z } from 'zod'\nimport { signedJwtSchema } from '@atproto/jwk'\nimport {\n  API_ENDPOINT_PREFIX,\n  ActiveAccountSession,\n  ActiveDeviceSession,\n  ActiveOAuthSession,\n  ApiEndpoints,\n  ISODateString,\n} from '@atproto/oauth-provider-api'\nimport {\n  OAuthAuthorizationRequestParameters,\n  OAuthRedirectUri,\n  OAuthResponseMode,\n  oauthRedirectUriSchema,\n  oauthResponseModeSchema,\n} from '@atproto/oauth-types'\nimport { signInDataSchema } from '../account/sign-in-data.js'\nimport { signUpInputSchema } from '../account/sign-up-input.js'\nimport { DeviceId, deviceIdSchema } from '../device/device-id.js'\nimport { AuthorizationError } from '../errors/authorization-error.js'\nimport {\n  ErrorPayload,\n  buildErrorPayload,\n  buildErrorStatus,\n} from '../errors/error-parser.js'\nimport { InvalidRequestError } from '../errors/invalid-request-error.js'\nimport { WWWAuthenticateError } from '../errors/www-authenticate-error.js'\nimport {\n  JsonResponse,\n  Middleware,\n  RequestMetadata,\n  Router,\n  RouterCtx,\n  SubCtx,\n  flushStream,\n  jsonHandler,\n  parseHttpRequest,\n  subCtx,\n  validateFetchMode,\n  validateFetchSite,\n  validateOrigin,\n  validateReferrer,\n} from '../lib/http/index.js'\nimport { RouteCtx, createRoute } from '../lib/http/route.js'\nimport { asArray } from '../lib/util/cast.js'\nimport { localeSchema } from '../lib/util/locale.js'\nimport type { Awaitable } from '../lib/util/type.js'\nimport type { OAuthProvider } from '../oauth-provider.js'\nimport { Sub, subSchema } from '../oidc/sub.js'\nimport { RequestUri, requestUriSchema } from '../request/request-uri.js'\nimport { AuthorizationRedirectParameters } from '../result/authorization-redirect-parameters.js'\nimport { tokenIdSchema } from '../token/token-id.js'\nimport { emailOtpSchema } from '../types/email-otp.js'\nimport { emailSchema } from '../types/email.js'\nimport { handleSchema } from '../types/handle.js'\nimport { newPasswordSchema } from '../types/password.js'\nimport { validateCsrfToken } from './assets/csrf.js'\nimport {\n  ERROR_REDIRECT_KEYS,\n  OAuthRedirectOptions,\n  OAuthRedirectQueryParameter,\n  SUCCESS_REDIRECT_KEYS,\n  buildRedirectMode,\n  buildRedirectParams,\n  buildRedirectUri,\n} from './assets/send-redirect.js'\nimport type { MiddlewareOptions } from './middleware-options.js'\n\nconst verifyHandleSchema = z.object({ handle: handleSchema }).strict()\n\nexport function createApiMiddleware<\n  Ctx extends object | void = void,\n  Req extends IncomingMessage = IncomingMessage,\n  Res extends ServerResponse = ServerResponse,\n>(\n  server: OAuthProvider,\n  { onError }: MiddlewareOptions<Req, Res>,\n): Middleware<Ctx, Req, Res> {\n  const issuerUrl = new URL(server.issuer)\n  const issuerOrigin = issuerUrl.origin\n  const router = new Router<Ctx, Req, Res>(issuerUrl)\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/verify-handle-availability',\n      schema: verifyHandleSchema,\n      async handler() {\n        await server.accountManager.verifyHandleAvailability(this.input.handle)\n        return { json: { available: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/sign-up',\n      schema: signUpInputSchema,\n      rotateDeviceCookies: true,\n      async handler() {\n        const { deviceId, deviceMetadata, input, requestUri } = this\n\n        const account = await server.accountManager.createAccount(\n          deviceId,\n          deviceMetadata,\n          input,\n        )\n\n        // Remember when not in the context of a request by default\n        const remember = requestUri == null\n\n        // Only \"remember\" the newly created account if it was not created during an\n        // OAuth flow.\n        if (remember) {\n          await server.accountManager.upsertDeviceAccount(deviceId, account.sub)\n        }\n\n        const ephemeralToken = remember\n          ? undefined\n          : await server.signer.createEphemeralToken({\n              sub: account.sub,\n              deviceId,\n              requestUri: this.requestUri,\n            })\n\n        const json = { account, ephemeralToken }\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/sign-in',\n      schema: signInDataSchema.extend({ remember: z.boolean().optional() }),\n      rotateDeviceCookies: true,\n      async handler() {\n        const { deviceId, deviceMetadata, requestUri } = this\n\n        // Remember when not in the context of a request by default\n        const { remember = requestUri == null, ...input } = this.input\n\n        // Look up the client identifier associated with the pending OAuth\n        // request, if any, so it can be surfaced to the sign-in hooks.\n        const clientId = requestUri\n          ? await server.requestManager.peekClientId(requestUri)\n          : undefined\n\n        const account = await server.accountManager.authenticateAccount(\n          deviceId,\n          deviceMetadata,\n          input,\n          clientId,\n        )\n\n        if (remember) {\n          await server.accountManager.upsertDeviceAccount(deviceId, account.sub)\n        } else {\n          // In case the user was already signed in, and signed in again, this\n          // time without \"remember me\", let's sign them off of the device.\n          await server.accountManager.removeDeviceAccount(deviceId, account.sub)\n        }\n\n        const ephemeralToken = remember\n          ? undefined\n          : await server.signer.createEphemeralToken({\n              sub: account.sub,\n              deviceId,\n              requestUri,\n            })\n\n        if (requestUri) {\n          // Check if a consent is required for the client, but only if this\n          // call is made within the context of an oauth request.\n\n          const { clientId, parameters } = await server.requestManager.get(\n            requestUri,\n            deviceId,\n          )\n\n          const { authorizedClients } = await server.accountManager.getAccount(\n            account.sub,\n          )\n\n          const json = {\n            account,\n            ephemeralToken,\n            consentRequired: server.checkConsentRequired(\n              parameters,\n              authorizedClients.get(clientId),\n            ),\n          }\n\n          return { json }\n        }\n\n        const json = { account, ephemeralToken }\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/sign-out',\n      schema: z\n        .object({\n          sub: z.union([subSchema, z.array(subSchema)]),\n        })\n        .strict(),\n      rotateDeviceCookies: true,\n      async handler() {\n        const uniqueSubs = new Set(asArray(this.input.sub))\n\n        for (const sub of uniqueSubs) {\n          await server.accountManager.removeDeviceAccount(this.deviceId, sub)\n        }\n\n        return { json: { success: true as const } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/reset-password-request',\n      schema: z\n        .object({\n          locale: localeSchema,\n          email: emailSchema,\n        })\n        .strict(),\n      async handler() {\n        await server.accountManager.resetPasswordRequest(\n          this.deviceId,\n          this.deviceMetadata,\n          this.input,\n        )\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/reset-password-confirm',\n      schema: z\n        .object({\n          token: emailOtpSchema,\n          password: newPasswordSchema,\n        })\n        .strict(),\n      async handler() {\n        await server.accountManager.resetPasswordConfirm(\n          this.deviceId,\n          this.deviceMetadata,\n          this.input,\n        )\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'GET',\n      endpoint: '/device-sessions',\n      schema: undefined,\n      async handler() {\n        const deviceAccounts = await server.accountManager.listDeviceAccounts(\n          this.deviceId,\n        )\n\n        const json = deviceAccounts.map(\n          (deviceAccount): ActiveDeviceSession => ({\n            account: deviceAccount.account,\n            loginRequired: server.checkLoginRequired(deviceAccount),\n          }),\n        )\n\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'GET',\n      endpoint: '/oauth-sessions',\n      schema: z.object({ sub: subSchema }).strict(),\n      async handler(req, res) {\n        const { account } = await authenticate.call(this, req, res)\n\n        const tokenInfos = await server.tokenManager.listAccountTokens(\n          account.sub,\n        )\n\n        const clientIds = tokenInfos.map((tokenInfo) => tokenInfo.data.clientId)\n\n        const clients = await server.clientManager.loadClients(clientIds, {\n          onError: (err, clientId) => {\n            onError?.(req, res, err, `Failed to load client ${clientId}`)\n            return undefined // metadata won't be available in the UI\n          },\n        })\n\n        // @TODO: We should ideally filter sessions that are expired (or even\n        // expose the expiration date). This requires a change to the way\n        // TokenInfo are stored (see TokenManager#isTokenExpired and\n        // TokenManager#isTokenInactive).\n        const json = tokenInfos.map(({ id, data }): ActiveOAuthSession => {\n          return {\n            tokenId: id,\n\n            createdAt: data.createdAt.toISOString() as ISODateString,\n            updatedAt: data.updatedAt.toISOString() as ISODateString,\n\n            clientId: data.clientId,\n            clientMetadata: clients.get(data.clientId)?.metadata,\n\n            scope: data.parameters.scope,\n          }\n        })\n\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'GET',\n      endpoint: '/account-sessions',\n      schema: z.object({ sub: subSchema }).strict(),\n      async handler(req, res) {\n        const { account } = await authenticate.call(this, req, res)\n\n        const deviceAccounts = await server.accountManager.listAccountDevices(\n          account.sub,\n        )\n\n        const json = deviceAccounts.map(\n          (accountSession): ActiveAccountSession => ({\n            deviceId: accountSession.deviceId,\n            deviceMetadata: {\n              ipAddress: accountSession.deviceData.ipAddress,\n              userAgent: accountSession.deviceData.userAgent,\n              lastSeenAt:\n                accountSession.deviceData.lastSeenAt.toISOString() as ISODateString,\n            },\n\n            isCurrentDevice: accountSession.deviceId === this.deviceId,\n          }),\n        )\n\n        return { json }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/revoke-account-session',\n      schema: z.object({ sub: subSchema, deviceId: deviceIdSchema }).strict(),\n      async handler() {\n        // @NOTE This route is not authenticated. If a user is able to steal\n        // another user's session cookie, we allow them to revoke the device\n        // session.\n\n        await server.accountManager.removeDeviceAccount(\n          this.input.deviceId,\n          this.input.sub,\n        )\n\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/revoke-oauth-session',\n      schema: z.object({ sub: subSchema, tokenId: tokenIdSchema }).strict(),\n      async handler(req, res) {\n        const { account } = await authenticate.call(this, req, res)\n\n        const tokenInfo = await server.tokenManager.getTokenInfo(\n          this.input.tokenId,\n        )\n\n        if (!tokenInfo || tokenInfo.account.sub !== account.sub) {\n          // report this as though the token was not found\n          throw new InvalidRequestError(`Invalid token`)\n        }\n\n        await server.tokenManager.deleteToken(tokenInfo.id)\n\n        return { json: { success: true } }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/consent',\n      schema: z\n        .object({\n          sub: z.union([subSchema, signedJwtSchema]),\n          scope: z.string().optional(),\n        })\n        .strict(),\n      async handler(req, res) {\n        if (!this.requestUri) {\n          throw new InvalidRequestError(\n            'This endpoint can only be used in the context of an OAuth request',\n          )\n        }\n\n        // Any AuthorizationError caught in this block will result in a redirect\n        // to the client's redirect_uri with an error.\n        try {\n          const { clientId, parameters } = await server.requestManager.get(\n            this.requestUri,\n            this.deviceId,\n          )\n\n          // Any error thrown in this block will be transformed into an\n          // AuthorizationError.\n          try {\n            const { account, authorizedClients } = await authenticate.call(\n              this,\n              req,\n              res,\n            )\n\n            const client = await server.clientManager.getClient(clientId)\n\n            const code = await server.requestManager.setAuthorized(\n              this.requestUri,\n              client,\n              account,\n              this.deviceId,\n              this.deviceMetadata,\n              this.input.scope,\n            )\n\n            const clientData = authorizedClients.get(clientId)\n            if (server.checkConsentRequired(parameters, clientData)) {\n              const scopes = new Set(clientData?.authorizedScopes)\n\n              // Add the newly accepted scopes to the authorized scopes\n\n              // @NOTE `oauthScopeSchema` ensures that `scope` contains no\n              // leading/trailing/duplicate spaces.\n              for (const s of parameters.scope?.split(' ') ?? []) scopes.add(s)\n\n              await server.accountManager.setAuthorizedClient(account, client, {\n                ...clientData,\n                authorizedScopes: [...scopes],\n              })\n            }\n\n            const url = buildRedirectUrl(server.issuer, parameters, { code })\n\n            return { json: { url } }\n          } catch (err) {\n            // Since we have access to the parameters, we can re-throw an\n            // AuthorizationError with the redirect_uri parameter.\n            throw AuthorizationError.from(parameters, err)\n          }\n        } catch (err) {\n          onError?.(req, res, err, 'Failed to consent authorization request')\n\n          // If any error happened (unauthenticated, invalid request, etc.),\n          // lets make sure the request can no longer be used.\n          try {\n            await server.requestManager.delete(this.requestUri)\n          } catch (err) {\n            onError?.(req, res, err, 'Failed to delete request')\n          }\n\n          if (err instanceof AuthorizationError) {\n            try {\n              const url = buildRedirectUrl(\n                server.issuer,\n                err.parameters,\n                err.toJSON(),\n              )\n\n              return { json: { url } }\n            } catch {\n              // Unable to build redirect URL, ignore\n            }\n          }\n\n          // @NOTE Not re-throwing the error here, as the error was already\n          // handled by the `onError` callback, and apiRoute (`apiMiddleware`)\n          // would call `onError` again.\n          return buildErrorJsonResponse(err)\n        }\n      },\n    }),\n  )\n\n  router.use(\n    apiRoute({\n      method: 'POST',\n      endpoint: '/reject',\n      schema: z.object({}).strict(),\n      rotateDeviceCookies: true,\n      async handler(req, res) {\n        const { requestUri } = this\n        if (!requestUri) {\n          throw new InvalidRequestError(\n            'This endpoint can only be used in the context of an OAuth request',\n          )\n        }\n\n        // Once this endpoint is called, the request will definitely be\n        // rejected.\n        try {\n          // No need to authenticate the user here as they are not authorizing a\n          // particular account (CSRF protection is enough).\n\n          // @NOTE that the client could *technically* trigger this endpoint while\n          // the user is on the authorize page by forging the request (because the\n          // client knows the RequestURI from PAR and has all the info needed to\n          // forge the request, including CSRF). This cannot be used as DoS attack\n          // as the request ID is not guessable and would only result in a bad UX\n          // for misbehaving clients, only for the users of those clients.\n\n          const { parameters } = await server.requestManager.get(\n            requestUri,\n            this.deviceId,\n          )\n\n          const url = buildRedirectUrl(server.issuer, parameters, {\n            error: 'access_denied',\n            error_description: 'The user rejected the request',\n          })\n\n          return { json: { url } }\n        } catch (err) {\n          onError?.(req, res, err, 'Failed to reject authorization request')\n\n          if (err instanceof AuthorizationError) {\n            try {\n              const url = buildRedirectUrl(\n                server.issuer,\n                err.parameters,\n                err.toJSON(),\n              )\n\n              return { json: { url } }\n            } catch {\n              // Unable to build redirect URL, ignore\n            }\n          }\n\n          return buildErrorJsonResponse(err)\n        } finally {\n          await server.requestManager.delete(requestUri).catch((err) => {\n            onError?.(req, res, err, 'Failed to delete request')\n          })\n        }\n      },\n    }),\n  )\n\n  return router.buildMiddleware()\n\n  async function authenticate(\n    this: ApiContext<void, { sub: Sub }>,\n    req: Req,\n    _res: Res,\n  ) {\n    if (req.headers.authorization?.startsWith('Bearer ')) {\n      try {\n        // If there is an authorization header, verify that the ephemeral token it\n        // contains is a jwt bound to the right [sub, device, request].\n        const bearer = req.headers.authorization.slice(7)\n        const ephemeralToken = signedJwtSchema.parse(bearer)\n        const { payload } =\n          await server.signer.verifyEphemeralToken(ephemeralToken)\n\n        if (\n          payload.sub === this.input.sub &&\n          payload.deviceId === this.deviceId &&\n          payload.requestUri === this.requestUri\n        ) {\n          return await server.accountManager.getAccount(payload.sub)\n        }\n      } catch (err) {\n        throw new WWWAuthenticateError(\n          'unauthorized',\n          `Invalid or expired bearer token`,\n          { Bearer: {} },\n          err,\n        )\n      }\n    }\n\n    try {\n      // Ensures the \"sub\" has an active session on the device\n      const deviceAccount = await server.accountManager.getDeviceAccount(\n        this.deviceId,\n        this.input.sub,\n      )\n\n      // The session exists but was created too long ago\n      if (server.checkLoginRequired(deviceAccount)) {\n        throw new InvalidRequestError('Login required')\n      }\n\n      return deviceAccount\n    } catch (err) {\n      throw new WWWAuthenticateError(\n        'unauthorized',\n        `User ${this.input.sub} not authenticated on this device`,\n        { Bearer: {} },\n        err,\n      )\n    }\n  }\n\n  type ApiContext<T extends object | void, I = void> = SubCtx<\n    T,\n    {\n      deviceId: DeviceId\n      deviceMetadata: RequestMetadata\n\n      /**\n       * The parsed input data (json payload if \"POST\", query params if \"GET\").\n       */\n      input: I\n\n      /**\n       * When defined, the request originated from the authorize page.\n       */\n      requestUri?: RequestUri\n    }\n  >\n\n  type InferValidation<S extends void | z.ZodTypeAny> = S extends z.ZodTypeAny\n    ? z.infer<S>\n    : void\n\n  /**\n   * The main purpose of this function is to ensure that the endpoint\n   * implementation matches its type definition from {@link ApiEndpoints}.\n   * @private\n   */\n  function apiRoute<\n    C extends RouterCtx<Ctx>,\n    M extends 'GET' | 'POST',\n    E extends `/${string}` &\n      // Extract all the endpoint path that match the method (allows for\n      // auto-complete & better error reporting)\n      {\n        [E in keyof ApiEndpoints]: ApiEndpoints[E] extends { method: M }\n          ? E\n          : never\n      }[keyof ApiEndpoints],\n    S extends // A schema that validates the POST input or GET params\n      ApiEndpoints[E] extends { method: 'POST'; input: infer I }\n        ? z.ZodType<I>\n        : ApiEndpoints[E] extends { method: 'GET'; params: infer P }\n          ? z.ZodType<P>\n          : void,\n  >(options: {\n    method: M\n    endpoint: E\n    schema: S\n    rotateDeviceCookies?: boolean\n    handler: (\n      this: ApiContext<RouteCtx<C>, InferValidation<S>>,\n      req: Req,\n      res: Res,\n    ) => Awaitable<JsonResponse<ErrorPayload | ApiEndpoints[E]['output']>>\n  }): Middleware<C, Req, Res> {\n    return createRoute(\n      options.method,\n      `${API_ENDPOINT_PREFIX}${options.endpoint}`,\n      apiMiddleware(options),\n    )\n  }\n\n  function apiMiddleware<C extends RouterCtx, S extends void | z.ZodTypeAny>({\n    method,\n    schema,\n    rotateDeviceCookies,\n    handler,\n  }: {\n    method: 'GET' | 'POST'\n    schema: S\n    rotateDeviceCookies?: boolean\n    handler: (\n      this: ApiContext<C, InferValidation<S>>,\n      req: Req,\n      res: Res,\n    ) => Awaitable<JsonResponse>\n  }): Middleware<C, Req, Res> {\n    const parseInput: (this: C, req: Req) => Promise<InferValidation<S>> =\n      schema == null // No schema means endpoint doesn't accept any input\n        ? async function (req) {\n            await flushStream(req)\n            return undefined\n          }\n        : method === 'POST'\n          ? async function (req) {\n              const body = await parseHttpRequest(req, ['json'])\n              return schema.parseAsync(body, { path: ['body'] })\n            }\n          : async function (req) {\n              await flushStream(req)\n              const query = Object.fromEntries(this.url.searchParams)\n              return schema.parseAsync(query, { path: ['query'] })\n            }\n\n    return jsonHandler<C, Req, Res>(async function (req, res) {\n      try {\n        // Prevent caching of API routes\n        res.setHeader('Cache-Control', 'no-store')\n        res.setHeader('Pragma', 'no-cache')\n\n        // Prevent CORS requests\n        validateFetchMode(req, ['same-origin'])\n        validateFetchSite(req, ['same-origin'])\n        validateOrigin(req, issuerOrigin)\n        const referrer = validateReferrer(req, { origin: issuerOrigin })\n\n        // Ensure we are one the right page\n        if (\n          // trailing slashes are not allowed\n          referrer.pathname !== '/oauth/authorize' &&\n          referrer.pathname !== '/account' &&\n          !referrer.pathname.startsWith(`/account/`)\n        ) {\n          throw createHttpError(400, `Invalid referrer ${referrer}`)\n        }\n\n        // Check if the request originated from the authorize page\n        const requestUri =\n          referrer.pathname === '/oauth/authorize'\n            ? await requestUriSchema.parseAsync(\n                referrer.searchParams.get('request_uri'),\n              )\n            : undefined\n\n        // Validate CSRF token\n        await validateCsrfToken(req, res)\n\n        // Parse and validate the input data\n        const input = await parseInput.call(this, req)\n\n        // Load session data, rotating the session cookie if needed\n        const { deviceId, deviceMetadata } = await server.deviceManager.load(\n          req,\n          res,\n          rotateDeviceCookies,\n        )\n\n        const context: ApiContext<C, InferValidation<S>> = subCtx(this, {\n          input,\n          requestUri,\n          deviceId,\n          deviceMetadata,\n        })\n\n        return await handler.call(context, req, res)\n      } catch (err) {\n        onError?.(req, res, err, `Failed to handle API request`)\n\n        // Make sore to always return a JSON response\n        return buildErrorJsonResponse(err)\n      }\n    })\n  }\n}\n\nfunction buildErrorJsonResponse(err: unknown) {\n  // @TODO Rework the API error responses (relying on codes)\n  const json = buildErrorPayload(err)\n  const status = buildErrorStatus(err)\n\n  return { json, status }\n}\n\nfunction buildRedirectUrl(\n  iss: string,\n  parameters: OAuthAuthorizationRequestParameters,\n  redirect: AuthorizationRedirectParameters,\n): string {\n  const url = new URL('/oauth/authorize/redirect', iss)\n\n  url.searchParams.set('redirect_mode', buildRedirectMode(parameters))\n  url.searchParams.set('redirect_uri', buildRedirectUri(parameters))\n\n  for (const [key, value] of buildRedirectParams(iss, parameters, redirect)) {\n    url.searchParams.set(key, value)\n  }\n\n  return url.href\n}\n\nexport function parseRedirectUrl(url: URL): OAuthRedirectOptions {\n  if (url.pathname !== '/oauth/authorize/redirect') {\n    throw new InvalidRequestError(\n      `Invalid redirect URL: ${url.pathname} is not a valid path`,\n    )\n  }\n\n  const params: [OAuthRedirectQueryParameter, string][] = []\n\n  const state = url.searchParams.get('state')\n  if (state) params.push(['state', state])\n\n  const iss = url.searchParams.get('iss')\n  if (iss) params.push(['iss', iss])\n\n  if (url.searchParams.has('code')) {\n    for (const key of SUCCESS_REDIRECT_KEYS) {\n      const value = url.searchParams.get(key)\n      if (value != null) params.push([key, value])\n    }\n  } else if (url.searchParams.has('error')) {\n    for (const key of ERROR_REDIRECT_KEYS) {\n      const value = url.searchParams.get(key)\n      if (value != null) params.push([key, value])\n    }\n  } else {\n    throw new InvalidRequestError(\n      'Invalid redirect URL: neither code nor error found',\n    )\n  }\n\n  try {\n    const mode: OAuthResponseMode = oauthResponseModeSchema.parse(\n      url.searchParams.get('redirect_mode'),\n    )\n\n    const redirectUri: OAuthRedirectUri = oauthRedirectUriSchema.parse(\n      url.searchParams.get('redirect_uri'),\n    )\n\n    return { mode, redirectUri, params }\n  } catch (err) {\n    throw InvalidRequestError.from(err, 'Invalid redirect URL')\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.15.16",
+  "version": "0.16.1",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
@@ -43,22 +43,21 @@
     "jose": "^5.2.0",
     "zod": "^3.23.8",
     "@atproto-labs/fetch": "^0.2.3",
-    "@atproto-labs/fetch-node": "^0.2.0",
     "@atproto-labs/pipe": "^0.1.1",
+    "@atproto-labs/fetch-node": "^0.2.0",
     "@atproto-labs/simple-store": "^0.3.0",
     "@atproto-labs/simple-store-memory": "^0.1.4",
-    "@atproto/common": "^0.5.16",
-    "@atproto/did": "^0.3.0",
     "@atproto/jwk": "^0.6.0",
+    "@atproto/common": "^0.5.16",
     "@atproto/jwk-jose": "^0.1.11",
-    "@atproto/lex-resolver": "^0.0.21",
-    "@atproto/lex-document": "^0.0.19",
-    "@atproto/oauth-provider-api": "0.3.7",
-    "@atproto/oauth-provider-frontend": "0.2.9",
-    "@atproto/oauth-scopes": "^0.3.2",
-    "@atproto/syntax": "^0.5.3",
     "@atproto/oauth-types": "^0.6.3",
-    "@atproto/oauth-provider-ui": "0.4.3"
+    "@atproto/lex-document": "^0.0.20",
+    "@atproto/lex-resolver": "^0.0.22",
+    "@atproto/oauth-provider-api": "0.4.0",
+    "@atproto/oauth-provider-ui": "0.5.0",
+    "@atproto/did": "^0.3.0",
+    "@atproto/oauth-scopes": "^0.3.2",
+    "@atproto/syntax": "^0.5.4"
   },
   "devDependencies": {
     "@types/cookie": "^0.6.0",

package/src/account/account-manager.ts

@@ -2,8 +2,10 @@ import {
   OAuthIssuerIdentifier,
   isOAuthClientIdLoopback,
 } from '@atproto/oauth-types'
+import { ClientId } from '../client/client-id.js'
 import { Client } from '../client/client.js'
 import { DeviceId } from '../device/device-id.js'
+import { InvalidCredentialsError } from '../errors/invalid-credentials-error.js'
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
 import { HCaptchaClient, HcaptchaVerifyResult } from '../lib/hcaptcha.js'
 import { constantTime } from '../lib/util/time.js'
@@ -159,26 +161,67 @@ export class AccountManager {
     deviceId: DeviceId,
     deviceMetadata: RequestMetadata,
     data: SignInData,
+    clientId?: ClientId,
   ): Promise<Account> {
     try {
       await this.hooks.onSignInAttempt?.call(null, {
         data,
         deviceId,
         deviceMetadata,
+        clientId,
       })
 
-      const account = await constantTime(
-        TIMING_ATTACK_MITIGATION_DELAY,
-        async () => {
-          return this.store.authenticateAccount(data)
-        },
-      )
+      let account: Account
+      try {
+        account = await constantTime(
+          TIMING_ATTACK_MITIGATION_DELAY,
+          async () => {
+            return this.store.authenticateAccount(data)
+          },
+        )
+      } catch (err) {
+        // Only notify for credential failures (e.g. unknown identifier, wrong
+        // password). Server errors and flows that require an additional factor
+        // (e.g. SecondAuthenticationFactorRequiredError) are not "failed
+        // sign-ins" and do not trigger the hook.
+        if (err instanceof InvalidRequestError) {
+          // Stores that throw the more specific `InvalidCredentialsError`
+          // can attach the matched subject identifier to distinguish
+          // "identifier known, password wrong" from "identifier unknown".
+          // This information is only exposed to the hook and is never
+          // surfaced to the client.
+          const isCredentialsError = err instanceof InvalidCredentialsError
+          const sub = isCredentialsError ? err.sub ?? null : null
+
+          // Swallow any error from the hook itself so that it does not mask
+          // the underlying authentication failure being reported.
+          try {
+            await this.hooks.onSignInFailed?.call(null, {
+              data,
+              error: err,
+              sub,
+              deviceId,
+              deviceMetadata,
+              clientId,
+            })
+          } catch {
+            // noop
+          }
+
+          if (isCredentialsError) {
+            // Defensively downgrade to a plain InvalidRequestError
+            throw new InvalidRequestError(err.error_description)
+          }
+        }
+        throw err
+      }
 
       await this.hooks.onSignedIn?.call(null, {
         data,
         account,
         deviceId,
         deviceMetadata,
+        clientId,
       })
 
       return account

package/src/account/account-store.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Account,
   ConfirmResetPasswordInput,
   InitiatePasswordResetInput,
@@ -11,6 +11,7 @@ import { HcaptchaVerifyResult } from '../lib/hcaptcha.js'
 import { Awaitable, buildInterfaceChecker } from '../lib/util/type.js'
 import {
   HandleUnavailableError,
+  InvalidCredentialsError,
   InvalidRequestError,
   SecondAuthenticationFactorRequiredError,
 } from '../oauth-errors.js'
@@ -36,6 +37,7 @@ export type {
 
 export {
   HandleUnavailableError,
+  InvalidCredentialsError,
   InvalidRequestError,
   SecondAuthenticationFactorRequiredError,
 }
@@ -108,7 +110,13 @@ export interface AccountStore {
   createAccount(data: CreateAccountData): Awaitable<Account>
 
   /**
-   * @throws {InvalidRequestError} - When the credentials are not valid
+   * @throws {InvalidCredentialsError} - When the credentials are not valid.
+   * Populate {@link InvalidCredentialsError.sub} with the subject identifier
+   * when the identifier matched an existing account (e.g. wrong password for
+   * a known user); omit it when the identifier was not found. Throwing the
+   * generic {@link InvalidRequestError} is also accepted for backward
+   * compatibility but prevents the `onSignInFailed` hook from distinguishing
+   * the two cases.
    * @throws {SecondAuthenticationFactorRequiredError} - To indicate that an {@link SecondAuthenticationFactorRequiredError.type} is required in the credentials
    */
   authenticateAccount(data: AuthenticateAccountData): Awaitable<Account>