@atproto/oauth-client 0.3.22 → 0.4.0

package/dist/oauth-server-factory.d.ts

@@ -2,6 +2,7 @@ import { Key, Keyset } from '@atproto/jwk';
 import { OAuthAuthorizationServerMetadata } from '@atproto/oauth-types';
 import { Fetch } from '@atproto-labs/fetch';
 import { GetCachedOptions } from './oauth-authorization-server-metadata-resolver.js';
+import { ClientAuthMethod } from './oauth-client-auth.js';
 import { OAuthResolver } from './oauth-resolver.js';
 import { DpopNonceCache, OAuthServerAgent } from './oauth-server-agent.js';
 import { Runtime } from './runtime.js';
@@ -14,7 +15,19 @@ export declare class OAuthServerFactory {
     readonly keyset: Keyset | undefined;
     readonly dpopNonceCache: DpopNonceCache;
     constructor(clientMetadata: ClientMetadata, runtime: Runtime, resolver: OAuthResolver, fetch: Fetch, keyset: Keyset | undefined, dpopNonceCache: DpopNonceCache);
-    fromIssuer(issuer: string, dpopKey: Key, options?: GetCachedOptions): Promise<OAuthServerAgent>;
-    fromMetadata(serverMetadata: OAuthAuthorizationServerMetadata, dpopKey: Key): Promise<OAuthServerAgent>;
+    /**
+     * @param authMethod `undefined` means that we are restoring a session that
+     * was created before we started storing the `authMethod` in the session. In
+     * that case, we will use the first key from the keyset.
+     *
+     * Support for this might be removed in the future.
+     *
+     * @throws see {@link OAuthServerFactory.fromMetadata}
+     */
+    fromIssuer(issuer: string, authMethod: 'legacy' | ClientAuthMethod, dpopKey: Key, options?: GetCachedOptions): Promise<OAuthServerAgent>;
+    /**
+     * @throws see {@link OAuthServerAgent}
+     */
+    fromMetadata(serverMetadata: OAuthAuthorizationServerMetadata, authMethod: ClientAuthMethod, dpopKey: Key): Promise<OAuthServerAgent>;
 }
 //# sourceMappingURL=oauth-server-factory.d.ts.map

