@keycardai/oauth 0.26.3 → 0.26.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/clientCredentials.d.ts +5 -0
- package/dist/cjs/clientCredentials.d.ts.map +1 -1
- package/dist/cjs/clientCredentials.js +5 -2
- package/dist/cjs/clientCredentials.js.map +1 -1
- package/dist/cjs/keyring.d.ts +7 -0
- package/dist/cjs/keyring.d.ts.map +1 -1
- package/dist/cjs/keyring.js +58 -10
- package/dist/cjs/keyring.js.map +1 -1
- package/dist/cjs/tokenEndpoint.d.ts +1 -0
- package/dist/cjs/tokenEndpoint.d.ts.map +1 -1
- package/dist/cjs/tokenEndpoint.js +3 -3
- package/dist/cjs/tokenEndpoint.js.map +1 -1
- package/dist/cjs/tokenExchange.d.ts +5 -0
- package/dist/cjs/tokenExchange.d.ts.map +1 -1
- package/dist/cjs/tokenExchange.js +5 -2
- package/dist/cjs/tokenExchange.js.map +1 -1
- package/dist/esm/clientCredentials.d.ts +5 -0
- package/dist/esm/clientCredentials.d.ts.map +1 -1
- package/dist/esm/clientCredentials.js +6 -3
- package/dist/esm/clientCredentials.js.map +1 -1
- package/dist/esm/keyring.d.ts +7 -0
- package/dist/esm/keyring.d.ts.map +1 -1
- package/dist/esm/keyring.js +58 -10
- package/dist/esm/keyring.js.map +1 -1
- package/dist/esm/tokenEndpoint.d.ts +1 -0
- package/dist/esm/tokenEndpoint.d.ts.map +1 -1
- package/dist/esm/tokenEndpoint.js +1 -1
- package/dist/esm/tokenEndpoint.js.map +1 -1
- package/dist/esm/tokenExchange.d.ts +5 -0
- package/dist/esm/tokenExchange.d.ts.map +1 -1
- package/dist/esm/tokenExchange.js +6 -3
- package/dist/esm/tokenExchange.js.map +1 -1
- package/package.json +3 -3
|
@@ -23,6 +23,11 @@ export interface ClientCredentialsClientOptions extends TokenEndpointCacheOption
|
|
|
23
23
|
* Authorization header from the credential's `getAuth(issuer)`.
|
|
24
24
|
*/
|
|
25
25
|
credential?: ApplicationCredential;
|
|
26
|
+
/**
|
|
27
|
+
* Timeout for each request to the authorization server: token endpoint
|
|
28
|
+
* discovery and the token request itself. Default: 10 seconds.
|
|
29
|
+
*/
|
|
30
|
+
fetchTimeoutMs?: number;
|
|
26
31
|
}
|
|
27
32
|
export interface RequestTokenOptions {
|
|
28
33
|
/** Zone issuer URL used to select per-zone credentials. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientCredentials.d.ts","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"clientCredentials.d.ts","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAmD,KAAK,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACrH,OAAO,EAA4B,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMlF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,8BAA+B,SAAQ,yBAAyB;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAwBD,qBAAa,uBAAuB;;gBAQtB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,8BAA8B;IAS9D,YAAY,CAChB,OAAO,CAAC,EAAE,wBAAwB,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,aAAa,CAAC;IA4DzB;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAG1C"}
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _ClientCredentialsClient_instances, _ClientCredentialsClient_issuer, _ClientCredentialsClient_clientId, _ClientCredentialsClient_clientSecret, _ClientCredentialsClient_credential, _ClientCredentialsClient_tokenEndpoint, _ClientCredentialsClient_resolveBasicAuth;
|
|
13
|
+
var _ClientCredentialsClient_instances, _ClientCredentialsClient_issuer, _ClientCredentialsClient_clientId, _ClientCredentialsClient_clientSecret, _ClientCredentialsClient_credential, _ClientCredentialsClient_tokenEndpoint, _ClientCredentialsClient_fetchTimeoutMs, _ClientCredentialsClient_resolveBasicAuth;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ClientCredentialsClient = void 0;
|
|
16
16
|
const errors_js_1 = require("./errors.js");
|
|
@@ -45,10 +45,12 @@ class ClientCredentialsClient {
|
|
|
45
45
|
_ClientCredentialsClient_clientSecret.set(this, void 0);
|
|
46
46
|
_ClientCredentialsClient_credential.set(this, void 0);
|
|
47
47
|
_ClientCredentialsClient_tokenEndpoint.set(this, void 0);
|
|
48
|
+
_ClientCredentialsClient_fetchTimeoutMs.set(this, void 0);
|
|
48
49
|
__classPrivateFieldSet(this, _ClientCredentialsClient_issuer, issuer, "f");
|
|
49
50
|
__classPrivateFieldSet(this, _ClientCredentialsClient_clientId, options?.clientId, "f");
|
|
50
51
|
__classPrivateFieldSet(this, _ClientCredentialsClient_clientSecret, options?.clientSecret, "f");
|
|
51
52
|
__classPrivateFieldSet(this, _ClientCredentialsClient_credential, options?.credential, "f");
|
|
53
|
+
__classPrivateFieldSet(this, _ClientCredentialsClient_fetchTimeoutMs, options?.fetchTimeoutMs ?? tokenEndpoint_js_1.DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
52
54
|
__classPrivateFieldSet(this, _ClientCredentialsClient_tokenEndpoint, new tokenEndpoint_js_1.TokenEndpointResolver(issuer, options), "f");
|
|
53
55
|
}
|
|
54
56
|
async requestToken(request, options) {
|
|
@@ -66,6 +68,7 @@ class ClientCredentialsClient {
|
|
|
66
68
|
method: "POST",
|
|
67
69
|
headers,
|
|
68
70
|
body: body.toString(),
|
|
71
|
+
signal: AbortSignal.timeout(__classPrivateFieldGet(this, _ClientCredentialsClient_fetchTimeoutMs, "f")),
|
|
69
72
|
});
|
|
70
73
|
if (!response.ok) {
|
|
71
74
|
try {
|
|
@@ -102,7 +105,7 @@ class ClientCredentialsClient {
|
|
|
102
105
|
}
|
|
103
106
|
}
|
|
104
107
|
exports.ClientCredentialsClient = ClientCredentialsClient;
|
|
105
|
-
_ClientCredentialsClient_issuer = new WeakMap(), _ClientCredentialsClient_clientId = new WeakMap(), _ClientCredentialsClient_clientSecret = new WeakMap(), _ClientCredentialsClient_credential = new WeakMap(), _ClientCredentialsClient_tokenEndpoint = new WeakMap(), _ClientCredentialsClient_instances = new WeakSet(), _ClientCredentialsClient_resolveBasicAuth = function _ClientCredentialsClient_resolveBasicAuth(issuer) {
|
|
108
|
+
_ClientCredentialsClient_issuer = new WeakMap(), _ClientCredentialsClient_clientId = new WeakMap(), _ClientCredentialsClient_clientSecret = new WeakMap(), _ClientCredentialsClient_credential = new WeakMap(), _ClientCredentialsClient_tokenEndpoint = new WeakMap(), _ClientCredentialsClient_fetchTimeoutMs = new WeakMap(), _ClientCredentialsClient_instances = new WeakSet(), _ClientCredentialsClient_resolveBasicAuth = function _ClientCredentialsClient_resolveBasicAuth(issuer) {
|
|
106
109
|
if (__classPrivateFieldGet(this, _ClientCredentialsClient_credential, "f")) {
|
|
107
110
|
return __classPrivateFieldGet(this, _ClientCredentialsClient_credential, "f").getAuth(issuer);
|
|
108
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientCredentials.js","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyC;AAEzC,
|
|
1
|
+
{"version":3,"file":"clientCredentials.js","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/keyring.d.ts
CHANGED
|
@@ -18,6 +18,13 @@ export interface JWKSOAuthKeyringOptions {
|
|
|
18
18
|
fetchTimeoutMs?: number;
|
|
19
19
|
/** Maximum number of cached keys before the oldest is evicted. Default: 256. */
|
|
20
20
|
keyCacheMaxEntries?: number;
|
|
21
|
+
/**
|
|
22
|
+
* Minimum time between two JWKS fetches for one issuer when a token names a
|
|
23
|
+
* `kid` the cached key set does not hold. A forged token can carry any
|
|
24
|
+
* `kid`, so without this every such request costs a fetch from the zone.
|
|
25
|
+
* A key that rotated in is picked up once this has passed. Default: 30 seconds.
|
|
26
|
+
*/
|
|
27
|
+
jwksRefetchCooldownMs?: number;
|
|
21
28
|
}
|
|
22
29
|
export declare class JWKSOAuthKeyring implements OAuthKeyring {
|
|
23
30
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;CAC7C;AAED,MAAM,WAAW,uBAAuB;IACtC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;CAC7C;AAED,MAAM,WAAW,uBAAuB;IACtC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AA0DD,qBAAa,gBAAiB,YAAW,YAAY;;gBAmBvC,OAAO,CAAC,EAAE,uBAAuB;IAUvC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAa7C;;;;OAIG;IACH,KAAK,IAAI,IAAI;CA+Kd"}
|
package/dist/cjs/keyring.js
CHANGED
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _JWKSOAuthKeyring_instances, _JWKSOAuthKeyring_keyTtlMs, _JWKSOAuthKeyring_discoveryTtlMs, _JWKSOAuthKeyring_fetchTimeoutMs, _JWKSOAuthKeyring_discoveryCache, _JWKSOAuthKeyring_keyCache, _JWKSOAuthKeyring_keyCacheMaxEntries, _JWKSOAuthKeyring_discoveryInflight, _JWKSOAuthKeyring_keyInflight, _JWKSOAuthKeyring_resolveJwksUri, _JWKSOAuthKeyring_resolveKey, _JWKSOAuthKeyring_getCached, _JWKSOAuthKeyring_evictKeysIfNeeded;
|
|
13
|
+
var _JWKSOAuthKeyring_instances, _JWKSOAuthKeyring_keyTtlMs, _JWKSOAuthKeyring_discoveryTtlMs, _JWKSOAuthKeyring_fetchTimeoutMs, _JWKSOAuthKeyring_discoveryCache, _JWKSOAuthKeyring_keyCache, _JWKSOAuthKeyring_keyCacheMaxEntries, _JWKSOAuthKeyring_discoveryInflight, _JWKSOAuthKeyring_keyInflight, _JWKSOAuthKeyring_jwksCache, _JWKSOAuthKeyring_jwksInflight, _JWKSOAuthKeyring_jwksRefetchCooldownMs, _JWKSOAuthKeyring_resolveJwksUri, _JWKSOAuthKeyring_resolveKey, _JWKSOAuthKeyring_fetchJwks, _JWKSOAuthKeyring_getCached, _JWKSOAuthKeyring_evictKeysIfNeeded;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.JWKSOAuthKeyring = void 0;
|
|
16
16
|
const zod_1 = require("zod");
|
|
@@ -38,6 +38,7 @@ const DEFAULT_KEY_TTL_MS = 5 * 60 * 1000; // 5 minutes
|
|
|
38
38
|
const DEFAULT_DISCOVERY_TTL_MS = 60 * 60 * 1000; // 1 hour
|
|
39
39
|
const DEFAULT_FETCH_TIMEOUT_MS = 10_000; // 10 seconds
|
|
40
40
|
const DEFAULT_KEY_CACHE_MAX_ENTRIES = 256; // bound the key cache
|
|
41
|
+
const DEFAULT_JWKS_REFETCH_COOLDOWN_MS = 30_000; // 30 seconds, as jose's remote JWKS
|
|
41
42
|
function assertSameOrigin(issuer, jwksUri) {
|
|
42
43
|
const issuerOrigin = new URL(issuer).origin;
|
|
43
44
|
const jwksOrigin = new URL(jwksUri).origin;
|
|
@@ -62,10 +63,17 @@ class JWKSOAuthKeyring {
|
|
|
62
63
|
_JWKSOAuthKeyring_keyCacheMaxEntries.set(this, void 0);
|
|
63
64
|
_JWKSOAuthKeyring_discoveryInflight.set(this, new Map());
|
|
64
65
|
_JWKSOAuthKeyring_keyInflight.set(this, new Map());
|
|
66
|
+
// The last key set fetched from each jwks_uri, with when it was fetched, so
|
|
67
|
+
// a kid it holds needs no fetch and a kid it lacks refetches at most once
|
|
68
|
+
// per cooldown.
|
|
69
|
+
_JWKSOAuthKeyring_jwksCache.set(this, new Map());
|
|
70
|
+
_JWKSOAuthKeyring_jwksInflight.set(this, new Map());
|
|
71
|
+
_JWKSOAuthKeyring_jwksRefetchCooldownMs.set(this, void 0);
|
|
65
72
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_keyTtlMs, options?.keyTtlMs ?? DEFAULT_KEY_TTL_MS, "f");
|
|
66
73
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_discoveryTtlMs, options?.discoveryTtlMs ?? DEFAULT_DISCOVERY_TTL_MS, "f");
|
|
67
74
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_fetchTimeoutMs, options?.fetchTimeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
68
75
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_keyCacheMaxEntries, options?.keyCacheMaxEntries ?? DEFAULT_KEY_CACHE_MAX_ENTRIES, "f");
|
|
76
|
+
__classPrivateFieldSet(this, _JWKSOAuthKeyring_jwksRefetchCooldownMs, options?.jwksRefetchCooldownMs ?? DEFAULT_JWKS_REFETCH_COOLDOWN_MS, "f");
|
|
69
77
|
}
|
|
70
78
|
async key(issuer, kid) {
|
|
71
79
|
const cacheKey = keyCacheKey(issuer, kid);
|
|
@@ -80,6 +88,11 @@ class JWKSOAuthKeyring {
|
|
|
80
88
|
const cacheKey = keyCacheKey(issuer, kid);
|
|
81
89
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyCache, "f").delete(cacheKey);
|
|
82
90
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyInflight, "f").delete(cacheKey);
|
|
91
|
+
const jwksUri = __classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryCache, "f").get(issuer)?.value;
|
|
92
|
+
if (jwksUri) {
|
|
93
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").delete(jwksUri);
|
|
94
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").delete(jwksUri);
|
|
95
|
+
}
|
|
83
96
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryCache, "f").delete(issuer);
|
|
84
97
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryInflight, "f").delete(issuer);
|
|
85
98
|
}
|
|
@@ -91,12 +104,14 @@ class JWKSOAuthKeyring {
|
|
|
91
104
|
clear() {
|
|
92
105
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyCache, "f").clear();
|
|
93
106
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyInflight, "f").clear();
|
|
107
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").clear();
|
|
108
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").clear();
|
|
94
109
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryCache, "f").clear();
|
|
95
110
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryInflight, "f").clear();
|
|
96
111
|
}
|
|
97
112
|
}
|
|
98
113
|
exports.JWKSOAuthKeyring = JWKSOAuthKeyring;
|
|
99
|
-
_JWKSOAuthKeyring_keyTtlMs = new WeakMap(), _JWKSOAuthKeyring_discoveryTtlMs = new WeakMap(), _JWKSOAuthKeyring_fetchTimeoutMs = new WeakMap(), _JWKSOAuthKeyring_discoveryCache = new WeakMap(), _JWKSOAuthKeyring_keyCache = new WeakMap(), _JWKSOAuthKeyring_keyCacheMaxEntries = new WeakMap(), _JWKSOAuthKeyring_discoveryInflight = new WeakMap(), _JWKSOAuthKeyring_keyInflight = new WeakMap(), _JWKSOAuthKeyring_instances = new WeakSet(), _JWKSOAuthKeyring_resolveJwksUri =
|
|
114
|
+
_JWKSOAuthKeyring_keyTtlMs = new WeakMap(), _JWKSOAuthKeyring_discoveryTtlMs = new WeakMap(), _JWKSOAuthKeyring_fetchTimeoutMs = new WeakMap(), _JWKSOAuthKeyring_discoveryCache = new WeakMap(), _JWKSOAuthKeyring_keyCache = new WeakMap(), _JWKSOAuthKeyring_keyCacheMaxEntries = new WeakMap(), _JWKSOAuthKeyring_discoveryInflight = new WeakMap(), _JWKSOAuthKeyring_keyInflight = new WeakMap(), _JWKSOAuthKeyring_jwksCache = new WeakMap(), _JWKSOAuthKeyring_jwksInflight = new WeakMap(), _JWKSOAuthKeyring_jwksRefetchCooldownMs = new WeakMap(), _JWKSOAuthKeyring_instances = new WeakSet(), _JWKSOAuthKeyring_resolveJwksUri =
|
|
100
115
|
// -------------------------------------------------------
|
|
101
116
|
// Discovery resolution with cache + dedup
|
|
102
117
|
// -------------------------------------------------------
|
|
@@ -141,15 +156,16 @@ async function _JWKSOAuthKeyring_resolveKey(issuer, kid, jwksUri, cacheKey) {
|
|
|
141
156
|
}
|
|
142
157
|
const promise = (async () => {
|
|
143
158
|
try {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
159
|
+
let entry = __classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").get(jwksUri);
|
|
160
|
+
if (entry && Date.now() >= entry.expiresAt) {
|
|
161
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").delete(jwksUri);
|
|
162
|
+
entry = undefined;
|
|
163
|
+
}
|
|
164
|
+
let jwk = entry?.value.keys.find((jwk) => jwk.kid === kid);
|
|
165
|
+
if (!jwk && (!entry || Date.now() - entry.fetchedAt >= __classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksRefetchCooldownMs, "f"))) {
|
|
166
|
+
const jwkSet = await __classPrivateFieldGet(this, _JWKSOAuthKeyring_instances, "m", _JWKSOAuthKeyring_fetchJwks).call(this, issuer, jwksUri);
|
|
167
|
+
jwk = jwkSet.keys.find((jwk) => jwk.kid === kid);
|
|
149
168
|
}
|
|
150
|
-
const json = await response.json();
|
|
151
|
-
const jwkSet = JWKSetSchema.parse(json);
|
|
152
|
-
const jwk = jwkSet.keys.find((jwk) => jwk.kid === kid);
|
|
153
169
|
if (!jwk) {
|
|
154
170
|
throw new errors_js_1.JWKSKeyNotFoundError(`Failed to find key "${kid}" of "${issuer}"`);
|
|
155
171
|
}
|
|
@@ -171,6 +187,38 @@ async function _JWKSOAuthKeyring_resolveKey(issuer, kid, jwksUri, cacheKey) {
|
|
|
171
187
|
})();
|
|
172
188
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyInflight, "f").set(cacheKey, promise);
|
|
173
189
|
return promise;
|
|
190
|
+
}, _JWKSOAuthKeyring_fetchJwks =
|
|
191
|
+
// -------------------------------------------------------
|
|
192
|
+
// JWKS fetch with dedup: concurrent misses for any kid share one fetch
|
|
193
|
+
// -------------------------------------------------------
|
|
194
|
+
async function _JWKSOAuthKeyring_fetchJwks(issuer, jwksUri) {
|
|
195
|
+
const inflight = __classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").get(jwksUri);
|
|
196
|
+
if (inflight) {
|
|
197
|
+
return inflight;
|
|
198
|
+
}
|
|
199
|
+
const promise = (async () => {
|
|
200
|
+
try {
|
|
201
|
+
const response = await fetch(jwksUri, {
|
|
202
|
+
signal: AbortSignal.timeout(__classPrivateFieldGet(this, _JWKSOAuthKeyring_fetchTimeoutMs, "f")),
|
|
203
|
+
});
|
|
204
|
+
if (!response.ok) {
|
|
205
|
+
throw new errors_js_1.JWKSFetchError(`Failed to fetch JWKS from "${jwksUri}" for "${issuer}" (HTTP ${response.status})`);
|
|
206
|
+
}
|
|
207
|
+
const jwkSet = JWKSetSchema.parse(await response.json());
|
|
208
|
+
const now = Date.now();
|
|
209
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").set(jwksUri, {
|
|
210
|
+
value: jwkSet,
|
|
211
|
+
fetchedAt: now,
|
|
212
|
+
expiresAt: now + __classPrivateFieldGet(this, _JWKSOAuthKeyring_keyTtlMs, "f"),
|
|
213
|
+
});
|
|
214
|
+
return jwkSet;
|
|
215
|
+
}
|
|
216
|
+
finally {
|
|
217
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").delete(jwksUri);
|
|
218
|
+
}
|
|
219
|
+
})();
|
|
220
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").set(jwksUri, promise);
|
|
221
|
+
return promise;
|
|
174
222
|
}, _JWKSOAuthKeyring_getCached = function _JWKSOAuthKeyring_getCached(cache, key) {
|
|
175
223
|
const entry = cache.get(key);
|
|
176
224
|
if (!entry) {
|
package/dist/cjs/keyring.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6BAAwB;AACxB,iDAAkE;AAClE,2CAKqB;
|
|
1
|
+
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare const DEFAULT_DISCOVERY_TTL_MS: number;
|
|
2
2
|
export declare const DEFAULT_NEGATIVE_TTL_MS: number;
|
|
3
|
+
export declare const DEFAULT_FETCH_TIMEOUT_MS = 10000;
|
|
3
4
|
export interface TokenEndpointCacheOptions {
|
|
4
5
|
/** Cache lifetime for the discovered token endpoint. Default: 1 hour. */
|
|
5
6
|
discoveryTtlMs?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenEndpoint.d.ts","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,QAAiB,CAAC;AACvD,eAAO,MAAM,uBAAuB,QAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenEndpoint.d.ts","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,QAAiB,CAAC;AACvD,eAAO,MAAM,uBAAuB,QAAY,CAAC;AACjD,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAE/C,MAAM,WAAW,yBAAyB;IACxC,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAMD;;;;;;;GAOG;AACH,qBAAa,qBAAqB;;gBAQpB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;IAOvF,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CA0DjC"}
|
|
@@ -12,12 +12,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
12
12
|
};
|
|
13
13
|
var _TokenEndpointResolver_instances, _TokenEndpointResolver_issuer, _TokenEndpointResolver_discoveryTtlMs, _TokenEndpointResolver_negativeTtlMs, _TokenEndpointResolver_fetchTimeoutMs, _TokenEndpointResolver_cached, _TokenEndpointResolver_inflight, _TokenEndpointResolver_discover, _TokenEndpointResolver_store;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.TokenEndpointResolver = exports.DEFAULT_NEGATIVE_TTL_MS = exports.DEFAULT_DISCOVERY_TTL_MS = void 0;
|
|
15
|
+
exports.TokenEndpointResolver = exports.DEFAULT_FETCH_TIMEOUT_MS = exports.DEFAULT_NEGATIVE_TTL_MS = exports.DEFAULT_DISCOVERY_TTL_MS = void 0;
|
|
16
16
|
const discovery_js_1 = require("./discovery.js");
|
|
17
17
|
const errors_js_1 = require("./errors.js");
|
|
18
18
|
exports.DEFAULT_DISCOVERY_TTL_MS = 60 * 60 * 1000;
|
|
19
19
|
exports.DEFAULT_NEGATIVE_TTL_MS = 60 * 1000;
|
|
20
|
-
|
|
20
|
+
exports.DEFAULT_FETCH_TIMEOUT_MS = 10_000;
|
|
21
21
|
/**
|
|
22
22
|
* Resolves and caches an issuer's token endpoint per the base rule that
|
|
23
23
|
* metadata failures are not sticky: success is cached for `discoveryTtlMs`,
|
|
@@ -38,7 +38,7 @@ class TokenEndpointResolver {
|
|
|
38
38
|
__classPrivateFieldSet(this, _TokenEndpointResolver_issuer, issuer, "f");
|
|
39
39
|
__classPrivateFieldSet(this, _TokenEndpointResolver_discoveryTtlMs, options?.discoveryTtlMs ?? exports.DEFAULT_DISCOVERY_TTL_MS, "f");
|
|
40
40
|
__classPrivateFieldSet(this, _TokenEndpointResolver_negativeTtlMs, options?.negativeTtlMs ?? exports.DEFAULT_NEGATIVE_TTL_MS, "f");
|
|
41
|
-
__classPrivateFieldSet(this, _TokenEndpointResolver_fetchTimeoutMs, options?.fetchTimeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
41
|
+
__classPrivateFieldSet(this, _TokenEndpointResolver_fetchTimeoutMs, options?.fetchTimeoutMs ?? exports.DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
42
42
|
}
|
|
43
43
|
async resolve() {
|
|
44
44
|
const cached = __classPrivateFieldGet(this, _TokenEndpointResolver_cached, "f");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenEndpoint.js","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAkE;AAClE,2CAAiF;AAEpE,QAAA,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC1C,QAAA,uBAAuB,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenEndpoint.js","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,11 @@ export interface TokenExchangeClientOptions extends TokenEndpointCacheOptions {
|
|
|
50
50
|
* authenticates the substitute-user exchange with its client assertion.
|
|
51
51
|
*/
|
|
52
52
|
credential?: ApplicationCredential;
|
|
53
|
+
/**
|
|
54
|
+
* Timeout for each request to the authorization server: token endpoint
|
|
55
|
+
* discovery and the token request itself. Default: 10 seconds.
|
|
56
|
+
*/
|
|
57
|
+
fetchTimeoutMs?: number;
|
|
53
58
|
}
|
|
54
59
|
export interface ExchangeOptions {
|
|
55
60
|
/** Zone issuer URL used to select per-zone credentials. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenExchange.d.ts","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,
|
|
1
|
+
{"version":3,"file":"tokenExchange.d.ts","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAmD,KAAK,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAMrH,eAAO,MAAM,SAAS;;IAEpB;;;OAGG;;CAEK,CAAC;AACX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAEnE,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,0BAA2B,SAAQ,yBAAyB;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA0BD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAqBrF;AAMD,qBAAa,mBAAmB;;gBAQlB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,0BAA0B;IAS1D,aAAa,CACjB,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,CAAC;IAgDnB,WAAW,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC;IAoClE;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAG1C"}
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _TokenExchangeClient_instances, _TokenExchangeClient_issuer, _TokenExchangeClient_clientId, _TokenExchangeClient_clientSecret, _TokenExchangeClient_credential, _TokenExchangeClient_tokenEndpoint, _TokenExchangeClient_resolveBasicAuth;
|
|
13
|
+
var _TokenExchangeClient_instances, _TokenExchangeClient_issuer, _TokenExchangeClient_clientId, _TokenExchangeClient_clientSecret, _TokenExchangeClient_credential, _TokenExchangeClient_tokenEndpoint, _TokenExchangeClient_fetchTimeoutMs, _TokenExchangeClient_resolveBasicAuth;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.TokenExchangeClient = exports.TokenType = void 0;
|
|
16
16
|
exports.deserializeTokenResponse = deserializeTokenResponse;
|
|
@@ -90,10 +90,12 @@ class TokenExchangeClient {
|
|
|
90
90
|
_TokenExchangeClient_clientSecret.set(this, void 0);
|
|
91
91
|
_TokenExchangeClient_credential.set(this, void 0);
|
|
92
92
|
_TokenExchangeClient_tokenEndpoint.set(this, void 0);
|
|
93
|
+
_TokenExchangeClient_fetchTimeoutMs.set(this, void 0);
|
|
93
94
|
__classPrivateFieldSet(this, _TokenExchangeClient_issuer, issuer, "f");
|
|
94
95
|
__classPrivateFieldSet(this, _TokenExchangeClient_clientId, options?.clientId, "f");
|
|
95
96
|
__classPrivateFieldSet(this, _TokenExchangeClient_clientSecret, options?.clientSecret, "f");
|
|
96
97
|
__classPrivateFieldSet(this, _TokenExchangeClient_credential, options?.credential, "f");
|
|
98
|
+
__classPrivateFieldSet(this, _TokenExchangeClient_fetchTimeoutMs, options?.fetchTimeoutMs ?? tokenEndpoint_js_1.DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
97
99
|
__classPrivateFieldSet(this, _TokenExchangeClient_tokenEndpoint, new tokenEndpoint_js_1.TokenEndpointResolver(issuer, options), "f");
|
|
98
100
|
}
|
|
99
101
|
async exchangeToken(request, options) {
|
|
@@ -111,6 +113,7 @@ class TokenExchangeClient {
|
|
|
111
113
|
method: "POST",
|
|
112
114
|
headers,
|
|
113
115
|
body: body.toString(),
|
|
116
|
+
signal: AbortSignal.timeout(__classPrivateFieldGet(this, _TokenExchangeClient_fetchTimeoutMs, "f")),
|
|
114
117
|
});
|
|
115
118
|
if (!response.ok) {
|
|
116
119
|
try {
|
|
@@ -163,7 +166,7 @@ class TokenExchangeClient {
|
|
|
163
166
|
}
|
|
164
167
|
}
|
|
165
168
|
exports.TokenExchangeClient = TokenExchangeClient;
|
|
166
|
-
_TokenExchangeClient_issuer = new WeakMap(), _TokenExchangeClient_clientId = new WeakMap(), _TokenExchangeClient_clientSecret = new WeakMap(), _TokenExchangeClient_credential = new WeakMap(), _TokenExchangeClient_tokenEndpoint = new WeakMap(), _TokenExchangeClient_instances = new WeakSet(), _TokenExchangeClient_resolveBasicAuth = function _TokenExchangeClient_resolveBasicAuth(issuer) {
|
|
169
|
+
_TokenExchangeClient_issuer = new WeakMap(), _TokenExchangeClient_clientId = new WeakMap(), _TokenExchangeClient_clientSecret = new WeakMap(), _TokenExchangeClient_credential = new WeakMap(), _TokenExchangeClient_tokenEndpoint = new WeakMap(), _TokenExchangeClient_fetchTimeoutMs = new WeakMap(), _TokenExchangeClient_instances = new WeakSet(), _TokenExchangeClient_resolveBasicAuth = function _TokenExchangeClient_resolveBasicAuth(issuer) {
|
|
167
170
|
if (__classPrivateFieldGet(this, _TokenExchangeClient_credential, "f")) {
|
|
168
171
|
return __classPrivateFieldGet(this, _TokenExchangeClient_credential, "f").getAuth(issuer);
|
|
169
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenExchange.js","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"tokenExchange.js","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,11 @@ export interface ClientCredentialsClientOptions extends TokenEndpointCacheOption
|
|
|
23
23
|
* Authorization header from the credential's `getAuth(issuer)`.
|
|
24
24
|
*/
|
|
25
25
|
credential?: ApplicationCredential;
|
|
26
|
+
/**
|
|
27
|
+
* Timeout for each request to the authorization server: token endpoint
|
|
28
|
+
* discovery and the token request itself. Default: 10 seconds.
|
|
29
|
+
*/
|
|
30
|
+
fetchTimeoutMs?: number;
|
|
26
31
|
}
|
|
27
32
|
export interface RequestTokenOptions {
|
|
28
33
|
/** Zone issuer URL used to select per-zone credentials. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientCredentials.d.ts","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"clientCredentials.d.ts","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAmD,KAAK,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACrH,OAAO,EAA4B,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMlF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,8BAA+B,SAAQ,yBAAyB;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAwBD,qBAAa,uBAAuB;;gBAQtB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,8BAA8B;IAS9D,YAAY,CAChB,OAAO,CAAC,EAAE,wBAAwB,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,aAAa,CAAC;IA4DzB;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAG1C"}
|
|
@@ -9,9 +9,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
9
9
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
10
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
11
|
};
|
|
12
|
-
var _ClientCredentialsClient_instances, _ClientCredentialsClient_issuer, _ClientCredentialsClient_clientId, _ClientCredentialsClient_clientSecret, _ClientCredentialsClient_credential, _ClientCredentialsClient_tokenEndpoint, _ClientCredentialsClient_resolveBasicAuth;
|
|
12
|
+
var _ClientCredentialsClient_instances, _ClientCredentialsClient_issuer, _ClientCredentialsClient_clientId, _ClientCredentialsClient_clientSecret, _ClientCredentialsClient_credential, _ClientCredentialsClient_tokenEndpoint, _ClientCredentialsClient_fetchTimeoutMs, _ClientCredentialsClient_resolveBasicAuth;
|
|
13
13
|
import { OAuthError } from "./errors.js";
|
|
14
|
-
import { TokenEndpointResolver } from "./tokenEndpoint.js";
|
|
14
|
+
import { DEFAULT_FETCH_TIMEOUT_MS, TokenEndpointResolver } from "./tokenEndpoint.js";
|
|
15
15
|
import { deserializeTokenResponse } from "./tokenExchange.js";
|
|
16
16
|
// =============================================================================
|
|
17
17
|
// Wire format helpers (camelCase <-> snake_case at the boundary)
|
|
@@ -42,10 +42,12 @@ export class ClientCredentialsClient {
|
|
|
42
42
|
_ClientCredentialsClient_clientSecret.set(this, void 0);
|
|
43
43
|
_ClientCredentialsClient_credential.set(this, void 0);
|
|
44
44
|
_ClientCredentialsClient_tokenEndpoint.set(this, void 0);
|
|
45
|
+
_ClientCredentialsClient_fetchTimeoutMs.set(this, void 0);
|
|
45
46
|
__classPrivateFieldSet(this, _ClientCredentialsClient_issuer, issuer, "f");
|
|
46
47
|
__classPrivateFieldSet(this, _ClientCredentialsClient_clientId, options?.clientId, "f");
|
|
47
48
|
__classPrivateFieldSet(this, _ClientCredentialsClient_clientSecret, options?.clientSecret, "f");
|
|
48
49
|
__classPrivateFieldSet(this, _ClientCredentialsClient_credential, options?.credential, "f");
|
|
50
|
+
__classPrivateFieldSet(this, _ClientCredentialsClient_fetchTimeoutMs, options?.fetchTimeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
49
51
|
__classPrivateFieldSet(this, _ClientCredentialsClient_tokenEndpoint, new TokenEndpointResolver(issuer, options), "f");
|
|
50
52
|
}
|
|
51
53
|
async requestToken(request, options) {
|
|
@@ -63,6 +65,7 @@ export class ClientCredentialsClient {
|
|
|
63
65
|
method: "POST",
|
|
64
66
|
headers,
|
|
65
67
|
body: body.toString(),
|
|
68
|
+
signal: AbortSignal.timeout(__classPrivateFieldGet(this, _ClientCredentialsClient_fetchTimeoutMs, "f")),
|
|
66
69
|
});
|
|
67
70
|
if (!response.ok) {
|
|
68
71
|
try {
|
|
@@ -98,7 +101,7 @@ export class ClientCredentialsClient {
|
|
|
98
101
|
return __classPrivateFieldGet(this, _ClientCredentialsClient_tokenEndpoint, "f").resolve();
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
|
-
_ClientCredentialsClient_issuer = new WeakMap(), _ClientCredentialsClient_clientId = new WeakMap(), _ClientCredentialsClient_clientSecret = new WeakMap(), _ClientCredentialsClient_credential = new WeakMap(), _ClientCredentialsClient_tokenEndpoint = new WeakMap(), _ClientCredentialsClient_instances = new WeakSet(), _ClientCredentialsClient_resolveBasicAuth = function _ClientCredentialsClient_resolveBasicAuth(issuer) {
|
|
104
|
+
_ClientCredentialsClient_issuer = new WeakMap(), _ClientCredentialsClient_clientId = new WeakMap(), _ClientCredentialsClient_clientSecret = new WeakMap(), _ClientCredentialsClient_credential = new WeakMap(), _ClientCredentialsClient_tokenEndpoint = new WeakMap(), _ClientCredentialsClient_fetchTimeoutMs = new WeakMap(), _ClientCredentialsClient_instances = new WeakSet(), _ClientCredentialsClient_resolveBasicAuth = function _ClientCredentialsClient_resolveBasicAuth(issuer) {
|
|
102
105
|
if (__classPrivateFieldGet(this, _ClientCredentialsClient_credential, "f")) {
|
|
103
106
|
return __classPrivateFieldGet(this, _ClientCredentialsClient_credential, "f").getAuth(issuer);
|
|
104
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientCredentials.js","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAkC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"clientCredentials.js","sourceRoot":"","sources":["../../src/clientCredentials.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/keyring.d.ts
CHANGED
|
@@ -18,6 +18,13 @@ export interface JWKSOAuthKeyringOptions {
|
|
|
18
18
|
fetchTimeoutMs?: number;
|
|
19
19
|
/** Maximum number of cached keys before the oldest is evicted. Default: 256. */
|
|
20
20
|
keyCacheMaxEntries?: number;
|
|
21
|
+
/**
|
|
22
|
+
* Minimum time between two JWKS fetches for one issuer when a token names a
|
|
23
|
+
* `kid` the cached key set does not hold. A forged token can carry any
|
|
24
|
+
* `kid`, so without this every such request costs a fetch from the zone.
|
|
25
|
+
* A key that rotated in is picked up once this has passed. Default: 30 seconds.
|
|
26
|
+
*/
|
|
27
|
+
jwksRefetchCooldownMs?: number;
|
|
21
28
|
}
|
|
22
29
|
export declare class JWKSOAuthKeyring implements OAuthKeyring {
|
|
23
30
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;CAC7C;AAED,MAAM,WAAW,uBAAuB;IACtC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;CAC7C;AAED,MAAM,WAAW,uBAAuB;IACtC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AA0DD,qBAAa,gBAAiB,YAAW,YAAY;;gBAmBvC,OAAO,CAAC,EAAE,uBAAuB;IAUvC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAa7C;;;;OAIG;IACH,KAAK,IAAI,IAAI;CA+Kd"}
|
package/dist/esm/keyring.js
CHANGED
|
@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
9
9
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
10
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
11
|
};
|
|
12
|
-
var _JWKSOAuthKeyring_instances, _JWKSOAuthKeyring_keyTtlMs, _JWKSOAuthKeyring_discoveryTtlMs, _JWKSOAuthKeyring_fetchTimeoutMs, _JWKSOAuthKeyring_discoveryCache, _JWKSOAuthKeyring_keyCache, _JWKSOAuthKeyring_keyCacheMaxEntries, _JWKSOAuthKeyring_discoveryInflight, _JWKSOAuthKeyring_keyInflight, _JWKSOAuthKeyring_resolveJwksUri, _JWKSOAuthKeyring_resolveKey, _JWKSOAuthKeyring_getCached, _JWKSOAuthKeyring_evictKeysIfNeeded;
|
|
12
|
+
var _JWKSOAuthKeyring_instances, _JWKSOAuthKeyring_keyTtlMs, _JWKSOAuthKeyring_discoveryTtlMs, _JWKSOAuthKeyring_fetchTimeoutMs, _JWKSOAuthKeyring_discoveryCache, _JWKSOAuthKeyring_keyCache, _JWKSOAuthKeyring_keyCacheMaxEntries, _JWKSOAuthKeyring_discoveryInflight, _JWKSOAuthKeyring_keyInflight, _JWKSOAuthKeyring_jwksCache, _JWKSOAuthKeyring_jwksInflight, _JWKSOAuthKeyring_jwksRefetchCooldownMs, _JWKSOAuthKeyring_resolveJwksUri, _JWKSOAuthKeyring_resolveKey, _JWKSOAuthKeyring_fetchJwks, _JWKSOAuthKeyring_getCached, _JWKSOAuthKeyring_evictKeysIfNeeded;
|
|
13
13
|
import { z } from "zod";
|
|
14
14
|
import { fetchAuthorizationServerMetadata } from "./discovery.js";
|
|
15
15
|
import { JWKSDiscoveryError, JWKSFetchError, JWKSKeyNotFoundError, JWKSUriValidationError, } from "./errors.js";
|
|
@@ -35,6 +35,7 @@ const DEFAULT_KEY_TTL_MS = 5 * 60 * 1000; // 5 minutes
|
|
|
35
35
|
const DEFAULT_DISCOVERY_TTL_MS = 60 * 60 * 1000; // 1 hour
|
|
36
36
|
const DEFAULT_FETCH_TIMEOUT_MS = 10_000; // 10 seconds
|
|
37
37
|
const DEFAULT_KEY_CACHE_MAX_ENTRIES = 256; // bound the key cache
|
|
38
|
+
const DEFAULT_JWKS_REFETCH_COOLDOWN_MS = 30_000; // 30 seconds, as jose's remote JWKS
|
|
38
39
|
function assertSameOrigin(issuer, jwksUri) {
|
|
39
40
|
const issuerOrigin = new URL(issuer).origin;
|
|
40
41
|
const jwksOrigin = new URL(jwksUri).origin;
|
|
@@ -59,10 +60,17 @@ export class JWKSOAuthKeyring {
|
|
|
59
60
|
_JWKSOAuthKeyring_keyCacheMaxEntries.set(this, void 0);
|
|
60
61
|
_JWKSOAuthKeyring_discoveryInflight.set(this, new Map());
|
|
61
62
|
_JWKSOAuthKeyring_keyInflight.set(this, new Map());
|
|
63
|
+
// The last key set fetched from each jwks_uri, with when it was fetched, so
|
|
64
|
+
// a kid it holds needs no fetch and a kid it lacks refetches at most once
|
|
65
|
+
// per cooldown.
|
|
66
|
+
_JWKSOAuthKeyring_jwksCache.set(this, new Map());
|
|
67
|
+
_JWKSOAuthKeyring_jwksInflight.set(this, new Map());
|
|
68
|
+
_JWKSOAuthKeyring_jwksRefetchCooldownMs.set(this, void 0);
|
|
62
69
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_keyTtlMs, options?.keyTtlMs ?? DEFAULT_KEY_TTL_MS, "f");
|
|
63
70
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_discoveryTtlMs, options?.discoveryTtlMs ?? DEFAULT_DISCOVERY_TTL_MS, "f");
|
|
64
71
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_fetchTimeoutMs, options?.fetchTimeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
65
72
|
__classPrivateFieldSet(this, _JWKSOAuthKeyring_keyCacheMaxEntries, options?.keyCacheMaxEntries ?? DEFAULT_KEY_CACHE_MAX_ENTRIES, "f");
|
|
73
|
+
__classPrivateFieldSet(this, _JWKSOAuthKeyring_jwksRefetchCooldownMs, options?.jwksRefetchCooldownMs ?? DEFAULT_JWKS_REFETCH_COOLDOWN_MS, "f");
|
|
66
74
|
}
|
|
67
75
|
async key(issuer, kid) {
|
|
68
76
|
const cacheKey = keyCacheKey(issuer, kid);
|
|
@@ -77,6 +85,11 @@ export class JWKSOAuthKeyring {
|
|
|
77
85
|
const cacheKey = keyCacheKey(issuer, kid);
|
|
78
86
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyCache, "f").delete(cacheKey);
|
|
79
87
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyInflight, "f").delete(cacheKey);
|
|
88
|
+
const jwksUri = __classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryCache, "f").get(issuer)?.value;
|
|
89
|
+
if (jwksUri) {
|
|
90
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").delete(jwksUri);
|
|
91
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").delete(jwksUri);
|
|
92
|
+
}
|
|
80
93
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryCache, "f").delete(issuer);
|
|
81
94
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryInflight, "f").delete(issuer);
|
|
82
95
|
}
|
|
@@ -88,11 +101,13 @@ export class JWKSOAuthKeyring {
|
|
|
88
101
|
clear() {
|
|
89
102
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyCache, "f").clear();
|
|
90
103
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyInflight, "f").clear();
|
|
104
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").clear();
|
|
105
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").clear();
|
|
91
106
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryCache, "f").clear();
|
|
92
107
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_discoveryInflight, "f").clear();
|
|
93
108
|
}
|
|
94
109
|
}
|
|
95
|
-
_JWKSOAuthKeyring_keyTtlMs = new WeakMap(), _JWKSOAuthKeyring_discoveryTtlMs = new WeakMap(), _JWKSOAuthKeyring_fetchTimeoutMs = new WeakMap(), _JWKSOAuthKeyring_discoveryCache = new WeakMap(), _JWKSOAuthKeyring_keyCache = new WeakMap(), _JWKSOAuthKeyring_keyCacheMaxEntries = new WeakMap(), _JWKSOAuthKeyring_discoveryInflight = new WeakMap(), _JWKSOAuthKeyring_keyInflight = new WeakMap(), _JWKSOAuthKeyring_instances = new WeakSet(), _JWKSOAuthKeyring_resolveJwksUri =
|
|
110
|
+
_JWKSOAuthKeyring_keyTtlMs = new WeakMap(), _JWKSOAuthKeyring_discoveryTtlMs = new WeakMap(), _JWKSOAuthKeyring_fetchTimeoutMs = new WeakMap(), _JWKSOAuthKeyring_discoveryCache = new WeakMap(), _JWKSOAuthKeyring_keyCache = new WeakMap(), _JWKSOAuthKeyring_keyCacheMaxEntries = new WeakMap(), _JWKSOAuthKeyring_discoveryInflight = new WeakMap(), _JWKSOAuthKeyring_keyInflight = new WeakMap(), _JWKSOAuthKeyring_jwksCache = new WeakMap(), _JWKSOAuthKeyring_jwksInflight = new WeakMap(), _JWKSOAuthKeyring_jwksRefetchCooldownMs = new WeakMap(), _JWKSOAuthKeyring_instances = new WeakSet(), _JWKSOAuthKeyring_resolveJwksUri =
|
|
96
111
|
// -------------------------------------------------------
|
|
97
112
|
// Discovery resolution with cache + dedup
|
|
98
113
|
// -------------------------------------------------------
|
|
@@ -137,15 +152,16 @@ async function _JWKSOAuthKeyring_resolveKey(issuer, kid, jwksUri, cacheKey) {
|
|
|
137
152
|
}
|
|
138
153
|
const promise = (async () => {
|
|
139
154
|
try {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
155
|
+
let entry = __classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").get(jwksUri);
|
|
156
|
+
if (entry && Date.now() >= entry.expiresAt) {
|
|
157
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").delete(jwksUri);
|
|
158
|
+
entry = undefined;
|
|
159
|
+
}
|
|
160
|
+
let jwk = entry?.value.keys.find((jwk) => jwk.kid === kid);
|
|
161
|
+
if (!jwk && (!entry || Date.now() - entry.fetchedAt >= __classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksRefetchCooldownMs, "f"))) {
|
|
162
|
+
const jwkSet = await __classPrivateFieldGet(this, _JWKSOAuthKeyring_instances, "m", _JWKSOAuthKeyring_fetchJwks).call(this, issuer, jwksUri);
|
|
163
|
+
jwk = jwkSet.keys.find((jwk) => jwk.kid === kid);
|
|
145
164
|
}
|
|
146
|
-
const json = await response.json();
|
|
147
|
-
const jwkSet = JWKSetSchema.parse(json);
|
|
148
|
-
const jwk = jwkSet.keys.find((jwk) => jwk.kid === kid);
|
|
149
165
|
if (!jwk) {
|
|
150
166
|
throw new JWKSKeyNotFoundError(`Failed to find key "${kid}" of "${issuer}"`);
|
|
151
167
|
}
|
|
@@ -167,6 +183,38 @@ async function _JWKSOAuthKeyring_resolveKey(issuer, kid, jwksUri, cacheKey) {
|
|
|
167
183
|
})();
|
|
168
184
|
__classPrivateFieldGet(this, _JWKSOAuthKeyring_keyInflight, "f").set(cacheKey, promise);
|
|
169
185
|
return promise;
|
|
186
|
+
}, _JWKSOAuthKeyring_fetchJwks =
|
|
187
|
+
// -------------------------------------------------------
|
|
188
|
+
// JWKS fetch with dedup: concurrent misses for any kid share one fetch
|
|
189
|
+
// -------------------------------------------------------
|
|
190
|
+
async function _JWKSOAuthKeyring_fetchJwks(issuer, jwksUri) {
|
|
191
|
+
const inflight = __classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").get(jwksUri);
|
|
192
|
+
if (inflight) {
|
|
193
|
+
return inflight;
|
|
194
|
+
}
|
|
195
|
+
const promise = (async () => {
|
|
196
|
+
try {
|
|
197
|
+
const response = await fetch(jwksUri, {
|
|
198
|
+
signal: AbortSignal.timeout(__classPrivateFieldGet(this, _JWKSOAuthKeyring_fetchTimeoutMs, "f")),
|
|
199
|
+
});
|
|
200
|
+
if (!response.ok) {
|
|
201
|
+
throw new JWKSFetchError(`Failed to fetch JWKS from "${jwksUri}" for "${issuer}" (HTTP ${response.status})`);
|
|
202
|
+
}
|
|
203
|
+
const jwkSet = JWKSetSchema.parse(await response.json());
|
|
204
|
+
const now = Date.now();
|
|
205
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksCache, "f").set(jwksUri, {
|
|
206
|
+
value: jwkSet,
|
|
207
|
+
fetchedAt: now,
|
|
208
|
+
expiresAt: now + __classPrivateFieldGet(this, _JWKSOAuthKeyring_keyTtlMs, "f"),
|
|
209
|
+
});
|
|
210
|
+
return jwkSet;
|
|
211
|
+
}
|
|
212
|
+
finally {
|
|
213
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").delete(jwksUri);
|
|
214
|
+
}
|
|
215
|
+
})();
|
|
216
|
+
__classPrivateFieldGet(this, _JWKSOAuthKeyring_jwksInflight, "f").set(jwksUri, promise);
|
|
217
|
+
return promise;
|
|
170
218
|
}, _JWKSOAuthKeyring_getCached = function _JWKSOAuthKeyring_getCached(cache, key) {
|
|
171
219
|
const entry = cache.get(key);
|
|
172
220
|
if (!entry) {
|
package/dist/esm/keyring.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../src/keyring.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare const DEFAULT_DISCOVERY_TTL_MS: number;
|
|
2
2
|
export declare const DEFAULT_NEGATIVE_TTL_MS: number;
|
|
3
|
+
export declare const DEFAULT_FETCH_TIMEOUT_MS = 10000;
|
|
3
4
|
export interface TokenEndpointCacheOptions {
|
|
4
5
|
/** Cache lifetime for the discovered token endpoint. Default: 1 hour. */
|
|
5
6
|
discoveryTtlMs?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenEndpoint.d.ts","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,QAAiB,CAAC;AACvD,eAAO,MAAM,uBAAuB,QAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenEndpoint.d.ts","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,QAAiB,CAAC;AACvD,eAAO,MAAM,uBAAuB,QAAY,CAAC;AACjD,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAE/C,MAAM,WAAW,yBAAyB;IACxC,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAMD;;;;;;;GAOG;AACH,qBAAa,qBAAqB;;gBAQpB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;IAOvF,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CA0DjC"}
|
|
@@ -14,7 +14,7 @@ import { fetchAuthorizationServerMetadata } from "./discovery.js";
|
|
|
14
14
|
import { HTTPError, OAuthError, TokenEndpointDiscoveryError } from "./errors.js";
|
|
15
15
|
export const DEFAULT_DISCOVERY_TTL_MS = 60 * 60 * 1000;
|
|
16
16
|
export const DEFAULT_NEGATIVE_TTL_MS = 60 * 1000;
|
|
17
|
-
const DEFAULT_FETCH_TIMEOUT_MS = 10_000;
|
|
17
|
+
export const DEFAULT_FETCH_TIMEOUT_MS = 10_000;
|
|
18
18
|
/**
|
|
19
19
|
* Resolves and caches an issuer's token endpoint per the base rule that
|
|
20
20
|
* metadata failures are not sticky: success is cached for `discoveryTtlMs`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenEndpoint.js","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAEjF,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACvD,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,GAAG,IAAI,CAAC;AACjD,MAAM,wBAAwB,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenEndpoint.js","sourceRoot":"","sources":["../../src/tokenEndpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,11 @@ export interface TokenExchangeClientOptions extends TokenEndpointCacheOptions {
|
|
|
50
50
|
* authenticates the substitute-user exchange with its client assertion.
|
|
51
51
|
*/
|
|
52
52
|
credential?: ApplicationCredential;
|
|
53
|
+
/**
|
|
54
|
+
* Timeout for each request to the authorization server: token endpoint
|
|
55
|
+
* discovery and the token request itself. Default: 10 seconds.
|
|
56
|
+
*/
|
|
57
|
+
fetchTimeoutMs?: number;
|
|
53
58
|
}
|
|
54
59
|
export interface ExchangeOptions {
|
|
55
60
|
/** Zone issuer URL used to select per-zone credentials. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenExchange.d.ts","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,
|
|
1
|
+
{"version":3,"file":"tokenExchange.d.ts","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAmD,KAAK,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAMrH,eAAO,MAAM,SAAS;;IAEpB;;;OAGG;;CAEK,CAAC;AACX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAEnE,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,0BAA2B,SAAQ,yBAAyB;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA0BD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAqBrF;AAMD,qBAAa,mBAAmB;;gBAQlB,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,0BAA0B;IAS1D,aAAa,CACjB,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,CAAC;IAgDnB,WAAW,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC;IAoClE;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAG1C"}
|
|
@@ -9,10 +9,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
9
9
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
10
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
11
|
};
|
|
12
|
-
var _TokenExchangeClient_instances, _TokenExchangeClient_issuer, _TokenExchangeClient_clientId, _TokenExchangeClient_clientSecret, _TokenExchangeClient_credential, _TokenExchangeClient_tokenEndpoint, _TokenExchangeClient_resolveBasicAuth;
|
|
12
|
+
var _TokenExchangeClient_instances, _TokenExchangeClient_issuer, _TokenExchangeClient_clientId, _TokenExchangeClient_clientSecret, _TokenExchangeClient_credential, _TokenExchangeClient_tokenEndpoint, _TokenExchangeClient_fetchTimeoutMs, _TokenExchangeClient_resolveBasicAuth;
|
|
13
13
|
import { OAuthError } from "./errors.js";
|
|
14
14
|
import { buildSubstituteUserToken } from "./jwt/substituteUser.js";
|
|
15
|
-
import { TokenEndpointResolver } from "./tokenEndpoint.js";
|
|
15
|
+
import { DEFAULT_FETCH_TIMEOUT_MS, TokenEndpointResolver } from "./tokenEndpoint.js";
|
|
16
16
|
// =============================================================================
|
|
17
17
|
// Token Exchange Types (RFC 8693)
|
|
18
18
|
// =============================================================================
|
|
@@ -86,10 +86,12 @@ export class TokenExchangeClient {
|
|
|
86
86
|
_TokenExchangeClient_clientSecret.set(this, void 0);
|
|
87
87
|
_TokenExchangeClient_credential.set(this, void 0);
|
|
88
88
|
_TokenExchangeClient_tokenEndpoint.set(this, void 0);
|
|
89
|
+
_TokenExchangeClient_fetchTimeoutMs.set(this, void 0);
|
|
89
90
|
__classPrivateFieldSet(this, _TokenExchangeClient_issuer, issuer, "f");
|
|
90
91
|
__classPrivateFieldSet(this, _TokenExchangeClient_clientId, options?.clientId, "f");
|
|
91
92
|
__classPrivateFieldSet(this, _TokenExchangeClient_clientSecret, options?.clientSecret, "f");
|
|
92
93
|
__classPrivateFieldSet(this, _TokenExchangeClient_credential, options?.credential, "f");
|
|
94
|
+
__classPrivateFieldSet(this, _TokenExchangeClient_fetchTimeoutMs, options?.fetchTimeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS, "f");
|
|
93
95
|
__classPrivateFieldSet(this, _TokenExchangeClient_tokenEndpoint, new TokenEndpointResolver(issuer, options), "f");
|
|
94
96
|
}
|
|
95
97
|
async exchangeToken(request, options) {
|
|
@@ -107,6 +109,7 @@ export class TokenExchangeClient {
|
|
|
107
109
|
method: "POST",
|
|
108
110
|
headers,
|
|
109
111
|
body: body.toString(),
|
|
112
|
+
signal: AbortSignal.timeout(__classPrivateFieldGet(this, _TokenExchangeClient_fetchTimeoutMs, "f")),
|
|
110
113
|
});
|
|
111
114
|
if (!response.ok) {
|
|
112
115
|
try {
|
|
@@ -158,7 +161,7 @@ export class TokenExchangeClient {
|
|
|
158
161
|
return __classPrivateFieldGet(this, _TokenExchangeClient_tokenEndpoint, "f").resolve();
|
|
159
162
|
}
|
|
160
163
|
}
|
|
161
|
-
_TokenExchangeClient_issuer = new WeakMap(), _TokenExchangeClient_clientId = new WeakMap(), _TokenExchangeClient_clientSecret = new WeakMap(), _TokenExchangeClient_credential = new WeakMap(), _TokenExchangeClient_tokenEndpoint = new WeakMap(), _TokenExchangeClient_instances = new WeakSet(), _TokenExchangeClient_resolveBasicAuth = function _TokenExchangeClient_resolveBasicAuth(issuer) {
|
|
164
|
+
_TokenExchangeClient_issuer = new WeakMap(), _TokenExchangeClient_clientId = new WeakMap(), _TokenExchangeClient_clientSecret = new WeakMap(), _TokenExchangeClient_credential = new WeakMap(), _TokenExchangeClient_tokenEndpoint = new WeakMap(), _TokenExchangeClient_fetchTimeoutMs = new WeakMap(), _TokenExchangeClient_instances = new WeakSet(), _TokenExchangeClient_resolveBasicAuth = function _TokenExchangeClient_resolveBasicAuth(issuer) {
|
|
162
165
|
if (__classPrivateFieldGet(this, _TokenExchangeClient_credential, "f")) {
|
|
163
166
|
return __classPrivateFieldGet(this, _TokenExchangeClient_credential, "f").getAuth(issuer);
|
|
164
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenExchange.js","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAkC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenExchange.js","sourceRoot":"","sources":["../../src/tokenExchange.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keycardai/oauth",
|
|
3
|
-
"version": "0.26.
|
|
3
|
+
"version": "0.26.4",
|
|
4
4
|
"description": "[Preview] OAuth 2.0 primitives for Keycard: JWKS keyring, JWT signing/verification, server-tier token verifier, AccessContext, ClientSecret credentials, and impersonation via RFC 8693 token exchange",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -126,9 +126,9 @@
|
|
|
126
126
|
"zod": "^3.25.74"
|
|
127
127
|
},
|
|
128
128
|
"devDependencies": {
|
|
129
|
-
"@jest/globals": "^30.
|
|
129
|
+
"@jest/globals": "^30.5.2",
|
|
130
130
|
"@types/node": "^25.6.0",
|
|
131
|
-
"jest": "^30.
|
|
131
|
+
"jest": "^30.5.2",
|
|
132
132
|
"ts-jest": "^29.4.7",
|
|
133
133
|
"typescript": "^5.8.3"
|
|
134
134
|
},
|