@atproto/oauth-client 0.5.6 → 0.5.7

package/dist/types.d.ts.map

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

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA,6BAA+B;AAC/B,sDAK6B;AAyBhB,QAAA,oBAAoB,GAAG,uCAAyB,CAAC,MAAM,CAAC;IACnE,SAAS,EAAE,OAAC,CAAC,KAAK,CAAC;QACjB,6CAA+B;QAC/B,yCAA2B;KAC5B,CAAC;CACH,CAAC,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA,6BAA+B;AAC/B,sDAK6B;AAyBhB,QAAA,oBAAoB,GAAG,uCAAyB,CAAC,MAAM,CAAC;IACnE,SAAS,EAAE,OAAC,CAAC,KAAK,CAAC;QACjB,6CAA+B;QAC/B,yCAA2B;KAC5B,CAAC;CACH,CAAC,CAAA","sourcesContent":["import { TypeOf, z } from 'zod'\nimport {\n  OAuthAuthorizationRequestParameters,\n  oauthClientIdDiscoverableSchema,\n  oauthClientIdLoopbackSchema,\n  oauthClientMetadataSchema,\n} from '@atproto/oauth-types'\nimport { Simplify } from './util.js'\n\n// Note: These types are not prefixed with `OAuth` because they are not specific\n// to OAuth. They are specific to this packages. OAuth specific types are in\n// `@atproto/oauth-types`.\n\nexport type AuthorizeOptions = Simplify<\n  Omit<\n    OAuthAuthorizationRequestParameters,\n    | 'client_id'\n    | 'response_mode'\n    | 'response_type'\n    | 'login_hint'\n    | 'code_challenge'\n    | 'code_challenge_method'\n  > & {\n    signal?: AbortSignal\n  }\n>\n\nexport type CallbackOptions = Simplify<\n  Partial<Pick<OAuthAuthorizationRequestParameters, 'redirect_uri'>>\n>\n\nexport const clientMetadataSchema = oauthClientMetadataSchema.extend({\n  client_id: z.union([\n    oauthClientIdDiscoverableSchema,\n    oauthClientIdLoopbackSchema,\n  ]),\n})\n\nexport type ClientMetadata = TypeOf<typeof clientMetadataSchema>\n"]}

package/dist/util.d.ts

@@ -3,12 +3,6 @@ export type Simplify<T> = {
     [K in keyof T]: T[K];
 } & NonNullable<unknown>;
 export declare const ifString: <V>(v: V) => (V & string) | undefined;