package/dist/oauth-server-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-server-factory.d.ts","sourceRoot":"","sources":["../src/oauth-server-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAA;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,qBAAa,kBAAkB;IAE3B,QAAQ,CAAC,cAAc,EAAE,cAAc;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,QAAQ,EAAE,aAAa;IAChC,QAAQ,CAAC,KAAK,EAAE,KAAK;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS;IACnC,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAL9B,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,cAAc,EAAE,cAAc;IAGnC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,gBAAgB;IAQnE,YAAY,CAChB,cAAc,EAAE,gCAAgC,EAChD,OAAO,EAAE,GAAG;CAaf"}
+{"version":3,"file":"oauth-server-factory.d.ts","sourceRoot":"","sources":["../src/oauth-server-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAA;AACpF,OAAO,EACL,gBAAgB,EAEjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,qBAAa,kBAAkB;IAE3B,QAAQ,CAAC,cAAc,EAAE,cAAc;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,QAAQ,EAAE,aAAa;IAChC,QAAQ,CAAC,KAAK,EAAE,KAAK;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS;IACnC,QAAQ,CAAC,cAAc,EAAE,cAAc;gBAL9B,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,cAAc,EAAE,cAAc;IAGzC;;;;;;;;OAQG;IACG,UAAU,CACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,QAAQ,GAAG,gBAAgB,EACvC,OAAO,EAAE,GAAG,EACZ,OAAO,CAAC,EAAE,gBAAgB;IAqB5B;;OAEG;IACG,YAAY,CAChB,cAAc,EAAE,gCAAgC,EAChD,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,GAAG;CAcf"}

package/dist/oauth-server-factory.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthServerFactory = void 0;
+const oauth_client_auth_js_1 = require("./oauth-client-auth.js");
 const oauth_server_agent_js_1 = require("./oauth-server-agent.js");
 class OAuthServerFactory {
     constructor(clientMetadata, runtime, resolver, fetch, keyset, dpopNonceCache) {
@@ -41,12 +42,30 @@ class OAuthServerFactory {
             value: dpopNonceCache
         });
     }
-    async fromIssuer(issuer, dpopKey, options) {
+    /**
+     * @param authMethod `undefined` means that we are restoring a session that
+     * was created before we started storing the `authMethod` in the session. In
+     * that case, we will use the first key from the keyset.
+     *
+     * Support for this might be removed in the future.
+     *
+     * @throws see {@link OAuthServerFactory.fromMetadata}
+     */
+    async fromIssuer(issuer, authMethod, dpopKey, options) {
         const serverMetadata = await this.resolver.getAuthorizationServerMetadata(issuer, options);
-        return this.fromMetadata(serverMetadata, dpopKey);
+        if (authMethod === 'legacy') {
+            // @NOTE Because we were previously not storing the authMethod in the
+            // session data, we provide a backwards compatible implementation by
+            // computing it here.
+            authMethod = (0, oauth_client_auth_js_1.negotiateClientAuthMethod)(serverMetadata, this.clientMetadata, this.keyset);
+        }
+        return this.fromMetadata(serverMetadata, authMethod, dpopKey);
     }
-    async fromMetadata(serverMetadata, dpopKey) {
-        return new oauth_server_agent_js_1.OAuthServerAgent(dpopKey, serverMetadata, this.clientMetadata, this.dpopNonceCache, this.resolver, this.runtime, this.keyset, this.fetch);
+    /**
+     * @throws see {@link OAuthServerAgent}
+     */
+    async fromMetadata(serverMetadata, authMethod, dpopKey) {
+        return new oauth_server_agent_js_1.OAuthServerAgent(authMethod, dpopKey, serverMetadata, this.clientMetadata, this.dpopNonceCache, this.resolver, this.runtime, this.keyset, this.fetch);
     }
 }
 exports.OAuthServerFactory = OAuthServerFactory;

package/dist/oauth-server-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-server-factory.js","sourceRoot":"","sources":["../src/oauth-server-factory.ts"],"names":[],"mappings":";;;AAKA,mEAA0E;AAI1E,MAAa,kBAAkB;IAC7B,YACW,cAA8B,EAC9B,OAAgB,EAChB,QAAuB,EACvB,KAAY,EACZ,MAA0B,EAC1B,cAA8B;QALvC;;;;mBAAS,cAAc;WAAgB;QACvC;;;;mBAAS,OAAO;WAAS;QACzB;;;;mBAAS,QAAQ;WAAe;QAChC;;;;mBAAS,KAAK;WAAO;QACrB;;;;mBAAS,MAAM;WAAoB;QACnC;;;;mBAAS,cAAc;WAAgB;IACtC,CAAC;IAEJ,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,OAAY,EAAE,OAA0B;QACvE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CACvE,MAAM,EACN,OAAO,CACR,CAAA;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,cAAgD,EAChD,OAAY;QAEZ,OAAO,IAAI,wCAAgB,CACzB,OAAO,EACP,cAAc,EACd,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,KAAK,CACX,CAAA;IACH,CAAC;CACF;AAjCD,gDAiCC"}
+{"version":3,"file":"oauth-server-factory.js","sourceRoot":"","sources":["../src/oauth-server-factory.ts"],"names":[],"mappings":";;;AAIA,iEAG+B;AAE/B,mEAA0E;AAI1E,MAAa,kBAAkB;IAC7B,YACW,cAA8B,EAC9B,OAAgB,EAChB,QAAuB,EACvB,KAAY,EACZ,MAA0B,EAC1B,cAA8B;QALvC;;;;mBAAS,cAAc;WAAgB;QACvC;;;;mBAAS,OAAO;WAAS;QACzB;;;;mBAAS,QAAQ;WAAe;QAChC;;;;mBAAS,KAAK;WAAO;QACrB;;;;mBAAS,MAAM;WAAoB;QACnC;;;;mBAAS,cAAc;WAAgB;IACtC,CAAC;IAEJ;;;;;;;;OAQG;IACH,KAAK,CAAC,UAAU,CACd,MAAc,EACd,UAAuC,EACvC,OAAY,EACZ,OAA0B;QAE1B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CACvE,MAAM,EACN,OAAO,CACR,CAAA;QAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,qEAAqE;YACrE,oEAAoE;YACpE,qBAAqB;YACrB,UAAU,GAAG,IAAA,gDAAyB,EACpC,cAAc,EACd,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,MAAM,CACZ,CAAA;QACH,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAChB,cAAgD,EAChD,UAA4B,EAC5B,OAAY;QAEZ,OAAO,IAAI,wCAAgB,CACzB,UAAU,EACV,OAAO,EACP,cAAc,EACd,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,KAAK,CACX,CAAA;IACH,CAAC;CACF;AAhED,gDAgEC"}

package/dist/session-getter.d.ts

@@ -4,11 +4,16 @@ import { CachedGetter, GetCachedOptions, SimpleStore } from '@atproto-labs/simpl
 import { TokenInvalidError } from './errors/token-invalid-error.js';
 import { TokenRefreshError } from './errors/token-refresh-error.js';
 import { TokenRevokedError } from './errors/token-revoked-error.js';
+import { ClientAuthMethod } from './oauth-client-auth.js';
 import { TokenSet } from './oauth-server-agent.js';
 import { OAuthServerFactory } from './oauth-server-factory.js';
 import { Runtime } from './runtime.js';
 export type Session = {
     dpopKey: Key;
+    /**
+     * Previous implementation of this lib did not define an `authMethod`
+     */
+    authMethod?: ClientAuthMethod;
     tokenSet: TokenSet;
 };
 export type SessionStore = SimpleStore<string, Session>;

package/dist/session-getter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-getter.d.ts","sourceRoot":"","sources":["../src/session-getter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACZ,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,QAAQ,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAA;KACZ,GAAG,OAAO,CAAA;IACX,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,OAAO,CAAA;KAC3E,CAAA;CACF,CAAA;AAED,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,MAAM,eAAe,GAAG,MAAM,eAAe,IACrD,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;AAEpD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC;IAMhE,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;gBAGrE,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,kBAAkB,EAChB,OAAO,EAAE,OAAO;IA4InC,gBAAgB,CAAC,CAAC,SAAS,MAAM,eAAe,EAC9C,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,EACjC,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO;IAK7C,mBAAmB,CAAC,CAAC,SAAS,MAAM,eAAe,EACjD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,EACjC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO;IAK1C,aAAa,CAAC,CAAC,SAAS,MAAM,eAAe,EAC3C,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,GACzB,OAAO;IAIJ,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAS9B,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzE;;;;;OAKG;IACG,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO;IAO7C,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBzE"}
+{"version":3,"file":"session-getter.d.ts","sourceRoot":"","sources":["../src/session-getter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACZ,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,GAAG,CAAA;IACZ;;OAEG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAA;IAC7B,QAAQ,EAAE,QAAQ,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEvD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAA;KACZ,GAAG,OAAO,CAAA;IACX,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,OAAO,CAAA;KAC3E,CAAA;CACF,CAAA;AAED,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,MAAM,eAAe,GAAG,MAAM,eAAe,IACrD,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;AAEpD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC;IAMhE,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;gBAGrE,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,kBAAkB,EAChB,OAAO,EAAE,OAAO;IAuKnC,gBAAgB,CAAC,CAAC,SAAS,MAAM,eAAe,EAC9C,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,EACjC,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO;IAK7C,mBAAmB,CAAC,CAAC,SAAS,MAAM,eAAe,EACjD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,EACjC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO;IAK1C,aAAa,CAAC,CAAC,SAAS,MAAM,eAAe,EAC3C,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,GACzB,OAAO;IAIJ,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAS9B,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzE;;;;;OAKG;IACG,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO;IAO7C,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBzE"}

package/dist/session-getter.js

@@ -54,6 +54,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionGetter = void 0;
 const simple_store_1 = require("@atproto-labs/simple-store");
+const auth_method_unsatisfiable_error_js_1 = require("./errors/auth-method-unsatisfiable-error.js");
 const token_invalid_error_js_1 = require("./errors/token-invalid-error.js");
 const token_refresh_error_js_1 = require("./errors/token-refresh-error.js");
 const token_revoked_error_js_1 = require("./errors/token-revoked-error.js");
@@ -88,7 +89,7 @@ class SessionGetter extends simple_store_1.CachedGetter {
             // dispatched, even if the session was removed from the store through a
             // concurrent access (which, normally, should not happen if a proper
             // runtime lock was provided).
-            const { dpopKey, tokenSet } = storedSession;
+            const { dpopKey, authMethod = 'legacy', tokenSet } = storedSession;
             if (sub !== tokenSet.sub) {
                 // Fool-proofing (e.g. against invalid session storage)
                 throw new token_refresh_error_js_1.TokenRefreshError(sub, 'Stored session sub mismatch');
@@ -105,7 +106,7 @@ class SessionGetter extends simple_store_1.CachedGetter {
             // is refreshing the token at a time (runtime.usingLock) but that is not
             // always possible. If no lock implementation is provided, we will use
             // the store to check if a concurrent refresh occurred.
-            const server = await serverFactory.fromIssuer(tokenSet.iss, dpopKey);
+            const server = await serverFactory.fromIssuer(tokenSet.iss, authMethod, dpopKey);
             // Because refresh tokens can only be used once, we must not use the
             // "signal" to abort the refresh, or throw any abort error beyond this
             // point. Any thrown error beyond this point will prevent the
@@ -118,7 +119,11 @@ class SessionGetter extends simple_store_1.CachedGetter {
                     // The server returned another sub. Was the tokenSet manipulated?
                     throw new token_refresh_error_js_1.TokenRefreshError(sub, 'Token set sub mismatch');
                 }
-                return { dpopKey, tokenSet: newTokenSet };
+                return {
+                    dpopKey,
+                    tokenSet: newTokenSet,
+                    authMethod: server.authMethod,
+                };
             }
             catch (cause) {
                 // If the refresh token is invalid, let's try to recover from
@@ -171,17 +176,25 @@ class SessionGetter extends simple_store_1.CachedGetter {
                             // instances trying to refresh the token at the same.
                             30e3 * Math.random());
             },
-            onStoreError: async (err, sub, { tokenSet, dpopKey }) => {
-                // If the token data cannot be stored, let's revoke it
-                const server = await serverFactory.fromIssuer(tokenSet.iss, dpopKey);
-                await server.revoke(tokenSet.refresh_token ?? tokenSet.access_token);
+            onStoreError: async (err, sub, { tokenSet, dpopKey, authMethod = 'legacy' }) => {
+                if (!(err instanceof auth_method_unsatisfiable_error_js_1.AuthMethodUnsatisfiableError)) {
+                    // If the error was an AuthMethodUnsatisfiableError, there is no
+                    // point in trying to call `fromIssuer`.
+                    try {
+                        // If the token data cannot be stored, let's revoke it
+                        const server = await serverFactory.fromIssuer(tokenSet.iss, authMethod, dpopKey);
+                        await server.revoke(tokenSet.refresh_token ?? tokenSet.access_token);
+                    }
+                    catch {
+                        // Let the original error propagate
+                    }
+                }
                 throw err;
             },
-            deleteOnError: async (err) => 
-            // Optimization: More likely to happen first
-            err instanceof token_refresh_error_js_1.TokenRefreshError ||
+            deleteOnError: async (err) => err instanceof token_refresh_error_js_1.TokenRefreshError ||
                 err instanceof token_revoked_error_js_1.TokenRevokedError ||
-                err instanceof token_invalid_error_js_1.TokenInvalidError,
+                err instanceof token_invalid_error_js_1.TokenInvalidError ||
+                err instanceof auth_method_unsatisfiable_error_js_1.AuthMethodUnsatisfiableError,
         });
         Object.defineProperty(this, "runtime", {
             enumerable: true,

package/dist/session-getter.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-getter.js","sourceRoot":"","sources":["../src/session-getter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6DAImC;AACnC,4EAAmE;AACnE,4EAAmE;AACnE,4EAAmE;AACnE,uEAA8D;AAI9D,uCAA4E;AAuB5E;;;;;;GAMG;AACH,MAAa,aAAc,SAAQ,2BAAiC;IAGlE,YACE,YAA0B,EAC1B,aAAiC,EAChB,OAAgB;QAEjC,KAAK,CACH,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAoB,EAAE;YACtD,iEAAiE;YACjE,uEAAuE;YACvE,+BAA+B;YAC/B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,mEAAmE;gBACnE,iEAAiE;gBACjE,iEAAiE;gBACjE,mEAAmE;gBACnE,wDAAwD;gBACxD,MAAM,GAAG,GAAG,4CAA4C,CAAA;gBACxD,MAAM,KAAK,GAAG,IAAI,0CAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBAC7C,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC7C,MAAM,KAAK,CAAA;YACb,CAAC;YAED,uEAAuE;YACvE,6DAA6D;YAC7D,uEAAuE;YACvE,oEAAoE;YACpE,8BAA8B;YAE9B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAA;YAE3C,IAAI,GAAG,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC;gBACzB,uDAAuD;gBACvD,MAAM,IAAI,0CAAiB,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAA;YACjE,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAC5B,MAAM,IAAI,0CAAiB,CAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;YAChE,CAAC;YAED,gEAAgE;YAChE,mEAAmE;YACnE,uEAAuE;YACvE,kEAAkE;YAClE,oEAAoE;YACpE,wEAAwE;YACxE,wEAAwE;YACxE,sEAAsE;YACtE,uDAAuD;YAEvD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAEpE,oEAAoE;YACpE,sEAAsE;YACtE,6DAA6D;YAC7D,8DAA8D;YAC9D,8DAA8D;YAC9D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;YAEjC,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAElD,IAAI,GAAG,KAAK,WAAW,CAAC,GAAG,EAAE,CAAC;oBAC5B,iEAAiE;oBACjE,MAAM,IAAI,0CAAiB,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;gBAC5D,CAAC;gBAED,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;YAC3C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,6DAA6D;gBAC7D,sEAAsE;gBACtE,uBAAuB;gBACvB,IACE,KAAK,YAAY,4CAAkB;oBACnC,KAAK,CAAC,MAAM,KAAK,GAAG;oBACpB,KAAK,CAAC,KAAK,KAAK,eAAe,EAC/B,CAAC;oBACD,kEAAkE;oBAClE,iEAAiE;oBACjE,kEAAkE;oBAClE,8DAA8D;oBAC9D,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;wBACnC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;wBAE7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;wBACxC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;4BACzB,6DAA6D;4BAC7D,sDAAsD;4BAEtD,sDAAsD;4BACtD,0DAA0D;4BAC1D,+CAA+C;4BAC/C,MAAM,GAAG,GAAG,4CAA4C,CAAA;4BACxD,MAAM,IAAI,0CAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;wBAClD,CAAC;6BAAM,IACL,MAAM,CAAC,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC,YAAY;4BACtD,MAAM,CAAC,QAAQ,CAAC,aAAa,KAAK,QAAQ,CAAC,aAAa,EACxD,CAAC;4BACD,6DAA6D;4BAC7D,OAAO,MAAM,CAAA;wBACf,CAAC;6BAAM,CAAC;4BACN,0DAA0D;4BAC1D,0BAA0B;wBAC5B,CAAC;oBACH,CAAC;oBAED,oDAAoD;oBACpD,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgB,IAAI,yBAAyB,CAAA;oBAC/D,MAAM,IAAI,0CAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;gBAClD,CAAC;gBAED,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC,EACD,YAAY,EACZ;YACE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC7B,OAAO,CACL,QAAQ,CAAC,UAAU,IAAI,IAAI;oBAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;wBACrC,IAAI,CAAC,GAAG,EAAE;4BACR,8DAA8D;4BAC9D,sBAAsB;4BACtB,IAAI;4BACJ,wDAAwD;4BACxD,qDAAqD;4BACrD,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CACzB,CAAA;YACH,CAAC;YACD,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;gBACtD,sDAAsD;gBACtD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;gBACpE,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAA;gBACpE,MAAM,GAAG,CAAA;YACX,CAAC;YACD,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC3B,4CAA4C;YAC5C,GAAG,YAAY,0CAAiB;gBAChC,GAAG,YAAY,0CAAiB;gBAChC,GAAG,YAAY,0CAAiB;SACnC,CACF,CAAA;QAzID;;;;mBAAiB,OAAO;WAAS;QALlB;;;;mBAAc,IAAI,2BAAiB,EAAmB;WAAA;IA+IvE,CAAC;IAED,gBAAgB,CACd,IAAO,EACP,QAAiC,EACjC,OAA2C;QAE3C,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC5D,CAAC;IAED,mBAAmB,CACjB,IAAO,EACP,QAAiC,EACjC,OAAwC;QAExC,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;IAED,aAAa,CACX,IAAO,EACP,MAA0B;QAE1B,OAAO,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,OAAgB;QAC3C,0CAA0C;QAC1C,IAAI,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjC,MAAM,IAAI,SAAS,CAAC,2CAA2C,CAAC,CAAA;QAClE,CAAC;QACD,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACnC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;IACpD,CAAC;IAEQ,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,KAAe;QACvD,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACjC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,GAAe,EAAE,OAAiB;QACjD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE;YACnB,OAAO,EAAE,OAAO,KAAK,IAAI;YACzB,UAAU,EAAE,OAAO,KAAK,KAAK;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAe,EAAE,OAA0B;QACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC1C,yBAAyB,GAAG,EAAE,EAC9B,KAAK,IAAI,EAAE;;;gBACT,iEAAiE;gBACjE,sDAAsD;gBACtD,MAAM,MAAM,kCAAG,IAAA,uBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,QAAA,CAAA;gBAE3C,MAAM,eAAe,kCAAG,IAAA,wBAAc,EAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAA,CAAA;gBAEjE,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;oBAC1B,GAAG,OAAO;oBACV,MAAM,EAAE,eAAe,CAAC,MAAM;iBAC/B,CAAC,CAAA;;;;;;;;;SACH,CACF,CAAA;QAED,IAAI,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjC,uDAAuD;YACvD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAC9D,CAAC;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;CACF;AA5ND,sCA4NC"}
+{"version":3,"file":"session-getter.js","sourceRoot":"","sources":["../src/session-getter.ts"],"names":[],"mappings":"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"}

package/dist/state-store.d.ts

@@ -1,8 +1,11 @@
 import { Key } from '@atproto/jwk';
 import { SimpleStore } from '@atproto-labs/simple-store';
+import { ClientAuthMethod } from './oauth-client-auth.js';
 export type InternalStateData = {
     iss: string;
     dpopKey: Key;
+    /** @note optional for legacy reasons */
+    authMethod?: ClientAuthMethod;
     verifier?: string;
     appState?: string;
 };

package/dist/state-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-store.d.ts","sourceRoot":"","sources":["../src/state-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"state-store.d.ts","sourceRoot":"","sources":["../src/state-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,GAAG,CAAA;IACZ,wCAAwC;IACxC,UAAU,CAAC,EAAE,gBAAgB,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA"}

package/dist/types.d.ts

@@ -9,7 +9,7 @@ export declare const clientMetadataSchema: z.ZodObject<z.objectUtil.extendShape<
     response_types: z.ZodDefault<z.ZodArray<z.ZodEnum<["code", "token", "none", "code id_token token", "code id_token", "code token", "id_token token", "id_token"]>, "atleastone">>;
     grant_types: z.ZodDefault<z.ZodArray<z.ZodEnum<["authorization_code", "implicit", "refresh_token", "password", "client_credentials", "urn:ietf:params:oauth:grant-type:jwt-bearer", "urn:ietf:params:oauth:grant-type:saml2-bearer"]>, "atleastone">>;
     scope: z.ZodOptional<z.ZodString>;
-    token_endpoint_auth_method: z.ZodOptional<z.ZodDefault<z.ZodEnum<["client_secret_basic", "client_secret_jwt", "client_secret_post", "none", "private_key_jwt", "self_signed_tls_client_auth", "tls_client_auth"]>>>;
+    token_endpoint_auth_method: z.ZodDefault<z.ZodEnum<["client_secret_basic", "client_secret_jwt", "client_secret_post", "none", "private_key_jwt", "self_signed_tls_client_auth", "tls_client_auth"]>>;
     token_endpoint_auth_signing_alg: z.ZodOptional<z.ZodString>;
     userinfo_signed_response_alg: z.ZodOptional<z.ZodString>;
     userinfo_encrypted_response_alg: z.ZodOptional<z.ZodString>;
@@ -1277,11 +1277,11 @@ export declare const clientMetadataSchema: z.ZodObject<z.objectUtil.extendShape<
             x5u?: string | undefined;
         })[];
     }>>;
-    application_type: z.ZodOptional<z.ZodDefault<z.ZodEnum<["web", "native"]>>>;
-    subject_type: z.ZodOptional<z.ZodDefault<z.ZodEnum<["public", "pairwise"]>>>;
+    application_type: z.ZodDefault<z.ZodEnum<["web", "native"]>>;
+    subject_type: z.ZodDefault<z.ZodEnum<["public", "pairwise"]>>;
     request_object_signing_alg: z.ZodOptional<z.ZodString>;
     id_token_signed_response_alg: z.ZodOptional<z.ZodString>;
-    authorization_signed_response_alg: z.ZodOptional<z.ZodDefault<z.ZodString>>;
+    authorization_signed_response_alg: z.ZodDefault<z.ZodString>;
     authorization_encrypted_response_enc: z.ZodOptional<z.ZodEnum<["A128CBC-HS256"]>>;
     authorization_encrypted_response_alg: z.ZodOptional<z.ZodString>;
     client_id: z.ZodOptional<z.ZodString>;
@@ -1303,8 +1303,11 @@ export declare const clientMetadataSchema: z.ZodObject<z.objectUtil.extendShape<
     redirect_uris: [`http://[::1]${string}` | "http://127.0.0.1" | `http://127.0.0.1#${string}` | `http://127.0.0.1?${string}` | `http://127.0.0.1/${string}` | `http://127.0.0.1:${string}` | `https://${string}` | `${string}.${string}:/${string}`, ...(`http://[::1]${string}` | "http://127.0.0.1" | `http://127.0.0.1#${string}` | `http://127.0.0.1?${string}` | `http://127.0.0.1/${string}` | `http://127.0.0.1:${string}` | `https://${string}` | `${string}.${string}:/${string}`)[]];
     response_types: ["code" | "id_token" | "token" | "none" | "code id_token token" | "code id_token" | "code token" | "id_token token", ...("code" | "id_token" | "token" | "none" | "code id_token token" | "code id_token" | "code token" | "id_token token")[]];
     grant_types: ["refresh_token" | "authorization_code" | "implicit" | "password" | "client_credentials" | "urn:ietf:params:oauth:grant-type:jwt-bearer" | "urn:ietf:params:oauth:grant-type:saml2-bearer", ...("refresh_token" | "authorization_code" | "implicit" | "password" | "client_credentials" | "urn:ietf:params:oauth:grant-type:jwt-bearer" | "urn:ietf:params:oauth:grant-type:saml2-bearer")[]];
+    token_endpoint_auth_method: "none" | "client_secret_basic" | "client_secret_jwt" | "client_secret_post" | "private_key_jwt" | "self_signed_tls_client_auth" | "tls_client_auth";
+    application_type: "web" | "native";
+    subject_type: "public" | "pairwise";
+    authorization_signed_response_alg: string;
     scope?: string | undefined;
-    token_endpoint_auth_method?: "none" | "client_secret_basic" | "client_secret_jwt" | "client_secret_post" | "private_key_jwt" | "self_signed_tls_client_auth" | "tls_client_auth" | undefined;
     token_endpoint_auth_signing_alg?: string | undefined;
     userinfo_signed_response_alg?: string | undefined;
     userinfo_encrypted_response_alg?: string | undefined;
@@ -1407,11 +1410,8 @@ export declare const clientMetadataSchema: z.ZodObject<z.objectUtil.extendShape<
             x5u?: string | undefined;
         })[];
     } | undefined;
