@opentdf/sdk 0.19.0 → 0.20.0-rc.183
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/src/access/access-fetch.js +2 -2
- package/dist/cjs/src/access/access-rpc.js +4 -4
- package/dist/cjs/src/auth/oidc.js +32 -19
- package/dist/cjs/src/auth/token-providers.js +8 -41
- package/dist/cjs/src/auth/tokenExpiry.js +44 -0
- package/dist/cjs/src/version.js +1 -1
- package/dist/cjs/tdf3/src/tdf.js +7 -2
- package/dist/types/src/access/access-fetch.d.ts.map +1 -1
- package/dist/types/src/access/access-rpc.d.ts.map +1 -1
- package/dist/types/src/auth/oidc.d.ts +11 -2
- package/dist/types/src/auth/oidc.d.ts.map +1 -1
- package/dist/types/src/auth/token-providers.d.ts.map +1 -1
- package/dist/types/src/auth/tokenExpiry.d.ts +16 -0
- package/dist/types/src/auth/tokenExpiry.d.ts.map +1 -0
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/tdf3/src/tdf.d.ts.map +1 -1
- package/dist/web/src/access/access-fetch.js +2 -2
- package/dist/web/src/access/access-rpc.js +4 -4
- package/dist/web/src/auth/oidc.js +32 -19
- package/dist/web/src/auth/token-providers.js +2 -35
- package/dist/web/src/auth/tokenExpiry.js +39 -0
- package/dist/web/src/version.js +1 -1
- package/dist/web/tdf3/src/tdf.js +7 -2
- package/package.json +4 -3
- package/src/access/access-fetch.ts +3 -1
- package/src/access/access-rpc.ts +7 -3
- package/src/auth/oidc.ts +42 -18
- package/src/auth/token-providers.ts +1 -34
- package/src/auth/tokenExpiry.ts +38 -0
- package/src/version.ts +1 -1
- package/tdf3/src/tdf.ts +6 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isTokenExpired, resolveTokenExpiry } from './tokenExpiry.js';
|
|
1
2
|
import { ConfigurationError, TdfError } from '../errors.js';
|
|
2
3
|
import { rstrip } from '../utils.js';
|
|
3
4
|
function resolveTokenEndpoint(oidcOrigin, override) {
|
|
@@ -9,40 +10,6 @@ function resolveTokenEndpoint(oidcOrigin, override) {
|
|
|
9
10
|
}
|
|
10
11
|
return `${rstrip(base, '/')}/protocol/openid-connect/token`;
|
|
11
12
|
}
|
|
12
|
-
/**
|
|
13
|
-
* Decode a JWT's exp claim without verifying the signature.
|
|
14
|
-
* Returns the expiration time in seconds since epoch, or undefined if not present.
|
|
15
|
-
*/
|
|
16
|
-
function getJwtExpiration(token) {
|
|
17
|
-
try {
|
|
18
|
-
const parts = token.split('.');
|
|
19
|
-
if (parts.length !== 3)
|
|
20
|
-
return undefined;
|
|
21
|
-
// Base64url decode the payload
|
|
22
|
-
const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
23
|
-
const padded = payload + '='.repeat((4 - (payload.length % 4)) % 4);
|
|
24
|
-
const decoded = JSON.parse(atob(padded));
|
|
25
|
-
return typeof decoded.exp === 'number' ? decoded.exp : undefined;
|
|
26
|
-
}
|
|
27
|
-
catch {
|
|
28
|
-
return undefined;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
/**
|
|
32
|
-
* Compute the absolute expiry (seconds since epoch) for a token response.
|
|
33
|
-
* Prefers `expires_in` from the token response, falls back to the JWT `exp` claim.
|
|
34
|
-
*/
|
|
35
|
-
function resolveTokenExpiry(accessToken, expiresIn) {
|
|
36
|
-
if (typeof expiresIn === 'number') {
|
|
37
|
-
return Date.now() / 1000 + expiresIn;
|
|
38
|
-
}
|
|
39
|
-
return getJwtExpiration(accessToken);
|
|
40
|
-
}
|
|
41
|
-
function isTokenExpired(expiry, bufferSeconds = 30) {
|
|
42
|
-
if (expiry === undefined)
|
|
43
|
-
return true;
|
|
44
|
-
return Date.now() / 1000 >= expiry - bufferSeconds;
|
|
45
|
-
}
|
|
46
13
|
async function fetchToken(tokenEndpoint, body) {
|
|
47
14
|
const response = await fetch(tokenEndpoint, {
|
|
48
15
|
method: 'POST',
|
|
@@ -239,4 +206,4 @@ export function externalJwtTokenProvider(options) {
|
|
|
239
206
|
return inFlight;
|
|
240
207
|
};
|
|
241
208
|
}
|
|
242
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4tcHJvdmlkZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2F1dGgvdG9rZW4tcHJvdmlkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxjQUFjLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzVELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFxRHJDLFNBQVMsb0JBQW9CLENBQUMsVUFBa0IsRUFBRSxRQUFpQjtJQUNqRSxJQUFJLFFBQVEsRUFBRSxJQUFJLEVBQUU7UUFBRSxPQUFPLFFBQVEsQ0FBQztJQUN0QyxNQUFNLElBQUksR0FBRyxVQUFVLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDaEMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ1YsTUFBTSxJQUFJLGtCQUFrQixDQUFDLDZDQUE2QyxDQUFDLENBQUM7SUFDOUUsQ0FBQztJQUNELE9BQU8sR0FBRyxNQUFNLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBQztBQUM5RCxDQUFDO0FBRUQsS0FBSyxVQUFVLFVBQVUsQ0FDdkIsYUFBcUIsRUFDckIsSUFBNEI7SUFFNUIsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsYUFBYSxFQUFFO1FBQzFDLE1BQU0sRUFBRSxNQUFNO1FBQ2QsT0FBTyxFQUFFO1lBQ1AsY0FBYyxFQUFFLG1DQUFtQztZQUNuRCxNQUFNLEVBQUUsa0JBQWtCO1NBQzNCO1FBQ0QsSUFBSSxFQUFFLElBQUksZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRTtLQUMzQyxDQUFDLENBQUM7SUFDSCxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ2pCLE1BQU0sSUFBSSxHQUFHLE1BQU0sUUFBUSxDQUFDLElB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
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Helpers for deciding whether a cached access token is still fresh, using the
|
|
3
|
+
* JWT `exp` claim (or an OAuth `expires_in`) rather than a network round trip.
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* Decode a JWT's exp claim without verifying the signature.
|
|
7
|
+
* Returns the expiration time in seconds since epoch, or undefined if not present.
|
|
8
|
+
*/
|
|
9
|
+
export function getJwtExpiration(token) {
|
|
10
|
+
try {
|
|
11
|
+
const parts = token.split('.');
|
|
12
|
+
if (parts.length !== 3)
|
|
13
|
+
return undefined;
|
|
14
|
+
// Base64url decode the payload
|
|
15
|
+
const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
16
|
+
const padded = payload + '='.repeat((4 - (payload.length % 4)) % 4);
|
|
17
|
+
const decoded = JSON.parse(atob(padded));
|
|
18
|
+
return typeof decoded.exp === 'number' ? decoded.exp : undefined;
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Compute the absolute expiry (seconds since epoch) for a token response.
|
|
26
|
+
* Prefers `expires_in` from the token response, falls back to the JWT `exp` claim.
|
|
27
|
+
*/
|
|
28
|
+
export function resolveTokenExpiry(accessToken, expiresIn) {
|
|
29
|
+
if (typeof expiresIn === 'number') {
|
|
30
|
+
return Math.floor(Date.now() / 1000) + expiresIn;
|
|
31
|
+
}
|
|
32
|
+
return getJwtExpiration(accessToken);
|
|
33
|
+
}
|
|
34
|
+
export function isTokenExpired(expiry, bufferSeconds = 30) {
|
|
35
|
+
if (expiry === undefined)
|
|
36
|
+
return true;
|
|
37
|
+
return Math.floor(Date.now() / 1000) >= expiry - bufferSeconds;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5FeHBpcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXV0aC90b2tlbkV4cGlyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7O0dBR0c7QUFFSDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsS0FBYTtJQUM1QyxJQUFJLENBQUM7UUFDSCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9CLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFDekMsK0JBQStCO1FBQy9CLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDL0QsTUFBTSxNQUFNLEdBQUcsT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDcEUsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUN6QyxPQUFPLE9BQU8sT0FBTyxDQUFDLEdBQUcsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUNuRSxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztBQUNILENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsV0FBbUIsRUFBRSxTQUFrQjtJQUN4RSxJQUFJLE9BQU8sU0FBUyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ2xDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDO0lBQ25ELENBQUM7SUFDRCxPQUFPLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3ZDLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFDLE1BQTBCLEVBQUUsYUFBYSxHQUFHLEVBQUU7SUFDM0UsSUFBSSxNQUFNLEtBQUssU0FBUztRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3RDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksTUFBTSxHQUFHLGFBQWEsQ0FBQztBQUNqRSxDQUFDIn0=
|
package/dist/web/src/version.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Exposes the released version number of the `@opentdf/sdk` package
|
|
3
3
|
*/
|
|
4
|
-
export const version = '0.
|
|
4
|
+
export const version = '0.20.0'; // x-release-please-version
|
|
5
5
|
/**
|
|
6
6
|
* A string name used to label requests as coming from this library client.
|
|
7
7
|
*/
|
package/dist/web/tdf3/src/tdf.js
CHANGED
|
@@ -398,7 +398,12 @@ export function splitLookupTableFactory(keyAccess, allowedKases) {
|
|
|
398
398
|
for (const kao of keyAccess) {
|
|
399
399
|
const disjunction = splitPotentials[kao.sid ?? ''];
|
|
400
400
|
if (kao.url in disjunction) {
|
|
401
|
-
|
|
401
|
+
// TODO(DSPX-3454): Handle duplicate KAS URLs with different KIDs.
|
|
402
|
+
// Each KAO contains a KID - the function should be updated to use this
|
|
403
|
+
// information to differentiate between keys from the same KAS.
|
|
404
|
+
// Cross-SDK validation needed via xtest.
|
|
405
|
+
throw new InvalidFileError(`Unable to decrypt: Multiple keys detected for Key Access Server [${kao.url}]. ` +
|
|
406
|
+
`Please contact your administrator.`);
|
|
402
407
|
}
|
|
403
408
|
if (allowed(kao)) {
|
|
404
409
|
disjunction[kao.url] = kao;
|
|
@@ -909,4 +914,4 @@ async function concatenateUint8Array(uint8arrays) {
|
|
|
909
914
|
const buffer = await blob.arrayBuffer();
|
|
910
915
|
return new Uint8Array(buffer);
|
|
911
916
|
}
|
|
912
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tdf.js","sourceRoot":"","sources":["../../../../tdf3/src/tdf.ts"],"names":[],"mappings":"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"}
|
|
917
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tdf.js","sourceRoot":"","sources":["../../../../tdf3/src/tdf.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentdf/sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.0-rc.183",
|
|
4
4
|
"description": "OpenTDF for the Web",
|
|
5
5
|
"homepage": "https://github.com/opentdf/web-sdk",
|
|
6
6
|
"bugs": {
|
|
@@ -131,7 +131,7 @@
|
|
|
131
131
|
"karma-mocha": "^2.0.1",
|
|
132
132
|
"license-checker-rseidelsohn": "^4.4.2",
|
|
133
133
|
"mocha": "^11.1.0",
|
|
134
|
-
"nyc": "^
|
|
134
|
+
"nyc": "^18.0.0",
|
|
135
135
|
"prettier": "^3.5.3",
|
|
136
136
|
"process": "^0.11.10",
|
|
137
137
|
"sinon": "^21.0.1",
|
|
@@ -145,6 +145,7 @@
|
|
|
145
145
|
},
|
|
146
146
|
"overrides": {
|
|
147
147
|
"serialize-javascript": "^7.0.4",
|
|
148
|
-
"koa": "^2.16.4"
|
|
148
|
+
"koa": "^2.16.4",
|
|
149
|
+
"diff": "^8.0.3"
|
|
149
150
|
}
|
|
150
151
|
}
|
|
@@ -68,7 +68,9 @@ export async function fetchWrappedKey(
|
|
|
68
68
|
case 401:
|
|
69
69
|
throw new UnauthenticatedError(`401 for [${req.url}]; rewrap auth failure`);
|
|
70
70
|
case 403:
|
|
71
|
-
throw new PermissionDeniedError(
|
|
71
|
+
throw new PermissionDeniedError(
|
|
72
|
+
`403 for [${req.url}]; rewrap permission denied: forbidden`
|
|
73
|
+
);
|
|
72
74
|
default:
|
|
73
75
|
if (response.status >= 500) {
|
|
74
76
|
throw new ServiceError(
|
package/src/access/access-rpc.ts
CHANGED
|
@@ -64,7 +64,9 @@ export function handleRpcRewrapError(e: unknown, platformUrl: string): never {
|
|
|
64
64
|
case Code.InvalidArgument: // 400 Bad Request
|
|
65
65
|
throw new InvalidFileError(`400 for [${platformUrl}]: rewrap bad request [${e.message}]`);
|
|
66
66
|
case Code.PermissionDenied: // 403 Forbidden
|
|
67
|
-
throw new PermissionDeniedError(
|
|
67
|
+
throw new PermissionDeniedError(
|
|
68
|
+
`403 for [${platformUrl}]; rewrap permission denied: forbidden`
|
|
69
|
+
);
|
|
68
70
|
case Code.Unauthenticated: // 401 Unauthorized
|
|
69
71
|
throw new UnauthenticatedError(`401 for [${platformUrl}]; rewrap auth failure`);
|
|
70
72
|
case Code.Internal:
|
|
@@ -95,11 +97,13 @@ export function handleRpcRewrapErrorString(
|
|
|
95
97
|
if (e.includes(Code[Code.PermissionDenied])) {
|
|
96
98
|
if (requiredObligations && requiredObligations.length > 0) {
|
|
97
99
|
throw new PermissionDeniedError(
|
|
98
|
-
`403 for [${platformUrl}]; rewrap permission denied`,
|
|
100
|
+
`403 for [${platformUrl}]; rewrap permission denied: forbidden`,
|
|
99
101
|
requiredObligations
|
|
100
102
|
);
|
|
101
103
|
}
|
|
102
|
-
throw new PermissionDeniedError(
|
|
104
|
+
throw new PermissionDeniedError(
|
|
105
|
+
`403 for [${platformUrl}]; rewrap permission denied: forbidden`
|
|
106
|
+
);
|
|
103
107
|
}
|
|
104
108
|
if (e.includes(Code[Code.Unauthenticated])) {
|
|
105
109
|
// 401 Unauthorized
|
package/src/auth/oidc.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { default as dpopFn } from './dpop.js';
|
|
2
2
|
import { HttpRequest, withHeaders } from './auth.js';
|
|
3
|
+
import { isTokenExpired, resolveTokenExpiry } from './tokenExpiry.js';
|
|
3
4
|
import { base64 } from '../encodings/index.js';
|
|
4
5
|
import { ConfigurationError, TdfError } from '../errors.js';
|
|
5
6
|
import { rstrip } from '../utils.js';
|
|
@@ -60,6 +61,7 @@ const qstringify = (obj: Record<string, string>) => new URLSearchParams(obj).toS
|
|
|
60
61
|
export type AccessTokenResponse = {
|
|
61
62
|
access_token: string;
|
|
62
63
|
refresh_token?: string;
|
|
64
|
+
expires_in?: number;
|
|
63
65
|
};
|
|
64
66
|
|
|
65
67
|
/**
|
|
@@ -99,7 +101,11 @@ export class AccessToken {
|
|
|
99
101
|
|
|
100
102
|
extraHeaders: Record<string, string> = {};
|
|
101
103
|
|
|
102
|
-
|
|
104
|
+
/** Absolute expiry (seconds since epoch) of the cached access token in `data`. */
|
|
105
|
+
cachedExpiry?: number;
|
|
106
|
+
|
|
107
|
+
/** In-flight token exchange, used to dedupe concurrent `get()` calls. */
|
|
108
|
+
inFlight?: Promise<string>;
|
|
103
109
|
|
|
104
110
|
cryptoService: CryptoService;
|
|
105
111
|
|
|
@@ -227,18 +233,26 @@ export class AccessToken {
|
|
|
227
233
|
|
|
228
234
|
/**
|
|
229
235
|
* Gets an access token; operates lazily/cached, with an optional check for freshness.
|
|
230
|
-
*
|
|
236
|
+
*
|
|
237
|
+
* Freshness is determined locally from the token's `exp` claim (or the OAuth
|
|
238
|
+
* `expires_in` from the token response) — no network round trip. This replaces an
|
|
239
|
+
* earlier scheme that validated cached tokens against the OIDC `userinfo` endpoint.
|
|
240
|
+
* @param validate if we should check that any cached access token is still fresh
|
|
241
|
+
* before returning it; when false, a cached token is returned regardless of expiry
|
|
231
242
|
* @returns
|
|
232
243
|
*/
|
|
233
244
|
async get(validate = true): Promise<string> {
|
|
234
|
-
if (this.data?.access_token) {
|
|
245
|
+
if (this.data?.access_token && (!validate || !isTokenExpired(this.cachedExpiry))) {
|
|
246
|
+
return this.data.access_token;
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
// Dedupe concurrent refreshes so a burst of requests triggers one exchange.
|
|
250
|
+
if (this.inFlight) {
|
|
251
|
+
return this.inFlight;
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
this.inFlight = (async () => {
|
|
235
255
|
try {
|
|
236
|
-
if (validate) {
|
|
237
|
-
await this.info(this.data.access_token);
|
|
238
|
-
}
|
|
239
|
-
return this.data.access_token;
|
|
240
|
-
} catch (e) {
|
|
241
|
-
console.log('access_token fails on user_info endpoint; attempting to renew', e);
|
|
242
256
|
if (this.data?.refresh_token) {
|
|
243
257
|
// Prefer the latest refresh_token if present over creds passed in
|
|
244
258
|
// to constructor
|
|
@@ -249,11 +263,19 @@ export class AccessToken {
|
|
|
249
263
|
};
|
|
250
264
|
}
|
|
251
265
|
delete this.data;
|
|
266
|
+
|
|
267
|
+
const tokenResponse = (this.data = await this.accessTokenLookup(this.config));
|
|
268
|
+
this.cachedExpiry = resolveTokenExpiry(
|
|
269
|
+
tokenResponse.access_token,
|
|
270
|
+
tokenResponse.expires_in
|
|
271
|
+
);
|
|
272
|
+
return tokenResponse.access_token;
|
|
273
|
+
} finally {
|
|
274
|
+
delete this.inFlight;
|
|
252
275
|
}
|
|
253
|
-
}
|
|
276
|
+
})();
|
|
254
277
|
|
|
255
|
-
|
|
256
|
-
return tokenResponse.access_token;
|
|
278
|
+
return this.inFlight;
|
|
257
279
|
}
|
|
258
280
|
|
|
259
281
|
/**
|
|
@@ -264,13 +286,15 @@ export class AccessToken {
|
|
|
264
286
|
* Calling this function will trigger a forcible token refresh using the cached refresh token, and contact the auth server.
|
|
265
287
|
*/
|
|
266
288
|
async refreshTokenClaimsWithClientPubkeyIfNeeded(signingKey: KeyPair): Promise<void> {
|
|
267
|
-
// If we already have a token, and the pubkey
|
|
268
|
-
// we
|
|
269
|
-
//
|
|
270
|
-
if (this.
|
|
289
|
+
// If we already have a token, and the pubkey is unchanged,
|
|
290
|
+
// we can keep the cached token - otherwise drop it so the next `get()`
|
|
291
|
+
// refetches a token bound to the new public key.
|
|
292
|
+
if (this.data?.access_token && signingKey === this.signingKey) {
|
|
271
293
|
return;
|
|
272
294
|
}
|
|
273
|
-
delete this.
|
|
295
|
+
delete this.data;
|
|
296
|
+
delete this.cachedExpiry;
|
|
297
|
+
delete this.inFlight;
|
|
274
298
|
this.signingKey = signingKey;
|
|
275
299
|
}
|
|
276
300
|
|
|
@@ -307,7 +331,7 @@ export class AccessToken {
|
|
|
307
331
|
'Client public key was not set via `updateClientPublicKey` or passed in via constructor; required when DPoP is enabled'
|
|
308
332
|
);
|
|
309
333
|
}
|
|
310
|
-
const accessToken =
|
|
334
|
+
const accessToken = await this.get();
|
|
311
335
|
if (this.config.dpopEnabled && this.signingKey) {
|
|
312
336
|
const dpopToken = await dpopFn(
|
|
313
337
|
this.signingKey,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type TokenProvider } from './interceptors.js';
|
|
2
|
+
import { isTokenExpired, resolveTokenExpiry } from './tokenExpiry.js';
|
|
2
3
|
import { ConfigurationError, TdfError } from '../errors.js';
|
|
3
4
|
import { rstrip } from '../utils.js';
|
|
4
5
|
|
|
@@ -62,40 +63,6 @@ function resolveTokenEndpoint(oidcOrigin: string, override?: string): string {
|
|
|
62
63
|
return `${rstrip(base, '/')}/protocol/openid-connect/token`;
|
|
63
64
|
}
|
|
64
65
|
|
|
65
|
-
/**
|
|
66
|
-
* Decode a JWT's exp claim without verifying the signature.
|
|
67
|
-
* Returns the expiration time in seconds since epoch, or undefined if not present.
|
|
68
|
-
*/
|
|
69
|
-
function getJwtExpiration(token: string): number | undefined {
|
|
70
|
-
try {
|
|
71
|
-
const parts = token.split('.');
|
|
72
|
-
if (parts.length !== 3) return undefined;
|
|
73
|
-
// Base64url decode the payload
|
|
74
|
-
const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
75
|
-
const padded = payload + '='.repeat((4 - (payload.length % 4)) % 4);
|
|
76
|
-
const decoded = JSON.parse(atob(padded));
|
|
77
|
-
return typeof decoded.exp === 'number' ? decoded.exp : undefined;
|
|
78
|
-
} catch {
|
|
79
|
-
return undefined;
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
/**
|
|
84
|
-
* Compute the absolute expiry (seconds since epoch) for a token response.
|
|
85
|
-
* Prefers `expires_in` from the token response, falls back to the JWT `exp` claim.
|
|
86
|
-
*/
|
|
87
|
-
function resolveTokenExpiry(accessToken: string, expiresIn?: number): number | undefined {
|
|
88
|
-
if (typeof expiresIn === 'number') {
|
|
89
|
-
return Date.now() / 1000 + expiresIn;
|
|
90
|
-
}
|
|
91
|
-
return getJwtExpiration(accessToken);
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
function isTokenExpired(expiry: number | undefined, bufferSeconds = 30): boolean {
|
|
95
|
-
if (expiry === undefined) return true;
|
|
96
|
-
return Date.now() / 1000 >= expiry - bufferSeconds;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
66
|
async function fetchToken(
|
|
100
67
|
tokenEndpoint: string,
|
|
101
68
|
body: Record<string, string>
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Helpers for deciding whether a cached access token is still fresh, using the
|
|
3
|
+
* JWT `exp` claim (or an OAuth `expires_in`) rather than a network round trip.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Decode a JWT's exp claim without verifying the signature.
|
|
8
|
+
* Returns the expiration time in seconds since epoch, or undefined if not present.
|
|
9
|
+
*/
|
|
10
|
+
export function getJwtExpiration(token: string): number | undefined {
|
|
11
|
+
try {
|
|
12
|
+
const parts = token.split('.');
|
|
13
|
+
if (parts.length !== 3) return undefined;
|
|
14
|
+
// Base64url decode the payload
|
|
15
|
+
const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
16
|
+
const padded = payload + '='.repeat((4 - (payload.length % 4)) % 4);
|
|
17
|
+
const decoded = JSON.parse(atob(padded));
|
|
18
|
+
return typeof decoded.exp === 'number' ? decoded.exp : undefined;
|
|
19
|
+
} catch {
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Compute the absolute expiry (seconds since epoch) for a token response.
|
|
26
|
+
* Prefers `expires_in` from the token response, falls back to the JWT `exp` claim.
|
|
27
|
+
*/
|
|
28
|
+
export function resolveTokenExpiry(accessToken: string, expiresIn?: number): number | undefined {
|
|
29
|
+
if (typeof expiresIn === 'number') {
|
|
30
|
+
return Math.floor(Date.now() / 1000) + expiresIn;
|
|
31
|
+
}
|
|
32
|
+
return getJwtExpiration(accessToken);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function isTokenExpired(expiry: number | undefined, bufferSeconds = 30): boolean {
|
|
36
|
+
if (expiry === undefined) return true;
|
|
37
|
+
return Math.floor(Date.now() / 1000) >= expiry - bufferSeconds;
|
|
38
|
+
}
|
package/src/version.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Exposes the released version number of the `@opentdf/sdk` package
|
|
3
3
|
*/
|
|
4
|
-
export const version = '0.
|
|
4
|
+
export const version = '0.20.0'; // x-release-please-version
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* A string name used to label requests as coming from this library client.
|