-/**
- * @todo (?) move to common package
- */
-export declare const timeoutSignal: (timeout: number, options?: {
-    signal?: AbortSignal;
-}) => AbortSignal & Disposable;
 export declare function contentMime(headers: Headers): string | undefined;
 /**
  * Ponyfill for `CustomEvent` constructor.
@@ -20,7 +14,5 @@ export declare class CustomEventTarget<EventDetailMap extends Record<string, unk
     removeEventListener<T extends Extract<keyof EventDetailMap, string>>(type: T, callback: (event: CustomEvent<EventDetailMap[T]>) => void, options?: EventListenerOptions | boolean): void;
     dispatchCustomEvent<T extends Extract<keyof EventDetailMap, string>>(type: T, detail: EventDetailMap[T], init?: EventInit): boolean;
 }
-export type SpaceSeparatedValue<Value extends string> = `${Value}` | `${Value} ${string}` | `${string} ${Value}` | `${string} ${Value} ${string}`;
-export declare const includesSpaceSeparatedValue: <Value extends string>(input: string, value: Value) => input is SpaceSeparatedValue<Value>;
 export declare function combineSignals(signals: readonly (AbortSignal | undefined)[]): AbortController & Disposable;
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;AAC7C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;AAKzE,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,GAAG,CAAC,6BAA4C,CAAA;AAE5E;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,SAAS,MAAM,EACf,UAAU;IAAE,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,KACjC,WAAW,GAAG,UAmChB,CAAA;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEhE;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,OAAO,UAAU,CAAC,WA4BtC,CAAA;AAEN,qBAAa,iBAAiB,CAAC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3E,QAAQ,CAAC,WAAW,cAAoB;IAExC,gBAAgB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,cAAc,EAAE,MAAM,CAAC,EAC9D,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EACzD,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,GAC1C,IAAI;IAIP,mBAAmB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,cAAc,EAAE,MAAM,CAAC,EACjE,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EACzD,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,GACvC,IAAI;IAQP,mBAAmB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,cAAc,EAAE,MAAM,CAAC,EACjE,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,IAAI,CAAC,EAAE,SAAS,GACf,OAAO;CAKX;AAED,MAAM,MAAM,mBAAmB,CAAC,KAAK,SAAS,MAAM,IAChD,GAAG,KAAK,EAAE,GACV,GAAG,KAAK,IAAI,MAAM,EAAE,GACpB,GAAG,MAAM,IAAI,KAAK,EAAE,GACpB,GAAG,MAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAA;AAElC,eAAO,MAAM,2BAA2B,GAAI,KAAK,SAAS,MAAM,EAC9D,OAAO,MAAM,EACb,OAAO,KAAK,KACX,KAAK,IAAI,mBAAmB,CAAC,KAAK,CA+BpC,CAAA;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,GAgCrD,eAAe,GAAG,UAAU,CAClD"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;AAC7C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;AAEzE,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,GAAG,CAAC,6BAA4C,CAAA;AAE5E,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEhE;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,OAAO,UAAU,CAAC,WA4BtC,CAAA;AAEN,qBAAa,iBAAiB,CAAC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3E,QAAQ,CAAC,WAAW,cAAoB;IAExC,gBAAgB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,cAAc,EAAE,MAAM,CAAC,EAC9D,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EACzD,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,GAC1C,IAAI;IAIP,mBAAmB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,cAAc,EAAE,MAAM,CAAC,EACjE,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EACzD,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,GACvC,IAAI;IAQP,mBAAmB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,cAAc,EAAE,MAAM,CAAC,EACjE,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,IAAI,CAAC,EAAE,SAAS,GACf,OAAO;CAKX;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,GAC5C,eAAe,GAAG,UAAU,CAwB9B"}

package/dist/util.js

@@ -11,38 +11,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.includesSpaceSeparatedValue = exports.CustomEventTarget = exports.CustomEvent = exports.timeoutSignal = exports.ifString = void 0;
+exports.CustomEventTarget = exports.CustomEvent = exports.ifString = void 0;
 exports.contentMime = contentMime;
 exports.combineSignals = combineSignals;
-// @ts-expect-error
-Symbol.dispose ?? (Symbol.dispose = Symbol('@@dispose'));
 const ifString = (v) => (typeof v === 'string' ? v : undefined);
 exports.ifString = ifString;
-/**
- * @todo (?) move to common package
- */
-const timeoutSignal = (timeout, options) => {
-    if (!Number.isInteger(timeout) || timeout < 0) {
-        throw new TypeError('Expected a positive integer');
-    }
-    options?.signal?.throwIfAborted();
-    const controller = new AbortController();
-    const { signal } = controller;
-    options?.signal?.addEventListener('abort', (reason) => controller.abort(reason), { once: true, signal });
-    const timeoutId = setTimeout((err) => controller.abort(err), timeout, 
-    // create Error here to keep original stack trace
-    new Error('Timeout'));
-    timeoutId?.unref?.(); // NodeJS only
-    signal.addEventListener('abort', () => clearTimeout(timeoutId), {
-        once: true,
-        signal,
-    });
-    Object.defineProperty(signal, Symbol.dispose, {
-        value: () => controller.abort(),
-    });
-    return signal;
-};
-exports.timeoutSignal = timeoutSignal;
 function contentMime(headers) {
     return headers.get('content-type')?.split(';')[0].trim();
 }
@@ -98,57 +71,35 @@ class CustomEventTarget {
     }
 }
 exports.CustomEventTarget = CustomEventTarget;