-    application_type?: "web" | "native" | undefined;
-    subject_type?: "public" | "pairwise" | undefined;
     request_object_signing_alg?: string | undefined;
     id_token_signed_response_alg?: string | undefined;
-    authorization_signed_response_alg?: string | undefined;
     authorization_encrypted_response_enc?: "A128CBC-HS256" | undefined;
     authorization_encrypted_response_alg?: string | undefined;
     client_name?: string | undefined;

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/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;AAC7B,OAAO,EAAE,cAAc,EAAwB,MAAM,YAAY,CAAA;AAKjE,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,wBAAwB,EAC/B,MAAM,CAAC,EAAE,MAAM,GACd,cAAc,CAuEhB"}
+{"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"}

package/dist/validate-client-metadata.js

@@ -2,23 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateClientMetadata = validateClientMetadata;
 const oauth_types_1 = require("@atproto/oauth-types");
+const constants_js_1 = require("./constants.js");
 const types_js_1 = require("./types.js");
-const TOKEN_ENDPOINT_AUTH_METHOD = `token_endpoint_auth_method`;
-const TOKEN_ENDPOINT_AUTH_SIGNING_ALG = `token_endpoint_auth_signing_alg`;
 function validateClientMetadata(input, keyset) {
-    if (input.jwks) {
-        if (!keyset) {
-            throw new TypeError(`Keyset must not be provided when jwks is provided`);
-        }
-        for (const key of input.jwks.keys) {
-            if (!key.kid) {
-                throw new TypeError(`Key must have a "kid" property`);
-            }
-            else if (!keyset.has(key.kid)) {
-                throw new TypeError(`Key with kid "${key.kid}" not found in keyset`);
-            }
-        }
-    }
     // Allow to pass a keyset and omit the jwks/jwks_uri properties
     if (!input.jwks && !input.jwks_uri && keyset?.size) {
         input = { ...input, jwks: keyset.toJSON() };
@@ -41,25 +27,45 @@ function validateClientMetadata(input, keyset) {
     if (!metadata.grant_types.includes('authorization_code')) {
         throw new TypeError(`"grant_types" must include "authorization_code"`);
     }
-    const method = metadata[TOKEN_ENDPOINT_AUTH_METHOD];
+    const method = metadata.token_endpoint_auth_method;
+    const methodAlg = metadata.token_endpoint_auth_signing_alg;
     switch (method) {
-        case undefined:
-            throw new TypeError(`${TOKEN_ENDPOINT_AUTH_METHOD} must be provided`);
         case 'none':
-            if (metadata[TOKEN_ENDPOINT_AUTH_SIGNING_ALG]) {
-                throw new TypeError(`${TOKEN_ENDPOINT_AUTH_SIGNING_ALG} must not be provided when ${TOKEN_ENDPOINT_AUTH_METHOD} is "${method}"`);
+            if (methodAlg) {
+                throw new TypeError(`"token_endpoint_auth_signing_alg" must not be provided when "token_endpoint_auth_method" is "${method}"`);
             }
             break;
-        case 'private_key_jwt':
-            if (!keyset?.size) {
-                throw new TypeError(`A non-empty keyset must be provided when ${TOKEN_ENDPOINT_AUTH_METHOD} is "${method}"`);
+        case 'private_key_jwt': {
+            if (!methodAlg) {
+                throw new TypeError(`"token_endpoint_auth_signing_alg" must be provided when "token_endpoint_auth_method" is "${method}"`);
             }
-            if (!metadata[TOKEN_ENDPOINT_AUTH_SIGNING_ALG]) {
-                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 (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`);
+                    }
+                }
+            }
+            else if (metadata.jwks_uri) {
+                // @NOTE we only ensure that all the signing keys are referenced in JWKS
+                // when it is available (see previous "if") as we don't want to download
+                // that file here (for efficiency reasons).
+            }
+            else {
+                throw new TypeError(`Client authentication method "${method}" requires a JWKS`);
             }
             break;
+        }
         default:
-            throw new TypeError(`Invalid "token_endpoint_auth_method" value: ${method}`);
+            throw new TypeError(`Unsupported "token_endpoint_auth_method" value: ${method}`);
     }
     return metadata;
 }

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,wDAyFC;AAjGD,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,MAAM,WAAW,GAAG,MAAM;gBACxB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,CAClC;gBACH,CAAC,CAAC,IAAI,CAAA;YAER,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,2BAAY,CAAC,CAAC,EAAE,CAAC;gBACvE,MAAM,IAAI,SAAS,CACjB,iCAAiC,MAAM,4BAA4B,2BAAY,qCAAqC,CACrH,CAAA;YACH,CAAC;YAED,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAClB,oEAAoE;gBACpE,0BAA0B;gBAC1B,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;oBAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;wBACvD,MAAM,IAAI,SAAS,CAAC,iBAAiB,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAA;oBACpE,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client",
-  "version": "0.3.22",
+  "version": "0.4.0",
   "license": "MIT",
   "description": "OAuth client for ATPROTO PDS. This package serves as common base for environment-specific implementations (NodeJS, Browser, React-Native).",
   "keywords": [
@@ -34,8 +34,8 @@
     "@atproto-labs/simple-store": "0.2.0",
     "@atproto-labs/simple-store-memory": "0.1.3",
     "@atproto/did": "0.1.5",
-    "@atproto/jwk": "0.2.0",
-    "@atproto/oauth-types": "0.2.8",
+    "@atproto/jwk": "0.3.0",
+    "@atproto/oauth-types": "0.3.0",
     "@atproto/xrpc": "0.7.0"
   },
   "devDependencies": {

package/src/errors/auth-method-unsatisfiable-error.ts

@@ -0,0 +1 @@
+export class AuthMethodUnsatisfiableError extends Error {}