@atproto/oauth-client-node 0.2.24 → 0.3.1

package/README.md

@@ -38,9 +38,11 @@ const client = new NodeOAuthClient({
     policy_uri: 'https://my-app.com/policy',
     redirect_uris: ['https://my-app.com/callback'],
     grant_types: ['authorization_code', 'refresh_token'],
+    scope: 'atproto transition:generic',
     response_types: ['code'],
     application_type: 'web',
     token_endpoint_auth_method: 'private_key_jwt',
+    token_endpoint_auth_signing_alg: 'RS256',
     dpop_bound_access_tokens: true,
     jwks_uri: 'https://my-app.com/jwks.json',
   },
@@ -48,9 +50,9 @@ const client = new NodeOAuthClient({
   // Used to authenticate the client to the token endpoint. Will be used to
   // build the jwks object to be exposed on the "jwks_uri" endpoint.
   keyset: await Promise.all([
-    JoseKey.fromImportable(process.env.PRIVATE_KEY_1),
-    JoseKey.fromImportable(process.env.PRIVATE_KEY_2),
-    JoseKey.fromImportable(process.env.PRIVATE_KEY_3),
+    JoseKey.fromImportable(process.env.PRIVATE_KEY_1, 'key1'),
+    JoseKey.fromImportable(process.env.PRIVATE_KEY_2, 'key2'),
+    JoseKey.fromImportable(process.env.PRIVATE_KEY_3, 'key3'),
   ]),
 
   // Interface to store authorization state data (during authorization flows)

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from '@atproto-labs/handle-resolver-node';
 export * from '@atproto/jwk-webcrypto';
 export * from '@atproto/oauth-client';
+export * from '@atproto/jwk-jose';
 export * from './node-oauth-client.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAA;AAClD,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AAErC,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAA;AAClD,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AAEjC,cAAc,wBAAwB,CAAA"}

package/dist/index.js

@@ -17,5 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("@atproto-labs/handle-resolver-node"), exports);
 __exportStar(require("@atproto/jwk-webcrypto"), exports);
 __exportStar(require("@atproto/oauth-client"), exports);
+__exportStar(require("@atproto/jwk-jose"), exports);
 __exportStar(require("./node-oauth-client.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qEAAkD;AAClD,yDAAsC;AACtC,wDAAqC;AAErC,yDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qEAAkD;AAClD,yDAAsC;AACtC,wDAAqC;AACrC,oDAAiC;AAEjC,yDAAsC"}

package/dist/node-oauth-client.d.ts

@@ -1,19 +1,30 @@
-import { OAuthClient, OAuthClientFetchMetadataOptions, OAuthClientOptions, RuntimeLock } from '@atproto/oauth-client';
+import { HandleResolver, OAuthClient, OAuthClientFetchMetadataOptions, OAuthClientOptions, RuntimeImplementation, RuntimeLock } from '@atproto/oauth-client';
 import { OAuthResponseMode } from '@atproto/oauth-types';
 import { AtprotoHandleResolverNodeOptions } from '@atproto-labs/handle-resolver-node';
 import { NodeSavedSessionStore, NodeSavedStateStore } from './node-dpop-store.js';
+import { Override } from './util.js';
 export type * from './node-dpop-store.js';
 export type { OAuthClientOptions, OAuthResponseMode, RuntimeLock };
-export type NodeOAuthClientOptions = Omit<OAuthClientOptions, 'responseMode' | 'stateStore' | 'sessionStore' | 'runtimeImplementation' | 'handleResolver'> & {
+export type NodeOAuthClientOptions = Override<OAuthClientOptions, {
     responseMode?: Exclude<OAuthResponseMode, 'fragment'>;
     stateStore: NodeSavedStateStore;
     sessionStore: NodeSavedSessionStore;
+    /**
+     * Used to build a {@link NodeOAuthClientOptions.handleResolver} if none is
+     * provided.
+     */
     fallbackNameservers?: AtprotoHandleResolverNodeOptions['fallbackNameservers'];
+    handleResolver?: HandleResolver | string | URL;
+    /**
+     * Used to build a {@link NodeOAuthClientOptions.runtimeImplementation} if
+     * none is provided. Pass in `requestLocalLock` from `@atproto/oauth-client`
+     * to mute warning.
+     */
     requestLock?: RuntimeLock;
-};
+    runtimeImplementation?: RuntimeImplementation;
+}>;
 export type NodeOAuthClientFromMetadataOptions = OAuthClientFetchMetadataOptions & Omit<NodeOAuthClientOptions, 'clientMetadata'>;
 export declare class NodeOAuthClient extends OAuthClient {
-    static fromClientId(options: NodeOAuthClientFromMetadataOptions): Promise<NodeOAuthClient>;
-    constructor({ fetch, responseMode, fallbackNameservers, stateStore, sessionStore, requestLock, ...options }: NodeOAuthClientOptions);
+    constructor({ requestLock, fallbackNameservers, fetch, responseMode, stateStore, sessionStore, handleResolver, runtimeImplementation, ...options }: NodeOAuthClientOptions);
 }
 //# sourceMappingURL=node-oauth-client.d.ts.map

package/dist/node-oauth-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-oauth-client.d.ts","sourceRoot":"","sources":["../src/node-oauth-client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,+BAA+B,EAC/B,kBAAkB,EAClB,WAAW,EACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAEL,gCAAgC,EACjC,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EAEpB,MAAM,sBAAsB,CAAA;AAE7B,mBAAmB,sBAAsB,CAAA;AACzC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAA;AAElE,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,kBAAkB,EAEhB,cAAc,GACd,YAAY,GACZ,cAAc,GAEd,uBAAuB,GACvB,gBAAgB,CACnB,GAAG;IACF,YAAY,CAAC,EAAE,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAA;IAErD,UAAU,EAAE,mBAAmB,CAAA;IAC/B,YAAY,EAAE,qBAAqB,CAAA;IAEnC,mBAAmB,CAAC,EAAE,gCAAgC,CAAC,qBAAqB,CAAC,CAAA;IAC7E,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,kCAAkC,GAC5C,+BAA+B,GAC7B,IAAI,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,CAAA;AAElD,qBAAa,eAAgB,SAAQ,WAAW;WACjC,YAAY,CAAC,OAAO,EAAE,kCAAkC;gBAKzD,EACV,KAAK,EACL,YAAsB,EACtB,mBAAmB,EAEnB,UAAU,EACV,YAAY,EACZ,WAAuB,EAEvB,GAAG,OAAO,EACX,EAAE,sBAAsB;CA2B1B"}
+{"version":3,"file":"node-oauth-client.d.ts","sourceRoot":"","sources":["../src/node-oauth-client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,WAAW,EACX,+BAA+B,EAC/B,kBAAkB,EAClB,qBAAqB,EACrB,WAAW,EACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAEL,gCAAgC,EACjC,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EAEpB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,mBAAmB,sBAAsB,CAAA;AACzC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAA;AAElE,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAC3C,kBAAkB,EAClB;IACE,YAAY,CAAC,EAAE,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAA;IAErD,UAAU,EAAE,mBAAmB,CAAA;IAC/B,YAAY,EAAE,qBAAqB,CAAA;IAEnC;;;OAGG;IACH,mBAAmB,CAAC,EAAE,gCAAgC,CAAC,qBAAqB,CAAC,CAAA;IAE7E,cAAc,CAAC,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,CAAA;IAE9C;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IAEzB,qBAAqB,CAAC,EAAE,qBAAqB,CAAA;CAC9C,CACF,CAAA;AAED,MAAM,MAAM,kCAAkC,GAC5C,+BAA+B,GAC7B,IAAI,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,CAAA;AAElD,qBAAa,eAAgB,SAAQ,WAAW;gBAClC,EACV,WAAuB,EACvB,mBAA+B,EAE/B,KAAK,EACL,YAAsB,EAEtB,UAAU,EACV,YAAY,EAEZ,cAGE,EAEF,qBAMC,EAED,GAAG,OAAO,EACX,EAAE,sBAAsB;CAkB1B"}

package/dist/node-oauth-client.js

@@ -7,12 +7,16 @@ const oauth_client_1 = require("@atproto/oauth-client");
 const handle_resolver_node_1 = require("@atproto-labs/handle-resolver-node");
 const node_dpop_store_js_1 = require("./node-dpop-store.js");
 class NodeOAuthClient extends oauth_client_1.OAuthClient {
-    static async fromClientId(options) {
-        const clientMetadata = await oauth_client_1.OAuthClient.fetchMetadata(options);
-        return new NodeOAuthClient({ ...options, clientMetadata });
-    }
-    constructor({ fetch, responseMode = 'query', fallbackNameservers, stateStore, sessionStore, requestLock = undefined, ...options }) {
-        if (!requestLock) {
+    constructor({ requestLock = undefined, fallbackNameservers = undefined, fetch, responseMode = 'query', stateStore, sessionStore, handleResolver = new handle_resolver_node_1.AtprotoHandleResolverNode({
+        fetch,
+        fallbackNameservers,
+    }), runtimeImplementation = {
+        requestLock,
+        createKey: (algs) => jwk_jose_1.JoseKey.generate(algs),
+        getRandomValues: node_crypto_1.randomBytes,
+        digest: (bytes, algorithm) => (0, node_crypto_1.createHash)(algorithm.name).update(bytes).digest(),
+    }, ...options }) {
+        if (!runtimeImplementation.requestLock) {
             // Ok if only one instance of the client is running at a time.
             console.warn('No lock mechanism provided. Credentials might get revoked.');
         }
@@ -20,16 +24,8 @@ class NodeOAuthClient extends oauth_client_1.OAuthClient {
             ...options,
             fetch,
             responseMode,
-            handleResolver: new handle_resolver_node_1.AtprotoHandleResolverNode({
-                fetch,
-                fallbackNameservers,
-            }),
-            runtimeImplementation: {
-                requestLock,
-                createKey: (algs) => jwk_jose_1.JoseKey.generate(algs),
-                getRandomValues: node_crypto_1.randomBytes,
-                digest: (bytes, algorithm) => (0, node_crypto_1.createHash)(algorithm.name).update(bytes).digest(),
-            },
+            handleResolver,
+            runtimeImplementation,
             stateStore: (0, node_dpop_store_js_1.toDpopKeyStore)(stateStore),
             sessionStore: (0, node_dpop_store_js_1.toDpopKeyStore)(sessionStore),
         });

package/dist/node-oauth-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-oauth-client.js","sourceRoot":"","sources":["../src/node-oauth-client.ts"],"names":[],"mappings":";;;AAAA,6CAAqD;AACrD,gDAA2C;AAC3C,wDAK8B;AAE9B,6EAG2C;AAC3C,6DAI6B;AA4B7B,MAAa,eAAgB,SAAQ,0BAAW;IAC9C,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAA2C;QACnE,MAAM,cAAc,GAAG,MAAM,0BAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAC/D,OAAO,IAAI,eAAe,CAAC,EAAE,GAAG,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;IAC5D,CAAC;IAED,YAAY,EACV,KAAK,EACL,YAAY,GAAG,OAAO,EACtB,mBAAmB,EAEnB,UAAU,EACV,YAAY,EACZ,WAAW,GAAG,SAAS,EAEvB,GAAG,OAAO,EACa;QACvB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,8DAA8D;YAC9D,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAA;QAC5E,CAAC;QAED,KAAK,CAAC;YACJ,GAAG,OAAO;YAEV,KAAK;YACL,YAAY;YACZ,cAAc,EAAE,IAAI,gDAAyB,CAAC;gBAC5C,KAAK;gBACL,mBAAmB;aACpB,CAAC;YACF,qBAAqB,EAAE;gBACrB,WAAW;gBACX,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC3C,eAAe,EAAE,yBAAW;gBAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAC3B,IAAA,wBAAU,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;aACpD;YAED,UAAU,EAAE,IAAA,mCAAc,EAAC,UAAU,CAAC;YACtC,YAAY,EAAE,IAAA,mCAAc,EAAC,YAAY,CAAC;SAC3C,CAAC,CAAA;IACJ,CAAC;CACF;AA3CD,0CA2CC"}
+{"version":3,"file":"node-oauth-client.js","sourceRoot":"","sources":["../src/node-oauth-client.ts"],"names":[],"mappings":";;;AAAA,6CAAqD;AACrD,gDAA2C;AAC3C,wDAO8B;AAE9B,6EAG2C;AAC3C,6DAI6B;AAqC7B,MAAa,eAAgB,SAAQ,0BAAW;IAC9C,YAAY,EACV,WAAW,GAAG,SAAS,EACvB,mBAAmB,GAAG,SAAS,EAE/B,KAAK,EACL,YAAY,GAAG,OAAO,EAEtB,UAAU,EACV,YAAY,EAEZ,cAAc,GAAG,IAAI,gDAAyB,CAAC;QAC7C,KAAK;QACL,mBAAmB;KACpB,CAAC,EAEF,qBAAqB,GAAG;QACtB,WAAW;QACX,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC3C,eAAe,EAAE,yBAAW;QAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAC3B,IAAA,wBAAU,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;KACpD,EAED,GAAG,OAAO,EACa;QACvB,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC;YACvC,8DAA8D;YAC9D,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAA;QAC5E,CAAC;QAED,KAAK,CAAC;YACJ,GAAG,OAAO;YAEV,KAAK;YACL,YAAY;YACZ,cAAc;YACd,qBAAqB;YAErB,UAAU,EAAE,IAAA,mCAAc,EAAC,UAAU,CAAC;YACtC,YAAY,EAAE,IAAA,mCAAc,EAAC,YAAY,CAAC;SAC3C,CAAC,CAAA;IACJ,CAAC;CACF;AA3CD,0CA2CC"}

package/dist/util.d.ts

@@ -0,0 +1,5 @@
+export type Simplify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export type Override<T, V> = Simplify<V & Omit<T, keyof V>>;
+//# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAA;AACvD,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA"}

package/dist/util.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-node",
-  "version": "0.2.24",
+  "version": "0.3.1",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the NodeJS",
   "keywords": [
@@ -31,15 +31,15 @@
     "dist"
   ],
   "dependencies": {
-    "@atproto-labs/did-resolver": "0.1.13",
-    "@atproto-labs/handle-resolver-node": "0.1.16",
+    "@atproto-labs/did-resolver": "0.2.0",
+    "@atproto-labs/handle-resolver-node": "0.1.18",
     "@atproto-labs/simple-store": "0.2.0",
     "@atproto/did": "0.1.5",
-    "@atproto/jwk": "0.3.0",
-    "@atproto/jwk-jose": "0.1.8",
-    "@atproto/jwk-webcrypto": "0.1.8",
-    "@atproto/oauth-client": "0.4.0",
-    "@atproto/oauth-types": "0.3.0"
+    "@atproto/jwk": "0.4.0",
+    "@atproto/jwk-jose": "0.1.9",
+    "@atproto/jwk-webcrypto": "0.1.9",
+    "@atproto/oauth-client": "0.4.2",
+    "@atproto/oauth-types": "0.3.1"
   },
   "devDependencies": {
     "typescript": "^5.6.3"