-const includesSpaceSeparatedValue = (input, value) => {
-    if (value.length === 0)
-        throw new TypeError('Value cannot be empty');
-    if (value.includes(' '))
-        throw new TypeError('Value cannot contain spaces');
-    // Optimized version of:
-    // return input.split(' ').includes(value)
-    const inputLength = input.length;
-    const valueLength = value.length;
-    if (inputLength < valueLength)
-        return false;
-    let idx = input.indexOf(value);
-    let idxEnd;
-    while (idx !== -1) {
-        idxEnd = idx + valueLength;
-        if (
-        // at beginning or preceded by space
-        (idx === 0 || input[idx - 1] === ' ') &&
-            // at end or followed by space
-            (idxEnd === inputLength || input[idxEnd] === ' ')) {
-            return true;
-        }
-        idx = input.indexOf(value, idxEnd + 1);
-    }
-    return false;
-};
-exports.includesSpaceSeparatedValue = includesSpaceSeparatedValue;
 function combineSignals(signals) {
-    const controller = new AbortController();
+    const controller = new DisposableAbortController();
     const onAbort = function (_event) {
         const reason = new Error('This operation was aborted', {
             cause: this.reason,
         });
         controller.abort(reason);
     };
-    for (const sig of signals) {
-        if (!sig)
-            continue;
-        if (sig.aborted) {
-            // Remove "abort" listener that was added to sig in previous iterations
-            controller.abort();
-            throw new Error('One of the signals is already aborted', {
-                cause: sig.reason,
-            });
+    try {
+        for (const sig of signals) {
+            if (sig) {
+                sig.throwIfAborted();
+                sig.addEventListener('abort', onAbort, { signal: controller.signal });
+            }
         }
-        sig.addEventListener('abort', onAbort, { signal: controller.signal });
+        return controller;
+    }
+    catch (err) {
+        controller.abort(err);
+        throw err;
+    }
+}
+/**
+ * Allows using {@link AbortController} with the `using` keyword, in order to
+ * automatically abort them once the execution block ends.
+ */
+class DisposableAbortController extends AbortController {
+    [Symbol.dispose]() {
+        this.abort(new Error('AbortController was disposed'));
     }
-    controller[Symbol.dispose] = () => {
-        const reason = new Error('AbortController was disposed');
-        controller.abort(reason);
-    };
-    return controller;
 }
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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","sourcesContent":["export type Awaitable<T> = T | PromiseLike<T>\nexport type Simplify<T> = { [K in keyof T]: T[K] } & NonNullable<unknown>\n\nexport const ifString = <V>(v: V) => (typeof v === 'string' ? v : undefined)\n\nexport function contentMime(headers: Headers): string | undefined {\n  return headers.get('content-type')?.split(';')[0]!.trim()\n}\n\n/**\n * Ponyfill for `CustomEvent` constructor.\n */\nexport const CustomEvent: typeof globalThis.CustomEvent =\n  globalThis.CustomEvent ??\n  (() => {\n    class CustomEvent<T> extends Event {\n      #detail: T | null\n      constructor(type: string, options?: CustomEventInit<T>) {\n        if (!arguments.length) throw new TypeError('type argument is required')\n        super(type, options)\n        this.#detail = options?.detail ?? null\n      }\n      get detail() {\n        return this.#detail\n      }\n    }\n\n    Object.defineProperties(CustomEvent.prototype, {\n      [Symbol.toStringTag]: {\n        writable: false,\n        enumerable: false,\n        configurable: true,\n        value: 'CustomEvent',\n      },\n      detail: {\n        enumerable: true,\n      },\n    })\n\n    return CustomEvent\n  })()\n\nexport class CustomEventTarget<EventDetailMap extends Record<string, unknown>> {\n  readonly eventTarget = new EventTarget()\n\n  addEventListener<T extends Extract<keyof EventDetailMap, string>>(\n    type: T,\n    callback: (event: CustomEvent<EventDetailMap[T]>) => void,\n    options?: AddEventListenerOptions | boolean,\n  ): void {\n    this.eventTarget.addEventListener(type, callback as EventListener, options)\n  }\n\n  removeEventListener<T extends Extract<keyof EventDetailMap, string>>(\n    type: T,\n    callback: (event: CustomEvent<EventDetailMap[T]>) => void,\n    options?: EventListenerOptions | boolean,\n  ): void {\n    this.eventTarget.removeEventListener(\n      type,\n      callback as EventListener,\n      options,\n    )\n  }\n\n  dispatchCustomEvent<T extends Extract<keyof EventDetailMap, string>>(\n    type: T,\n    detail: EventDetailMap[T],\n    init?: EventInit,\n  ): boolean {\n    return this.eventTarget.dispatchEvent(\n      new CustomEvent(type, { ...init, detail }),\n    )\n  }\n}\n\nexport function combineSignals(\n  signals: readonly (AbortSignal | undefined)[],\n): AbortController & Disposable {\n  const controller = new DisposableAbortController()\n\n  const onAbort = function (this: AbortSignal, _event: Event) {\n    const reason = new Error('This operation was aborted', {\n      cause: this.reason,\n    })\n\n    controller.abort(reason)\n  }\n\n  try {\n    for (const sig of signals) {\n      if (sig) {\n        sig.throwIfAborted()\n        sig.addEventListener('abort', onAbort, { signal: controller.signal })\n      }\n    }\n\n    return controller\n  } catch (err) {\n    controller.abort(err)\n    throw err\n  }\n}\n\n/**\n * Allows using {@link AbortController} with the `using` keyword, in order to\n * automatically abort them once the execution block ends.\n */\nclass DisposableAbortController extends AbortController implements Disposable {\n  [Symbol.dispose]() {\n    this.abort(new Error('AbortController was disposed'))\n  }\n}\n"]}

package/dist/validate-client-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-client-metadata.d.ts","sourceRoot":"","sources":["../src/validate-client-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EACL,wBAAwB,EAGzB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,cAAc,EAAwB,MAAM,YAAY,CAAA;AAEjE,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,wBAAwB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,cAAc,CAsFhB"}
+{"version":3,"file":"validate-client-metadata.d.ts","sourceRoot":"","sources":["../src/validate-client-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EACL,wBAAwB,EAGzB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,cAAc,EAAwB,MAAM,YAAY,CAAA;AAEjE,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,wBAAwB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,cAAc,CAuGhB"}

package/dist/validate-client-metadata.js

@@ -39,18 +39,25 @@ function validateClientMetadata(input, keyset) {
             if (!methodAlg) {
                 throw new TypeError(`"token_endpoint_auth_signing_alg" must be provided when "token_endpoint_auth_method" is "${method}"`);
             }
-            const signingKeys = keyset
-                ? Array.from(keyset.list({ use: 'sig' })).filter((key) => key.isPrivate && key.kid)
-                : null;
-            if (!signingKeys?.some((key) => key.algorithms.includes(constants_js_1.FALLBACK_ALG))) {
-                throw new TypeError(`Client authentication method "${method}" requires at least one "${constants_js_1.FALLBACK_ALG}" signing key with a "kid" property`);
+            if (!keyset) {
+                throw new TypeError(`Client authentication method "${method}" requires a keyset`);
+            }
+            // @NOTE This reproduces the logic from `negotiateClientAuthMethod` at
+            // initialization time to ensure that every key that might end-up being
+            // used is indeed valid & advertised in the metadata.
+            const signingKeys = Array.from(keyset.list({ usage: 'sign' })).filter((key) => key.kid);
+            if (!signingKeys.length) {
+                throw new TypeError(`Client authentication method "${method}" requires at least one active signing key with a "kid" property`);
+            }
+            if (!signingKeys.some((key) => key.algorithms.includes(constants_js_1.FALLBACK_ALG))) {
+                throw new TypeError(`Client authentication method "${method}" requires at least one active "${constants_js_1.FALLBACK_ALG}" signing key`);
             }
             if (metadata.jwks) {
                 // Ensure that all the signing keys that could end-up being used are
                 // advertised in the JWKS.
                 for (const key of signingKeys) {
-                    if (!metadata.jwks.keys.some((k) => k.kid === key.kid)) {
-                        throw new TypeError(`Key with kid "${key.kid}" not found in jwks`);
+                    if (!metadata.jwks.keys.some((k) => k.kid === key.kid && !k.revoked)) {
+                        throw new TypeError(`Missing or inactive key "${key.kid}" in jwks. Make sure that every signing key of the Keyset is declared as an active key in the Metadata's JWKS.`);
                     }
                 }
             }

package/dist/validate-client-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-client-metadata.js","sourceRoot":"","sources":["../src/validate-client-metadata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate-client-metadata.js","sourceRoot":"","sources":["../src/validate-client-metadata.ts"],"names":[],"mappings":";;AASA,wDA0GC;AAlHD,sDAI6B;AAC7B,iDAA6C;AAC7C,yCAAiE;AAEjE,SAAgB,sBAAsB,CACpC,KAA+B,EAC/B,MAAe;IAEf,+DAA+D;IAC/D,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC;QACnD,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAA;IAC7C,CAAC;IAED,MAAM,QAAQ,GAAG,+BAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAElD,qBAAqB;IACrB,IAAI,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3C,IAAA,yCAA2B,EAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IACjD,CAAC;SAAM,CAAC;QACN,IAAA,6CAA+B,EAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;IACzC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CAAC,kDAAkD,CAAC,CAAA;IACzE,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAA;IAC7D,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,SAAS,CAAC,iDAAiD,CAAC,CAAA;IACxE,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,0BAA0B,CAAA;IAClD,MAAM,SAAS,GAAG,QAAQ,CAAC,+BAA+B,CAAA;IAC1D,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM;YACT,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,IAAI,SAAS,CACjB,gGAAgG,MAAM,GAAG,CAC1G,CAAA;YACH,CAAC;YACD,MAAK;QAEP,KAAK,iBAAiB,CAAC,CAAC,CAAC;YACvB,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,SAAS,CACjB,4FAA4F,MAAM,GAAG,CACtG,CAAA;YACH,CAAC;YAED,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,SAAS,CACjB,iCAAiC,MAAM,qBAAqB,CAC7D,CAAA;YACH,CAAC;YAED,sEAAsE;YACtE,uEAAuE;YACvE,qDAAqD;YACrD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CACnE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CACjB,CAAA;YAED,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;gBACxB,MAAM,IAAI,SAAS,CACjB,iCAAiC,MAAM,kEAAkE,CAC1G,CAAA;YACH,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,2BAAY,CAAC,CAAC,EAAE,CAAC;gBACtE,MAAM,IAAI,SAAS,CACjB,iCAAiC,MAAM,mCAAmC,2BAAY,eAAe,CACtG,CAAA;YACH,CAAC;YAED,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAClB,oEAAoE;gBACpE,0BAA0B;gBAC1B,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;oBAC9B,IACE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAChE,CAAC;wBACD,MAAM,IAAI,SAAS,CACjB,4BAA4B,GAAG,CAAC,GAAG,gHAAgH,CACpJ,CAAA;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAC7B,wEAAwE;gBACxE,wEAAwE;gBACxE,2CAA2C;YAC7C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,SAAS,CACjB,iCAAiC,MAAM,mBAAmB,CAC3D,CAAA;YACH,CAAC;YAED,MAAK;QACP,CAAC;QAED;YACE,MAAM,IAAI,SAAS,CACjB,mDAAmD,MAAM,EAAE,CAC5D,CAAA;IACL,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC","sourcesContent":["import { Keyset } from '@atproto/jwk'\nimport {\n  OAuthClientMetadataInput,\n  assertOAuthDiscoverableClientId,\n  assertOAuthLoopbackClientId,\n} from '@atproto/oauth-types'\nimport { FALLBACK_ALG } from './constants.js'\nimport { ClientMetadata, clientMetadataSchema } from './types.js'\n\nexport function validateClientMetadata(\n  input: OAuthClientMetadataInput,\n  keyset?: Keyset,\n): ClientMetadata {\n  // Allow to pass a keyset and omit the jwks/jwks_uri properties\n  if (!input.jwks && !input.jwks_uri && keyset?.size) {\n    input = { ...input, jwks: keyset.toJSON() }\n  }\n\n  const metadata = clientMetadataSchema.parse(input)\n\n  // Validate client ID\n  if (metadata.client_id.startsWith('http:')) {\n    assertOAuthLoopbackClientId(metadata.client_id)\n  } else {\n    assertOAuthDiscoverableClientId(metadata.client_id)\n  }\n\n  const scopes = metadata.scope?.split(' ')\n  if (!scopes?.includes('atproto')) {\n    throw new TypeError(`Client metadata must include the \"atproto\" scope`)\n  }\n\n  if (!metadata.response_types.includes('code')) {\n    throw new TypeError(`\"response_types\" must include \"code\"`)\n  }\n\n  if (!metadata.grant_types.includes('authorization_code')) {\n    throw new TypeError(`\"grant_types\" must include \"authorization_code\"`)\n  }\n\n  const method = metadata.token_endpoint_auth_method\n  const methodAlg = metadata.token_endpoint_auth_signing_alg\n  switch (method) {\n    case 'none':\n      if (methodAlg) {\n        throw new TypeError(\n          `\"token_endpoint_auth_signing_alg\" must not be provided when \"token_endpoint_auth_method\" is \"${method}\"`,\n        )\n      }\n      break\n\n    case 'private_key_jwt': {\n      if (!methodAlg) {\n        throw new TypeError(\n          `\"token_endpoint_auth_signing_alg\" must be provided when \"token_endpoint_auth_method\" is \"${method}\"`,\n        )\n      }\n\n      if (!keyset) {\n        throw new TypeError(\n          `Client authentication method \"${method}\" requires a keyset`,\n        )\n      }\n\n      // @NOTE This reproduces the logic from `negotiateClientAuthMethod` at\n      // initialization time to ensure that every key that might end-up being\n      // used is indeed valid & advertised in the metadata.\n      const signingKeys = Array.from(keyset.list({ usage: 'sign' })).filter(\n        (key) => key.kid,\n      )\n\n      if (!signingKeys.length) {\n        throw new TypeError(\n          `Client authentication method \"${method}\" requires at least one active signing key with a \"kid\" property`,\n        )\n      }\n\n      if (!signingKeys.some((key) => key.algorithms.includes(FALLBACK_ALG))) {\n        throw new TypeError(\n          `Client authentication method \"${method}\" requires at least one active \"${FALLBACK_ALG}\" signing key`,\n        )\n      }\n\n      if (metadata.jwks) {\n        // Ensure that all the signing keys that could end-up being used are\n        // advertised in the JWKS.\n        for (const key of signingKeys) {\n          if (\n            !metadata.jwks.keys.some((k) => k.kid === key.kid && !k.revoked)\n          ) {\n            throw new TypeError(\n              `Missing or inactive key \"${key.kid}\" in jwks. Make sure that every signing key of the Keyset is declared as an active key in the Metadata's JWKS.`,\n            )\n          }\n        }\n      } else if (metadata.jwks_uri) {\n        // @NOTE we only ensure that all the signing keys are referenced in JWKS\n        // when it is available (see previous \"if\") as we don't want to download\n        // that file here (for efficiency reasons).\n      } else {\n        throw new TypeError(\n          `Client authentication method \"${method}\" requires a JWKS`,\n        )\n      }\n\n      break\n    }\n\n    default:\n      throw new TypeError(\n        `Unsupported \"token_endpoint_auth_method\" value: ${method}`,\n      )\n  }\n\n  return metadata\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "license": "MIT",
   "description": "OAuth client for ATPROTO PDS. This package serves as common base for environment-specific implementations (NodeJS, Browser, React-Native).",
   "keywords": [
@@ -25,17 +25,18 @@
     }
   },
   "dependencies": {
+    "core-js": "^3",
     "multiformats": "^9.9.0",
     "zod": "^3.23.8",
-    "@atproto-labs/did-resolver": "0.2.1",
+    "@atproto-labs/did-resolver": "0.2.2",
     "@atproto-labs/fetch": "0.2.3",
-    "@atproto-labs/handle-resolver": "0.3.1",
-    "@atproto-labs/identity-resolver": "0.3.1",
+    "@atproto-labs/handle-resolver": "0.3.2",
+    "@atproto-labs/identity-resolver": "0.3.2",
     "@atproto-labs/simple-store": "0.3.0",
     "@atproto-labs/simple-store-memory": "0.1.4",
-    "@atproto/did": "0.2.0",
-    "@atproto/jwk": "0.5.0",
-    "@atproto/oauth-types": "0.4.1",
+    "@atproto/did": "0.2.1",
+    "@atproto/jwk": "0.6.0",
+    "@atproto/oauth-types": "0.4.2",
     "@atproto/xrpc": "0.7.5"
   },
   "devDependencies": {

package/src/index.ts

@@ -1,3 +1,5 @@
+import 'core-js/modules/es.symbol.dispose'
+
 export * from '@atproto-labs/did-resolver'
 export {
   FetchError,

package/src/oauth-client-auth.ts

@@ -44,12 +44,10 @@ export function negotiateClientAuthMethod(
     // @NOTE we can't use `keyset.findPrivateKey` here because we can't enforce
     // that the returned key contains a "kid". The following implementation is
     // more robust against keysets containing keys without a "kid" property.
-    for (const key of keyset.list({ use: 'sig', alg })) {
+    for (const key of keyset.list({ alg, usage: 'sign' })) {
       // Return the first key from the key set that matches the server's
       // supported algorithms.
-      if (key.isPrivate && key.kid) {
-        return { method: 'private_key_jwt', kid: key.kid }
-      }
+      if (key.kid) return { method: 'private_key_jwt', kid: key.kid }
     }
 
     throw new Error(
@@ -111,7 +109,7 @@ export function createClientCredentialsFactory(
 
       // @NOTE throws if no matching key can be found
       const { key, alg } = keyset.findPrivateKey({
-        use: 'sig',
+        usage: 'sign',
         kid: authMethod.kid,
         alg: supportedAlgs(serverMetadata),
       })

package/src/oauth-client.ts

@@ -485,10 +485,7 @@ export class OAuthClient extends CustomEventTarget<OAuthClientEventMap> {
       dpopKey,
       authMethod = 'legacy',
       tokenSet,
-    } = await this.sessionGetter.get(sub, {
-      noCache: refresh === true,
-      allowStale: refresh === false,
-    })
+    } = await this.sessionGetter.getSession(sub, refresh)
 
     try {
       const server = await this.serverFactory.fromIssuer(

package/src/oauth-server-agent.ts

@@ -1,21 +1,19 @@
 import { AtprotoDid } from '@atproto/did'
 import { Key, Keyset } from '@atproto/jwk'
 import {
+  AtprotoOAuthScope,
+  AtprotoOAuthTokenResponse,
   OAuthAuthorizationRequestPar,
   OAuthAuthorizationServerMetadata,
   OAuthEndpointName,
   OAuthParResponse,
   OAuthRedirectUri,
   OAuthTokenRequest,
+  atprotoOAuthTokenResponseSchema,
   oauthParResponseSchema,
 } from '@atproto/oauth-types'
 import { Fetch, Json, bindFetch, fetchJsonProcessor } from '@atproto-labs/fetch'
 import { SimpleStore } from '@atproto-labs/simple-store'
-import {
-  AtprotoScope,
-  AtprotoTokenResponse,
-  atprotoTokenResponseSchema,
-} from './atproto-token-response.js'
 import { TokenRefreshError } from './errors/token-refresh-error.js'
 import { dpopFetchWrapper } from './fetch-dpop.js'
 import {
@@ -27,13 +25,14 @@ import { OAuthResolver } from './oauth-resolver.js'
 import { OAuthResponseError } from './oauth-response-error.js'
 import { Runtime } from './runtime.js'
 import { ClientMetadata } from './types.js'
-import { timeoutSignal } from './util.js'
+
+export type { AtprotoOAuthScope, AtprotoOAuthTokenResponse }
 
 export type TokenSet = {
   iss: string
   sub: AtprotoDid
   aud: string
-  scope: AtprotoScope
+  scope: AtprotoOAuthScope
 
   refresh_token?: string
   access_token: string
@@ -187,12 +186,10 @@ export class OAuthServerAgent {
    * @returns The user's PDS URL (the resource server for the user)
    */
   protected async verifyIssuer(sub: AtprotoDid): Promise<string> {
-    using signal = timeoutSignal(10e3)
-
     const resolved = await this.oauthResolver.resolveFromIdentity(sub, {
       noCache: true,
       allowStale: false,
-      signal,
+      signal: AbortSignal.timeout(10e3),
     })
 
     if (this.issuer !== resolved.metadata.issuer) {
@@ -214,7 +211,7 @@ export class OAuthServerAgent {
         : Record<string, unknown>,
   ): Promise<
     Endpoint extends 'token'
-      ? AtprotoTokenResponse
+      ? AtprotoOAuthTokenResponse
       : Endpoint extends 'pushed_authorization_request'
         ? OAuthParResponse
         : Json
@@ -244,7 +241,7 @@ export class OAuthServerAgent {
     if (response.ok) {
       switch (endpoint) {
         case 'token':
-          return atprotoTokenResponseSchema.parse(json)
+          return atprotoOAuthTokenResponseSchema.parse(json)
         case 'pushed_authorization_request':
           return oauthParResponseSchema.parse(json)
         default:

package/src/oauth-session.ts

@@ -1,7 +1,9 @@
 import { AtprotoDid } from '@atproto/did'
-import { OAuthAuthorizationServerMetadata } from '@atproto/oauth-types'
+import {
+  AtprotoOAuthScope,
+  OAuthAuthorizationServerMetadata,
+} from '@atproto/oauth-types'
 import { Fetch, bindFetch } from '@atproto-labs/fetch'
-import { AtprotoScope } from './atproto-token-response.js'
 import { TokenInvalidError } from './errors/token-invalid-error.js'
 import { TokenRevokedError } from './errors/token-revoked-error.js'
 import { dpopFetchWrapper } from './fetch-dpop.js'
@@ -12,10 +14,11 @@ const ReadableStream = globalThis.ReadableStream as
   | typeof globalThis.ReadableStream
   | undefined
 
+export type { AtprotoDid, AtprotoOAuthScope }
 export type TokenInfo = {
   expiresAt?: Date
   expired?: boolean
-  scope: AtprotoScope
+  scope: AtprotoOAuthScope
   iss: string
   aud: string
   sub: AtprotoDid

package/src/session-getter.ts

@@ -14,7 +14,7 @@ import { OAuthResponseError } from './oauth-response-error.js'
 import { TokenSet } from './oauth-server-agent.js'
 import { OAuthServerFactory } from './oauth-server-factory.js'
 import { Runtime } from './runtime.js'
-import { CustomEventTarget, combineSignals, timeoutSignal } from './util.js'
+import { CustomEventTarget, combineSignals } from './util.js'
 
 export type Session = {
   dpopKey: Key
@@ -264,7 +264,7 @@ export class SessionGetter extends CachedGetter<AtprotoDid, Session> {
    * if they are expired. When `undefined`, the credentials will be refreshed
    * if, and only if, they are (about to be) expired. Defaults to `undefined`.
    */
-  async getSession(sub: AtprotoDid, refresh?: boolean) {
+  async getSession(sub: AtprotoDid, refresh: boolean | 'auto' = 'auto') {
     return this.get(sub, {
       noCache: refresh === true,
       allowStale: refresh === false,
@@ -277,7 +277,7 @@ export class SessionGetter extends CachedGetter<AtprotoDid, Session> {
       async () => {
         // Make sure, even if there is no signal in the options, that the
         // request will be cancelled after at most 30 seconds.
-        using signal = timeoutSignal(30e3, options)
+        const signal = AbortSignal.timeout(30e3)
 
         using abortController = combineSignals([options?.signal, signal])