@keycardai/oauth 0.26.0 → 0.26.2
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/server/tokenVerifier.d.ts +21 -0
- package/dist/cjs/server/tokenVerifier.d.ts.map +1 -1
- package/dist/cjs/server/tokenVerifier.js +35 -3
- package/dist/cjs/server/tokenVerifier.js.map +1 -1
- package/dist/esm/server/tokenVerifier.d.ts +21 -0
- package/dist/esm/server/tokenVerifier.d.ts.map +1 -1
- package/dist/esm/server/tokenVerifier.js +35 -3
- package/dist/esm/server/tokenVerifier.js.map +1 -1
- package/package.json +1 -1
|
@@ -40,7 +40,28 @@ export interface TokenVerifierOptions {
|
|
|
40
40
|
export declare class TokenVerifier {
|
|
41
41
|
#private;
|
|
42
42
|
constructor(options: TokenVerifierOptions);
|
|
43
|
+
/**
|
|
44
|
+
* Verifies a bearer token against the configured issuer.
|
|
45
|
+
*
|
|
46
|
+
* Resolves to null when the token is invalid: malformed, expired, wrong
|
|
47
|
+
* issuer or audience, bad signature, missing a required scope, or signed
|
|
48
|
+
* with a kid that is absent from a JWKS that loaded ({@link JWKSKeyNotFoundError}).
|
|
49
|
+
*
|
|
50
|
+
* Throws when verification could not complete because the zone's signing
|
|
51
|
+
* keys or authorization-server metadata could not be fetched
|
|
52
|
+
* ({@link JWKSError} other than key-not-found, {@link HTTPError},
|
|
53
|
+
* {@link OAuthError} from discovery). Middleware maps that to a 503 so the
|
|
54
|
+
* client keeps its token and retries instead of signing in again.
|
|
55
|
+
*/
|
|
43
56
|
verifyToken(token: string): Promise<AccessToken | null>;
|
|
57
|
+
/**
|
|
58
|
+
* Verifies a token against the issuer of one zone. The zone id must be a
|
|
59
|
+
* DNS label (see {@link isDnsLabel}); any other value fails verification
|
|
60
|
+
* before an issuer is built or the keyring is consulted.
|
|
61
|
+
*
|
|
62
|
+
* Resolves to null for an invalid token and throws when the zone's keys or
|
|
63
|
+
* metadata could not be fetched, exactly as {@link verifyToken}.
|
|
64
|
+
*/
|
|
44
65
|
verifyTokenForZone(token: string, zoneId: string): Promise<AccessToken | null>;
|
|
45
66
|
/**
|
|
46
67
|
* Flushes JWKS keys and discovery results from the underlying keyring.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenVerifier.d.ts","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tokenVerifier.d.ts","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC;;OAEG;IACH,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C;;;OAGG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,qBAAa,aAAa;;gBAQZ,OAAO,EAAE,oBAAoB;IAmBzC;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAI7D;;;;;;;OAOG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAOpF;;;;OAIG;IACH,UAAU,IAAI,IAAI;CAiDnB"}
|
|
@@ -14,6 +14,7 @@ var _TokenVerifier_instances, _TokenVerifier_issuer, _TokenVerifier_requiredScop
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.TokenVerifier = void 0;
|
|
16
16
|
const verifier_js_1 = require("../jwt/verifier.js");
|
|
17
|
+
const errors_js_1 = require("../errors.js");
|
|
17
18
|
const keyring_js_1 = require("../keyring.js");
|
|
18
19
|
const DEFAULT_ALLOWED_ALGORITHMS = ["RS256"];
|
|
19
20
|
class TokenVerifier {
|
|
@@ -40,11 +41,32 @@ class TokenVerifier {
|
|
|
40
41
|
"resource identifier.");
|
|
41
42
|
}
|
|
42
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Verifies a bearer token against the configured issuer.
|
|
46
|
+
*
|
|
47
|
+
* Resolves to null when the token is invalid: malformed, expired, wrong
|
|
48
|
+
* issuer or audience, bad signature, missing a required scope, or signed
|
|
49
|
+
* with a kid that is absent from a JWKS that loaded ({@link JWKSKeyNotFoundError}).
|
|
50
|
+
*
|
|
51
|
+
* Throws when verification could not complete because the zone's signing
|
|
52
|
+
* keys or authorization-server metadata could not be fetched
|
|
53
|
+
* ({@link JWKSError} other than key-not-found, {@link HTTPError},
|
|
54
|
+
* {@link OAuthError} from discovery). Middleware maps that to a 503 so the
|
|
55
|
+
* client keeps its token and retries instead of signing in again.
|
|
56
|
+
*/
|
|
43
57
|
async verifyToken(token) {
|
|
44
58
|
return __classPrivateFieldGet(this, _TokenVerifier_instances, "m", _TokenVerifier_verify).call(this, token, undefined);
|
|
45
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Verifies a token against the issuer of one zone. The zone id must be a
|
|
62
|
+
* DNS label (see {@link isDnsLabel}); any other value fails verification
|
|
63
|
+
* before an issuer is built or the keyring is consulted.
|
|
64
|
+
*
|
|
65
|
+
* Resolves to null for an invalid token and throws when the zone's keys or
|
|
66
|
+
* metadata could not be fetched, exactly as {@link verifyToken}.
|
|
67
|
+
*/
|
|
46
68
|
async verifyTokenForZone(token, zoneId) {
|
|
47
|
-
if (!zoneId) {
|
|
69
|
+
if (!isDnsLabel(zoneId)) {
|
|
48
70
|
return null;
|
|
49
71
|
}
|
|
50
72
|
return __classPrivateFieldGet(this, _TokenVerifier_instances, "m", _TokenVerifier_verify).call(this, token, zoneId);
|
|
@@ -86,8 +108,11 @@ _TokenVerifier_issuer = new WeakMap(), _TokenVerifier_requiredScopes = new WeakM
|
|
|
86
108
|
}
|
|
87
109
|
return toAccessToken(token, claims);
|
|
88
110
|
}
|
|
89
|
-
catch {
|
|
90
|
-
|
|
111
|
+
catch (error) {
|
|
112
|
+
if (error instanceof errors_js_1.InvalidTokenError || error instanceof errors_js_1.JWKSKeyNotFoundError) {
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
throw error;
|
|
91
116
|
}
|
|
92
117
|
}, _TokenVerifier_scopesSatisfied = function _TokenVerifier_scopesSatisfied(claims) {
|
|
93
118
|
if (__classPrivateFieldGet(this, _TokenVerifier_requiredScopes, "f").length === 0) {
|
|
@@ -126,6 +151,13 @@ function optionalStringClaim(claims, name) {
|
|
|
126
151
|
const value = claims[name];
|
|
127
152
|
return typeof value === "string" ? value : undefined;
|
|
128
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* A DNS label: 1 to 63 letters, digits, and hyphens, not starting or ending
|
|
156
|
+
* with a hyphen. Every Keycard zone id (26 lowercase alphanumerics) is one.
|
|
157
|
+
*/
|
|
158
|
+
function isDnsLabel(value) {
|
|
159
|
+
return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i.test(value);
|
|
160
|
+
}
|
|
129
161
|
function buildZoneScopedIssuer(baseIssuer, zoneId) {
|
|
130
162
|
const url = new URL(baseIssuer);
|
|
131
163
|
return `${url.protocol}//${zoneId}.${url.host}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenVerifier.js","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAiD;AACjD,8CAAoE;AAIpE,MAAM,0BAA0B,GAAG,CAAC,OAAO,CAAU,CAAC;AAwCtD,MAAa,aAAa;IAQxB,YAAY,OAA6B;;QAPzC,wCAAgB;QAChB,gDAAmC;QACnC,mDAAsC;QACtC,iDAA0B;QAC1B,0CAA4C;QAC5C,yCAAuB;QAGrB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,uBAAA,IAAI,yBAAW,OAAO,CAAC,MAAM,MAAA,CAAC;QAC9B,uBAAA,IAAI,iCAAmB,OAAO,CAAC,cAAc,IAAI,EAAE,MAAA,CAAC;QACpD,uBAAA,IAAI,oCAAsB,OAAO,CAAC,iBAAiB,IAAI,0BAA0B,MAAA,CAAC;QAClF,uBAAA,IAAI,kCAAoB,OAAO,CAAC,eAAe,IAAI,KAAK,MAAA,CAAC;QACzD,uBAAA,IAAI,2BAAa,OAAO,CAAC,QAAQ,MAAA,CAAC;QAClC,uBAAA,IAAI,0BAAY,OAAO,CAAC,OAAO,IAAI,IAAI,6BAAgB,EAAE,MAAA,CAAC;QAC1D,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CACV,0EAA0E;gBACxE,gFAAgF;gBAChF,sBAAsB,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,OAAO,uBAAA,IAAI,uDAAQ,MAAZ,IAAI,EAAS,KAAK,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,MAAc;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenVerifier.js","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,28 @@ export interface TokenVerifierOptions {
|
|
|
40
40
|
export declare class TokenVerifier {
|
|
41
41
|
#private;
|
|
42
42
|
constructor(options: TokenVerifierOptions);
|
|
43
|
+
/**
|
|
44
|
+
* Verifies a bearer token against the configured issuer.
|
|
45
|
+
*
|
|
46
|
+
* Resolves to null when the token is invalid: malformed, expired, wrong
|
|
47
|
+
* issuer or audience, bad signature, missing a required scope, or signed
|
|
48
|
+
* with a kid that is absent from a JWKS that loaded ({@link JWKSKeyNotFoundError}).
|
|
49
|
+
*
|
|
50
|
+
* Throws when verification could not complete because the zone's signing
|
|
51
|
+
* keys or authorization-server metadata could not be fetched
|
|
52
|
+
* ({@link JWKSError} other than key-not-found, {@link HTTPError},
|
|
53
|
+
* {@link OAuthError} from discovery). Middleware maps that to a 503 so the
|
|
54
|
+
* client keeps its token and retries instead of signing in again.
|
|
55
|
+
*/
|
|
43
56
|
verifyToken(token: string): Promise<AccessToken | null>;
|
|
57
|
+
/**
|
|
58
|
+
* Verifies a token against the issuer of one zone. The zone id must be a
|
|
59
|
+
* DNS label (see {@link isDnsLabel}); any other value fails verification
|
|
60
|
+
* before an issuer is built or the keyring is consulted.
|
|
61
|
+
*
|
|
62
|
+
* Resolves to null for an invalid token and throws when the zone's keys or
|
|
63
|
+
* metadata could not be fetched, exactly as {@link verifyToken}.
|
|
64
|
+
*/
|
|
44
65
|
verifyTokenForZone(token: string, zoneId: string): Promise<AccessToken | null>;
|
|
45
66
|
/**
|
|
46
67
|
* Flushes JWKS keys and discovery results from the underlying keyring.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenVerifier.d.ts","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tokenVerifier.d.ts","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC;;OAEG;IACH,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C;;;OAGG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,qBAAa,aAAa;;gBAQZ,OAAO,EAAE,oBAAoB;IAmBzC;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAI7D;;;;;;;OAOG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAOpF;;;;OAIG;IACH,UAAU,IAAI,IAAI;CAiDnB"}
|
|
@@ -11,6 +11,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
11
11
|
};
|
|
12
12
|
var _TokenVerifier_instances, _TokenVerifier_issuer, _TokenVerifier_requiredScopes, _TokenVerifier_allowedAlgorithms, _TokenVerifier_enableMultiZone, _TokenVerifier_audience, _TokenVerifier_keyring, _TokenVerifier_verify, _TokenVerifier_scopesSatisfied;
|
|
13
13
|
import { JWTVerifier } from "../jwt/verifier.js";
|
|
14
|
+
import { InvalidTokenError, JWKSKeyNotFoundError } from "../errors.js";
|
|
14
15
|
import { JWKSOAuthKeyring } from "../keyring.js";
|
|
15
16
|
const DEFAULT_ALLOWED_ALGORITHMS = ["RS256"];
|
|
16
17
|
export class TokenVerifier {
|
|
@@ -37,11 +38,32 @@ export class TokenVerifier {
|
|
|
37
38
|
"resource identifier.");
|
|
38
39
|
}
|
|
39
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* Verifies a bearer token against the configured issuer.
|
|
43
|
+
*
|
|
44
|
+
* Resolves to null when the token is invalid: malformed, expired, wrong
|
|
45
|
+
* issuer or audience, bad signature, missing a required scope, or signed
|
|
46
|
+
* with a kid that is absent from a JWKS that loaded ({@link JWKSKeyNotFoundError}).
|
|
47
|
+
*
|
|
48
|
+
* Throws when verification could not complete because the zone's signing
|
|
49
|
+
* keys or authorization-server metadata could not be fetched
|
|
50
|
+
* ({@link JWKSError} other than key-not-found, {@link HTTPError},
|
|
51
|
+
* {@link OAuthError} from discovery). Middleware maps that to a 503 so the
|
|
52
|
+
* client keeps its token and retries instead of signing in again.
|
|
53
|
+
*/
|
|
40
54
|
async verifyToken(token) {
|
|
41
55
|
return __classPrivateFieldGet(this, _TokenVerifier_instances, "m", _TokenVerifier_verify).call(this, token, undefined);
|
|
42
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* Verifies a token against the issuer of one zone. The zone id must be a
|
|
59
|
+
* DNS label (see {@link isDnsLabel}); any other value fails verification
|
|
60
|
+
* before an issuer is built or the keyring is consulted.
|
|
61
|
+
*
|
|
62
|
+
* Resolves to null for an invalid token and throws when the zone's keys or
|
|
63
|
+
* metadata could not be fetched, exactly as {@link verifyToken}.
|
|
64
|
+
*/
|
|
43
65
|
async verifyTokenForZone(token, zoneId) {
|
|
44
|
-
if (!zoneId) {
|
|
66
|
+
if (!isDnsLabel(zoneId)) {
|
|
45
67
|
return null;
|
|
46
68
|
}
|
|
47
69
|
return __classPrivateFieldGet(this, _TokenVerifier_instances, "m", _TokenVerifier_verify).call(this, token, zoneId);
|
|
@@ -82,8 +104,11 @@ _TokenVerifier_issuer = new WeakMap(), _TokenVerifier_requiredScopes = new WeakM
|
|
|
82
104
|
}
|
|
83
105
|
return toAccessToken(token, claims);
|
|
84
106
|
}
|
|
85
|
-
catch {
|
|
86
|
-
|
|
107
|
+
catch (error) {
|
|
108
|
+
if (error instanceof InvalidTokenError || error instanceof JWKSKeyNotFoundError) {
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
throw error;
|
|
87
112
|
}
|
|
88
113
|
}, _TokenVerifier_scopesSatisfied = function _TokenVerifier_scopesSatisfied(claims) {
|
|
89
114
|
if (__classPrivateFieldGet(this, _TokenVerifier_requiredScopes, "f").length === 0) {
|
|
@@ -122,6 +147,13 @@ function optionalStringClaim(claims, name) {
|
|
|
122
147
|
const value = claims[name];
|
|
123
148
|
return typeof value === "string" ? value : undefined;
|
|
124
149
|
}
|
|
150
|
+
/**
|
|
151
|
+
* A DNS label: 1 to 63 letters, digits, and hyphens, not starting or ending
|
|
152
|
+
* with a hyphen. Every Keycard zone id (26 lowercase alphanumerics) is one.
|
|
153
|
+
*/
|
|
154
|
+
function isDnsLabel(value) {
|
|
155
|
+
return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i.test(value);
|
|
156
|
+
}
|
|
125
157
|
function buildZoneScopedIssuer(baseIssuer, zoneId) {
|
|
126
158
|
const url = new URL(baseIssuer);
|
|
127
159
|
return `${url.protocol}//${zoneId}.${url.host}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenVerifier.js","sourceRoot":"","sources":["../../../src/server/tokenVerifier.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAqB,MAAM,eAAe,CAAC;AAIpE,MAAM,0BAA0B,GAAG,CAAC,OAAO,CAAU,CAAC;AAwCtD,MAAM,OAAO,aAAa;IAQxB,YAAY,OAA6B;;QAPzC,wCAAgB;QAChB,gDAAmC;QACnC,mDAAsC;QACtC,iDAA0B;QAC1B,0CAA4C;QAC5C,yCAAuB;QAGrB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,uBAAA,IAAI,yBAAW,OAAO,CAAC,MAAM,MAAA,CAAC;QAC9B,uBAAA,IAAI,iCAAmB,OAAO,CAAC,cAAc,IAAI,EAAE,MAAA,CAAC;QACpD,uBAAA,IAAI,oCAAsB,OAAO,CAAC,iBAAiB,IAAI,0BAA0B,MAAA,CAAC;QAClF,uBAAA,IAAI,kCAAoB,OAAO,CAAC,eAAe,IAAI,KAAK,MAAA,CAAC;QACzD,uBAAA,IAAI,2BAAa,OAAO,CAAC,QAAQ,MAAA,CAAC;QAClC,uBAAA,IAAI,0BAAY,OAAO,CAAC,OAAO,IAAI,IAAI,gBAAgB,EAAE,MAAA,CAAC;QAC1D,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CACV,0EAA0E;gBACxE,gFAAgF;gBAChF,sBAAsB,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,OAAO,uBAAA,IAAI,uDAAQ,MAAZ,IAAI,EAAS,KAAK,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,MAAc;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenVerifier.js","sourceRoot":"","sources":["../../../src/server/tokenVerifier.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.2",
|
|
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": {
|