@opentdf/sdk 0.19.0-rc.169 → 0.20.0-beta.181
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
|
@@ -45,7 +45,7 @@ async function fetchWrappedKey(url, requestBody, authProvider) {
|
|
|
45
45
|
case 401:
|
|
46
46
|
throw new errors_js_1.UnauthenticatedError(`401 for [${req.url}]; rewrap auth failure`);
|
|
47
47
|
case 403:
|
|
48
|
-
throw new errors_js_1.PermissionDeniedError(`403 for [${req.url}]; rewrap permission denied`);
|
|
48
|
+
throw new errors_js_1.PermissionDeniedError(`403 for [${req.url}]; rewrap permission denied: forbidden`);
|
|
49
49
|
default:
|
|
50
50
|
if (response.status >= 500) {
|
|
51
51
|
throw new errors_js_1.ServiceError(`${response.status} for [${req.url}]: rewrap failure due to service error [${await response.text()}]`);
|
|
@@ -152,4 +152,4 @@ async function fetchKasPubKey(kasEndpoint, algorithm) {
|
|
|
152
152
|
...(kid && { kid }),
|
|
153
153
|
};
|
|
154
154
|
}
|
|
155
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjZXNzLWZldGNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FjY2Vzcy9hY2Nlc3MtZmV0Y2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUE4QkEsMENBd0RDO0FBRUQsc0RBK0NDO0FBRUQsd0NBNkRDO0FBdE1ELDRDQUF3RjtBQUV4Riw0Q0FPc0I7QUFDdEIsMENBQWdEO0FBYWhEOzs7Ozs7R0FNRztBQUNJLEtBQUssVUFBVSxlQUFlLENBQ25DLEdBQVcsRUFDWCxXQUEwQixFQUMxQixZQUEwQjtJQUUxQixNQUFNLEdBQUcsR0FBRyxNQUFNLFlBQVksQ0FBQyxTQUFTLENBQUM7UUFDdkMsR0FBRztRQUNILE1BQU0sRUFBRSxNQUFNO1FBQ2QsT0FBTyxFQUFFO1lBQ1AsY0FBYyxFQUFFLGtCQUFrQjtTQUNuQztRQUNELElBQUksRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQztLQUNsQyxDQUFDLENBQUM7SUFFSCxJQUFJLFFBQWtCLENBQUM7SUFFdkIsSUFBSSxDQUFDO1FBQ0gsUUFBUSxHQUFHLE1BQU0sS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNO1lBQ2xCLElBQUksRUFBRSxNQUFNLEVBQUUsOEJBQThCO1lBQzVDLEtBQUssRUFBRSxVQUFVLEVBQUUsMERBQTBEO1lBQzdFLFdBQVcsRUFBRSxhQUFhLEVBQUUsOEJBQThCO1lBQzFELE9BQU8sRUFBRSxHQUFHLENBQUMsT0FBTztZQUNwQixRQUFRLEVBQUUsUUFBUSxFQUFFLHlCQUF5QjtZQUM3QyxjQUFjLEVBQUUsYUFBYSxFQUFFLHNKQUFzSjtZQUNyTCxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQWdCO1NBQzNCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ1gsTUFBTSxJQUFJLHdCQUFZLENBQUMscUNBQXFDLEdBQUcsR0FBRyxF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
|
|
@@ -46,7 +46,7 @@ function handleRpcRewrapError(e, platformUrl) {
|
|
|
46
46
|
case connect_1.Code.InvalidArgument: // 400 Bad Request
|
|
47
47
|
throw new errors_js_1.InvalidFileError(`400 for [${platformUrl}]: rewrap bad request [${e.message}]`);
|
|
48
48
|
case connect_1.Code.PermissionDenied: // 403 Forbidden
|
|
49
|
-
throw new errors_js_1.PermissionDeniedError(`403 for [${platformUrl}]; rewrap permission denied`);
|
|
49
|
+
throw new errors_js_1.PermissionDeniedError(`403 for [${platformUrl}]; rewrap permission denied: forbidden`);
|
|
50
50
|
case connect_1.Code.Unauthenticated: // 401 Unauthorized
|
|
51
51
|
throw new errors_js_1.UnauthenticatedError(`401 for [${platformUrl}]; rewrap auth failure`);
|
|
52
52
|
case connect_1.Code.Internal:
|
|
@@ -69,9 +69,9 @@ function handleRpcRewrapErrorString(e, platformUrl, requiredObligations) {
|
|
|
69
69
|
}
|
|
70
70
|
if (e.includes(connect_1.Code[connect_1.Code.PermissionDenied])) {
|
|
71
71
|
if (requiredObligations && requiredObligations.length > 0) {
|
|
72
|
-
throw new errors_js_1.PermissionDeniedError(`403 for [${platformUrl}]; rewrap permission denied`, requiredObligations);
|
|
72
|
+
throw new errors_js_1.PermissionDeniedError(`403 for [${platformUrl}]; rewrap permission denied: forbidden`, requiredObligations);
|
|
73
73
|
}
|
|
74
|
-
throw new errors_js_1.PermissionDeniedError(`403 for [${platformUrl}]; rewrap permission denied`);
|
|
74
|
+
throw new errors_js_1.PermissionDeniedError(`403 for [${platformUrl}]; rewrap permission denied: forbidden`);
|
|
75
75
|
}
|
|
76
76
|
if (e.includes(connect_1.Code[connect_1.Code.Unauthenticated])) {
|
|
77
77
|
// 401 Unauthorized
|
|
@@ -187,4 +187,4 @@ async function fetchKasBasePubKey(kasEndpoint) {
|
|
|
187
187
|
throw new errors_js_1.NetworkError(`[${platformUrl}] [PublicKey] ${(0, utils_js_1.extractRpcErrorMessage)(e)}`);
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"access-rpc.js","sourceRoot":"","sources":["../../../../src/access/access-rpc.ts"],"names":[],"mappings":";;AAoCA,0CAqBC;AAED,oDA0BC;AAED,gEAoCC;AAED,sDAiCC;AA2BD,wCA6BC;AASD,gDA6BC;AA3PD,4CAKsB;AAEtB,6DAA+E;AAC/E,4CAOsB;AACtB,gDAAgD;AAGhD,0CAIqB;AACrB,iDAA6D;AAC7D,iDAAyD;AAEzD;;;;;;;GAOG;AACI,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,kBAA0B,EAC1B,IAAgB,EAChB,6BAAsC;IAEtC,MAAM,WAAW,GAAG,IAAA,wCAA6B,EAAC,GAAG,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,IAAI,4BAAc,CAAC,EAAE,YAAY,EAAE,IAAA,qCAAmB,EAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAgB,EAAE,CAAC;IAChC,IAAI,6BAA6B,EAAE,CAAC;QAClC,OAAO,CAAC,OAAO,GAAG;YAChB,CAAC,0CAA2B,CAAC,EAAE,6BAA6B;SAC7D,CAAC;IACJ,CAAC;IACD,IAAI,QAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,oBAAoB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,oBAAoB,CAAC,CAAU,EAAE,WAAmB;IAClE,IAAI,CAAC,YAAY,sBAAY,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,cAAI,CAAC,eAAe,EAAE,kBAAkB;gBAC3C,MAAM,IAAI,4BAAgB,CAAC,YAAY,WAAW,0BAA0B,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;YAC5F,KAAK,cAAI,CAAC,gBAAgB,EAAE,gBAAgB;gBAC1C,MAAM,IAAI,iCAAqB,CAC7B,YAAY,WAAW,wCAAwC,CAChE,CAAC;YACJ,KAAK,cAAI,CAAC,eAAe,EAAE,mBAAmB;gBAC5C,MAAM,IAAI,gCAAoB,CAAC,YAAY,WAAW,wBAAwB,CAAC,CAAC;YAClF,KAAK,cAAI,CAAC,QAAQ,CAAC;YACnB,KAAK,cAAI,CAAC,aAAa,CAAC;YACxB,KAAK,cAAI,CAAC,QAAQ,CAAC;YACnB,KAAK,cAAI,CAAC,OAAO,CAAC;YAClB,KAAK,cAAI,CAAC,gBAAgB,CAAC;YAC3B,KAAK,cAAI,CAAC,WAAW,EAAE,qBAAqB;gBAC1C,MAAM,IAAI,wBAAY,CACpB,GAAG,CAAC,CAAC,IAAI,SAAS,WAAW,2CAA2C,CAAC,CAAC,OAAO,GAAG,CACrF,CAAC;YACJ;gBACE,MAAM,IAAI,wBAAY,CAAC,IAAI,WAAW,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,wBAAY,CAAC,IAAI,WAAW,cAAc,IAAA,iCAAsB,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACnF,CAAC;AAED,SAAgB,0BAA0B,CACxC,CAAS,EACT,WAAmB,EACnB,mBAA8B;IAE9B,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;QAC3C,kBAAkB;QAClB,MAAM,IAAI,4BAAgB,CAAC,YAAY,WAAW,0BAA0B,CAAC,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC;QAC5C,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1D,MAAM,IAAI,iCAAqB,CAC7B,YAAY,WAAW,wCAAwC,EAC/D,mBAAmB,CACpB,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,iCAAqB,CAC7B,YAAY,WAAW,wCAAwC,CAChE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;QAC3C,mBAAmB;QACnB,MAAM,IAAI,gCAAoB,CAAC,YAAY,WAAW,wBAAwB,CAAC,CAAC;IAClF,CAAC;IACD,IACE,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,gBAAgB,CAAC,CAAC;QACvC,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,cAAI,CAAC,WAAW,CAAC,CAAC,EAClC,CAAC;QACD,QAAQ;QACR,MAAM,IAAI,wBAAY,CAAC,SAAS,WAAW,2CAA2C,CAAC,GAAG,CAAC,CAAC;IAC9F,CAAC;IACD,MAAM,IAAI,wBAAY,CAAC,IAAI,WAAW,cAAc,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,WAAmB,EACnB,IAAgB;IAEhB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,QAAQ,GAAG,IAAI,4BAAc,CAAC,EAAE,YAAY,EAAE,IAAA,qCAAmB,EAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAE9F,GAAG,CAAC;QACF,IAAI,QAAsC,CAAC;QAC3C,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,uBAAuB,CAAC,oBAAoB,CAAC;gBACxE,UAAU,EAAE;oBACV,MAAM,EAAE,UAAU;iBACnB;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,wBAAY,CACpB,IAAI,WAAW,4BAA4B,IAAA,iCAAsB,EAAC,CAAC,CAAC,EAAE,CACvE,CAAC;QACJ,CAAC;QAED,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC9C,UAAU,GAAG,QAAQ,EAAE,UAAU,EAAE,UAAU,IAAI,CAAC,CAAC;IACrD,CAAC,QAAQ,UAAU,GAAG,CAAC,EAAE;IAEzB,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,wBAAwB;IACxB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,CAAC;QAC/C,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,IAAI,2BAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAChD,CAAC;AAYD,SAAS,SAAS,CAAC,OAAiB;IAClC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,EAAE,GAAG,OAA0B,CAAC;IACtC,OAAO,CACL,CAAC,CAAC,EAAE,CAAC,OAAO;QACZ,CAAC,CAAC,EAAE,CAAC,UAAU;QACf,OAAO,EAAE,CAAC,UAAU,KAAK,QAAQ;QACjC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG;QACnB,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS;QACzB,IAAA,gCAAoB,EAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAC9C,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,WAAmB,EACnB,SAAiC;IAEjC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,8BAAkB,CAAC,0BAA0B,CAAC,CAAC;IAC3D,CAAC;IACD,uDAAuD;IACvD,IAAA,4BAAiB,EAAC,WAAW,CAAC,CAAC;IAE/B,MAAM,WAAW,GAAG,IAAA,wCAA6B,EAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,4BAAc,CAAC;QAClC,WAAW;KACZ,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;YAC5D,SAAS,EAAE,SAAS,IAAI,UAAU;YAClC,CAAC,EAAE,GAAG;SACP,CAAC,CAAC;QACH,MAAM,MAAM,GAAqB;YAC/B,SAAS;YACT,GAAG,EAAE,WAAW;YAChB,SAAS,EAAE,SAAS,IAAI,UAAU;YAClC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;SACpB,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,wBAAY,CAAC,IAAI,WAAW,iBAAiB,IAAA,iCAAsB,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CAAC,WAAmB;IAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,8BAAkB,CAAC,0BAA0B,CAAC,CAAC;IAC3D,CAAC;IACD,IAAA,4BAAiB,EAAC,WAAW,CAAC,CAAC;IAE/B,MAAM,WAAW,GAAG,IAAA,wCAA6B,EAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,4BAAc,CAAC;QAClC,WAAW;KACZ,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,aAAa,EAAE,QAAsC,CAAC;QACtE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,wBAAY,CACpB,oCAAoC,WAAW,gDAAgD,CAChG,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAqB;YAC/B,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG;YACjC,GAAG,EAAE,OAAO,CAAC,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;YACvC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG;SAC5B,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,wBAAY,CAAC,IAAI,WAAW,iBAAiB,IAAA,iCAAsB,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;AACH,CAAC"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.AccessToken = void 0;
|
|
7
7
|
const dpop_js_1 = __importDefault(require("./dpop.js"));
|
|
8
8
|
const auth_js_1 = require("./auth.js");
|
|
9
|
+
const tokenExpiry_js_1 = require("./tokenExpiry.js");
|
|
9
10
|
const index_js_1 = require("../encodings/index.js");
|
|
10
11
|
const errors_js_1 = require("../errors.js");
|
|
11
12
|
const utils_js_1 = require("../utils.js");
|
|
@@ -140,19 +141,24 @@ class AccessToken {
|
|
|
140
141
|
}
|
|
141
142
|
/**
|
|
142
143
|
* Gets an access token; operates lazily/cached, with an optional check for freshness.
|
|
143
|
-
*
|
|
144
|
+
*
|
|
145
|
+
* Freshness is determined locally from the token's `exp` claim (or the OAuth
|
|
146
|
+
* `expires_in` from the token response) — no network round trip. This replaces an
|
|
147
|
+
* earlier scheme that validated cached tokens against the OIDC `userinfo` endpoint.
|
|
148
|
+
* @param validate if we should check that any cached access token is still fresh
|
|
149
|
+
* before returning it; when false, a cached token is returned regardless of expiry
|
|
144
150
|
* @returns
|
|
145
151
|
*/
|
|
146
152
|
async get(validate = true) {
|
|
147
|
-
if (this.data?.access_token) {
|
|
153
|
+
if (this.data?.access_token && (!validate || !(0, tokenExpiry_js_1.isTokenExpired)(this.cachedExpiry))) {
|
|
154
|
+
return this.data.access_token;
|
|
155
|
+
}
|
|
156
|
+
// Dedupe concurrent refreshes so a burst of requests triggers one exchange.
|
|
157
|
+
if (this.inFlight) {
|
|
158
|
+
return this.inFlight;
|
|
159
|
+
}
|
|
160
|
+
this.inFlight = (async () => {
|
|
148
161
|
try {
|
|
149
|
-
if (validate) {
|
|
150
|
-
await this.info(this.data.access_token);
|
|
151
|
-
}
|
|
152
|
-
return this.data.access_token;
|
|
153
|
-
}
|
|
154
|
-
catch (e) {
|
|
155
|
-
console.log('access_token fails on user_info endpoint; attempting to renew', e);
|
|
156
162
|
if (this.data?.refresh_token) {
|
|
157
163
|
// Prefer the latest refresh_token if present over creds passed in
|
|
158
164
|
// to constructor
|
|
@@ -163,10 +169,15 @@ class AccessToken {
|
|
|
163
169
|
};
|
|
164
170
|
}
|
|
165
171
|
delete this.data;
|
|
172
|
+
const tokenResponse = (this.data = await this.accessTokenLookup(this.config));
|
|
173
|
+
this.cachedExpiry = (0, tokenExpiry_js_1.resolveTokenExpiry)(tokenResponse.access_token, tokenResponse.expires_in);
|
|
174
|
+
return tokenResponse.access_token;
|
|
166
175
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
176
|
+
finally {
|
|
177
|
+
delete this.inFlight;
|
|
178
|
+
}
|
|
179
|
+
})();
|
|
180
|
+
return this.inFlight;
|
|
170
181
|
}
|
|
171
182
|
/**
|
|
172
183
|
* A TDF client MUST call this method whenever the client wants to use a new
|
|
@@ -176,13 +187,15 @@ class AccessToken {
|
|
|
176
187
|
* Calling this function will trigger a forcible token refresh using the cached refresh token, and contact the auth server.
|
|
177
188
|
*/
|
|
178
189
|
async refreshTokenClaimsWithClientPubkeyIfNeeded(signingKey) {
|
|
179
|
-
// If we already have a token, and the pubkey
|
|
180
|
-
// we
|
|
181
|
-
//
|
|
182
|
-
if (this.
|
|
190
|
+
// If we already have a token, and the pubkey is unchanged,
|
|
191
|
+
// we can keep the cached token - otherwise drop it so the next `get()`
|
|
192
|
+
// refetches a token bound to the new public key.
|
|
193
|
+
if (this.data?.access_token && signingKey === this.signingKey) {
|
|
183
194
|
return;
|
|
184
195
|
}
|
|
185
|
-
delete this.
|
|
196
|
+
delete this.data;
|
|
197
|
+
delete this.cachedExpiry;
|
|
198
|
+
delete this.inFlight;
|
|
186
199
|
this.signingKey = signingKey;
|
|
187
200
|
}
|
|
188
201
|
/**
|
|
@@ -213,7 +226,7 @@ class AccessToken {
|
|
|
213
226
|
if (this.config.dpopEnabled && !this.signingKey) {
|
|
214
227
|
throw new errors_js_1.ConfigurationError('Client public key was not set via `updateClientPublicKey` or passed in via constructor; required when DPoP is enabled');
|
|
215
228
|
}
|
|
216
|
-
const accessToken =
|
|
229
|
+
const accessToken = await this.get();
|
|
217
230
|
if (this.config.dpopEnabled && this.signingKey) {
|
|
218
231
|
const dpopToken = await (0, dpop_js_1.default)(this.signingKey, this.cryptoService, httpReq.url, httpReq.method,
|
|
219
232
|
/* nonce */ undefined, accessToken);
|
|
@@ -224,4 +237,4 @@ class AccessToken {
|
|
|
224
237
|
}
|
|
225
238
|
}
|
|
226
239
|
exports.AccessToken = AccessToken;
|
|
227
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
240
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../src/auth/oidc.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.clientCredentialsTokenProvider = clientCredentialsTokenProvider;
|
|
4
4
|
exports.refreshTokenProvider = refreshTokenProvider;
|
|
5
5
|
exports.externalJwtTokenProvider = externalJwtTokenProvider;
|
|
6
|
+
const tokenExpiry_js_1 = require("./tokenExpiry.js");
|
|
6
7
|
const errors_js_1 = require("../errors.js");
|
|
7
8
|
const utils_js_1 = require("../utils.js");
|
|
8
9
|
function resolveTokenEndpoint(oidcOrigin, override) {
|
|
@@ -14,40 +15,6 @@ function resolveTokenEndpoint(oidcOrigin, override) {
|
|
|
14
15
|
}
|
|
15
16
|
return `${(0, utils_js_1.rstrip)(base, '/')}/protocol/openid-connect/token`;
|
|
16
17
|
}
|
|
17
|
-
/**
|
|
18
|
-
* Decode a JWT's exp claim without verifying the signature.
|
|
19
|
-
* Returns the expiration time in seconds since epoch, or undefined if not present.
|
|
20
|
-
*/
|
|
21
|
-
function getJwtExpiration(token) {
|
|
22
|
-
try {
|
|
23
|
-
const parts = token.split('.');
|
|
24
|
-
if (parts.length !== 3)
|
|
25
|
-
return undefined;
|
|
26
|
-
// Base64url decode the payload
|
|
27
|
-
const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
28
|
-
const padded = payload + '='.repeat((4 - (payload.length % 4)) % 4);
|
|
29
|
-
const decoded = JSON.parse(atob(padded));
|
|
30
|
-
return typeof decoded.exp === 'number' ? decoded.exp : undefined;
|
|
31
|
-
}
|
|
32
|
-
catch {
|
|
33
|
-
return undefined;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
/**
|
|
37
|
-
* Compute the absolute expiry (seconds since epoch) for a token response.
|
|
38
|
-
* Prefers `expires_in` from the token response, falls back to the JWT `exp` claim.
|
|
39
|
-
*/
|
|
40
|
-
function resolveTokenExpiry(accessToken, expiresIn) {
|
|
41
|
-
if (typeof expiresIn === 'number') {
|
|
42
|
-
return Date.now() / 1000 + expiresIn;
|
|
43
|
-
}
|
|
44
|
-
return getJwtExpiration(accessToken);
|
|
45
|
-
}
|
|
46
|
-
function isTokenExpired(expiry, bufferSeconds = 30) {
|
|
47
|
-
if (expiry === undefined)
|
|
48
|
-
return true;
|
|
49
|
-
return Date.now() / 1000 >= expiry - bufferSeconds;
|
|
50
|
-
}
|
|
51
18
|
async function fetchToken(tokenEndpoint, body) {
|
|
52
19
|
const response = await fetch(tokenEndpoint, {
|
|
53
20
|
method: 'POST',
|
|
@@ -91,7 +58,7 @@ function clientCredentialsTokenProvider(options) {
|
|
|
91
58
|
let cachedExpiry;
|
|
92
59
|
let inFlight;
|
|
93
60
|
return async () => {
|
|
94
|
-
if (cachedToken && !isTokenExpired(cachedExpiry)) {
|
|
61
|
+
if (cachedToken && !(0, tokenExpiry_js_1.isTokenExpired)(cachedExpiry)) {
|
|
95
62
|
return cachedToken;
|
|
96
63
|
}
|
|
97
64
|
if (!inFlight) {
|
|
@@ -103,7 +70,7 @@ function clientCredentialsTokenProvider(options) {
|
|
|
103
70
|
client_secret: options.clientSecret,
|
|
104
71
|
});
|
|
105
72
|
cachedToken = resp.access_token;
|
|
106
|
-
cachedExpiry = resolveTokenExpiry(resp.access_token, resp.expires_in);
|
|
73
|
+
cachedExpiry = (0, tokenExpiry_js_1.resolveTokenExpiry)(resp.access_token, resp.expires_in);
|
|
107
74
|
return cachedToken;
|
|
108
75
|
}
|
|
109
76
|
finally {
|
|
@@ -141,7 +108,7 @@ function refreshTokenProvider(options) {
|
|
|
141
108
|
let cachedExpiry;
|
|
142
109
|
let inFlight;
|
|
143
110
|
return async () => {
|
|
144
|
-
if (cachedToken && !isTokenExpired(cachedExpiry)) {
|
|
111
|
+
if (cachedToken && !(0, tokenExpiry_js_1.isTokenExpired)(cachedExpiry)) {
|
|
145
112
|
return cachedToken;
|
|
146
113
|
}
|
|
147
114
|
if (!inFlight) {
|
|
@@ -153,7 +120,7 @@ function refreshTokenProvider(options) {
|
|
|
153
120
|
client_id: options.clientId,
|
|
154
121
|
});
|
|
155
122
|
cachedToken = resp.access_token;
|
|
156
|
-
cachedExpiry = resolveTokenExpiry(resp.access_token, resp.expires_in);
|
|
123
|
+
cachedExpiry = (0, tokenExpiry_js_1.resolveTokenExpiry)(resp.access_token, resp.expires_in);
|
|
157
124
|
if (resp.refresh_token) {
|
|
158
125
|
currentRefreshToken = resp.refresh_token;
|
|
159
126
|
}
|
|
@@ -195,7 +162,7 @@ function externalJwtTokenProvider(options) {
|
|
|
195
162
|
let initialExchangeDone = false;
|
|
196
163
|
let inFlight;
|
|
197
164
|
return async () => {
|
|
198
|
-
if (cachedToken && !isTokenExpired(cachedExpiry)) {
|
|
165
|
+
if (cachedToken && !(0, tokenExpiry_js_1.isTokenExpired)(cachedExpiry)) {
|
|
199
166
|
return cachedToken;
|
|
200
167
|
}
|
|
201
168
|
if (!inFlight) {
|
|
@@ -230,7 +197,7 @@ function externalJwtTokenProvider(options) {
|
|
|
230
197
|
});
|
|
231
198
|
}
|
|
232
199
|
cachedToken = resp.access_token;
|
|
233
|
-
cachedExpiry = resolveTokenExpiry(resp.access_token, resp.expires_in);
|
|
200
|
+
cachedExpiry = (0, tokenExpiry_js_1.resolveTokenExpiry)(resp.access_token, resp.expires_in);
|
|
234
201
|
if (resp.refresh_token) {
|
|
235
202
|
currentRefreshToken = resp.refresh_token;
|
|
236
203
|
}
|
|
@@ -244,4 +211,4 @@ function externalJwtTokenProvider(options) {
|
|
|
244
211
|
return inFlight;
|
|
245
212
|
};
|
|
246
213
|
}
|
|
247
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4tcHJvdmlkZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2F1dGgvdG9rZW4tcHJvdmlkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBeUdBLHdFQWlDQztBQW1CRCxvREFtQ0M7QUFtQkQsNERBMERDO0FBNVFELHFEQUFzRTtBQUN0RSw0Q0FBNEQ7QUFDNUQsMENBQXFDO0FBcURyQyxTQUFTLG9CQUFvQixDQUFDLFVBQWtCLEVBQUUsUUFBaUI7SUFDakUsSUFBSSxRQUFRLEVBQUUsSUFBSSxFQUFFO1FBQUUsT0FBTyxRQUFRLENBQUM7SUFDdEMsTUFBTSxJQUFJLEdBQUcsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDO0lBQ2hDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNWLE1BQU0sSUFBSSw4QkFBa0IsQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFDRCxPQUFPLEdBQUcsSUFBQSxpQkFBTSxFQUFDLElBQUksRUFBRSxHQUFHLENBQUMsZ0NBQWdDLENBQUM7QUFDOUQsQ0FBQztBQUVELEtBQUssVUFBVSxVQUFVLENBQ3ZCLGFBQXFCLEVBQ3JCLElBQTRCO0lBRTVCLE1BQU0sUUFBUSxHQUFHLE1BQU0sS0FBSyxDQUFDLGFBQWEsRUFBRTtRQUMxQyxNQUFNLEVBQUUsTUFBTTtRQUNkLE9BQU8sRUFBRTtZQUNQLGNBQWMsRUFBRSxtQ0FBbUM7WUFDbkQsTUFBTSxFQUFFLGtCQUFrQjtTQUMzQjtRQUNELElBQUksRUFBRSxJQUFJLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUU7S0FDM0MsQ0FBQyxDQUFDO0lBQ0gsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNqQixNQUFNLElBQUksR0FBRyxNQUFNLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNuQyxNQUFNLElBQUksb0JBQVEsQ0FDaEIsK0JBQStCLGFBQWEsUUFBUSxRQUFR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
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Helpers for deciding whether a cached access token is still fresh, using the
|
|
4
|
+
* JWT `exp` claim (or an OAuth `expires_in`) rather than a network round trip.
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.getJwtExpiration = getJwtExpiration;
|
|
8
|
+
exports.resolveTokenExpiry = resolveTokenExpiry;
|
|
9
|
+
exports.isTokenExpired = isTokenExpired;
|
|
10
|
+
/**
|
|
11
|
+
* Decode a JWT's exp claim without verifying the signature.
|
|
12
|
+
* Returns the expiration time in seconds since epoch, or undefined if not present.
|
|
13
|
+
*/
|
|
14
|
+
function getJwtExpiration(token) {
|
|
15
|
+
try {
|
|
16
|
+
const parts = token.split('.');
|
|
17
|
+
if (parts.length !== 3)
|
|
18
|
+
return undefined;
|
|
19
|
+
// Base64url decode the payload
|
|
20
|
+
const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
21
|
+
const padded = payload + '='.repeat((4 - (payload.length % 4)) % 4);
|
|
22
|
+
const decoded = JSON.parse(atob(padded));
|
|
23
|
+
return typeof decoded.exp === 'number' ? decoded.exp : undefined;
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Compute the absolute expiry (seconds since epoch) for a token response.
|
|
31
|
+
* Prefers `expires_in` from the token response, falls back to the JWT `exp` claim.
|
|
32
|
+
*/
|
|
33
|
+
function resolveTokenExpiry(accessToken, expiresIn) {
|
|
34
|
+
if (typeof expiresIn === 'number') {
|
|
35
|
+
return Math.floor(Date.now() / 1000) + expiresIn;
|
|
36
|
+
}
|
|
37
|
+
return getJwtExpiration(accessToken);
|
|
38
|
+
}
|
|
39
|
+
function isTokenExpired(expiry, bufferSeconds = 30) {
|
|
40
|
+
if (expiry === undefined)
|
|
41
|
+
return true;
|
|
42
|
+
return Math.floor(Date.now() / 1000) >= expiry - bufferSeconds;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5FeHBpcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXV0aC90b2tlbkV4cGlyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztHQUdHOztBQU1ILDRDQVlDO0FBTUQsZ0RBS0M7QUFFRCx3Q0FHQztBQWhDRDs7O0dBR0c7QUFDSCxTQUFnQixnQkFBZ0IsQ0FBQyxLQUFhO0lBQzVDLElBQUksQ0FBQztRQUNILE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDL0IsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLENBQUM7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUN6QywrQkFBK0I7UUFDL0IsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztRQUMvRCxNQUFNLE1BQU0sR0FBRyxPQUFPLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNwRSxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3pDLE9BQU8sT0FBTyxPQUFPLENBQUMsR0FBRyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO0lBQ25FLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7R0FHRztBQUNILFNBQWdCLGtCQUFrQixDQUFDLFdBQW1CLEVBQUUsU0FBa0I7SUFDeEUsSUFBSSxPQUFPLFNBQVMsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUNsQyxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FBQztJQUNuRCxDQUFDO0lBQ0QsT0FBTyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUN2QyxDQUFDO0FBRUQsU0FBZ0IsY0FBYyxDQUFDLE1BQTBCLEVBQUUsYUFBYSxHQUFHLEVBQUU7SUFDM0UsSUFBSSxNQUFNLEtBQUssU0FBUztRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3RDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksTUFBTSxHQUFHLGFBQWEsQ0FBQztBQUNqRSxDQUFDIn0=
|
package/dist/cjs/src/version.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.tdfSpecVersion = exports.clientType = exports.version = void 0;
|
|
|
4
4
|
/**
|
|
5
5
|
* Exposes the released version number of the `@opentdf/sdk` package
|
|
6
6
|
*/
|
|
7
|
-
exports.version = '0.
|
|
7
|
+
exports.version = '0.20.0'; // x-release-please-version
|
|
8
8
|
/**
|
|
9
9
|
* A string name used to label requests as coming from this library client.
|
|
10
10
|
*/
|