@sphereon/oid4vci-client 0.4.1-unstable.253 → 0.4.1-unstable.255
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/AccessTokenClient.d.ts.map +1 -1
- package/dist/AccessTokenClient.js +8 -4
- package/dist/AccessTokenClient.js.map +1 -1
- package/dist/CredentialRequestClient.d.ts +3 -1
- package/dist/CredentialRequestClient.d.ts.map +1 -1
- package/dist/CredentialRequestClient.js +9 -3
- package/dist/CredentialRequestClient.js.map +1 -1
- package/dist/OpenID4VCIClient.d.ts +1 -1
- package/dist/OpenID4VCIClient.d.ts.map +1 -1
- package/dist/OpenID4VCIClient.js +10 -3
- package/dist/OpenID4VCIClient.js.map +1 -1
- package/dist/ProofOfPossessionBuilder.d.ts +7 -4
- package/dist/ProofOfPossessionBuilder.d.ts.map +1 -1
- package/dist/ProofOfPossessionBuilder.js +25 -16
- package/dist/ProofOfPossessionBuilder.js.map +1 -1
- package/dist/functions/ProofUtil.js +5 -4
- package/dist/functions/ProofUtil.js.map +1 -1
- package/lib/AccessTokenClient.ts +8 -4
- package/lib/CredentialRequestClient.ts +10 -4
- package/lib/OpenID4VCIClient.ts +11 -9
- package/lib/ProofOfPossessionBuilder.ts +38 -14
- package/lib/__tests__/CredentialRequestClient.spec.ts +15 -2
- package/lib/__tests__/CredentialRequestClientBuilder.spec.ts +14 -2
- package/lib/__tests__/IT.spec.ts +10 -1
- package/lib/__tests__/IssuanceInitiation.spec.ts +2 -2
- package/lib/__tests__/JsonURIConversions.spec.ts +61 -4
- package/lib/__tests__/ProofOfPossessionBuilder.spec.ts +6 -5
- package/lib/functions/ProofUtil.ts +2 -2
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessTokenClient.d.ts","sourceRoot":"","sources":["../lib/AccessTokenClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EAEnB,uBAAuB,EACvB,gBAAgB,EAIhB,UAAU,EACV,cAAc,EAKf,MAAM,0BAA0B,CAAC;AASlC,qBAAa,iBAAiB;IACf,kBAAkB,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AccessTokenClient.d.ts","sourceRoot":"","sources":["../lib/AccessTokenClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EAEnB,uBAAuB,EACvB,gBAAgB,EAIhB,UAAU,EACV,cAAc,EAKf,MAAM,0BAA0B,CAAC;AASlC,qBAAa,iBAAiB;IACf,kBAAkB,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;IA6B9F,8BAA8B,CAAC,EAC1C,kBAAkB,EAClB,aAAa,EACb,QAAQ,EACR,MAAM,EACN,UAAU,GACX,EAAE;QACD,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;QAC5B,MAAM,CAAC,EAAE,uBAAuB,CAAC;QACjC,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB,GAAG,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;IAcnC,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAsChG,OAAO,CAAC,4BAA4B;IAMpC,OAAO,CAAC,4BAA4B;IAMpC,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,+BAA+B;IAOvC,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,yBAAyB;IAOjC,OAAO,CAAC,QAAQ;YAeF,YAAY;WAIZ,iBAAiB,CAAC,EAC9B,MAAM,EACN,UAAU,EACV,QAAQ,GACT,EAAE;QACD,MAAM,CAAC,EAAE,uBAAuB,CAAC;QACjC,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;KAC7B,GAAG,MAAM;IAuBV,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAUnC,OAAO,CAAC,qBAAqB;CAI9B"}
|
|
@@ -26,8 +26,12 @@ class AccessTokenClient {
|
|
|
26
26
|
const { asOpts, pin, codeVerifier, code, redirectUri, metadata } = opts;
|
|
27
27
|
const credentialOffer = yield (0, oid4vci_common_1.assertedUniformCredentialOffer)(opts.credentialOffer);
|
|
28
28
|
const isPinRequired = this.isPinRequiredValue(credentialOffer.credential_offer);
|
|
29
|
+
const issuer = (_a = (0, oid4vci_common_1.getIssuerFromCredentialOfferPayload)(credentialOffer.credential_offer)) !== null && _a !== void 0 ? _a : metadata === null || metadata === void 0 ? void 0 : metadata.issuer;
|
|
30
|
+
if (!issuer) {
|
|
31
|
+
throw Error('Issuer required at this point');
|
|
32
|
+
}
|
|
29
33
|
const issuerOpts = {
|
|
30
|
-
issuer
|
|
34
|
+
issuer,
|
|
31
35
|
};
|
|
32
36
|
return yield this.acquireAccessTokenUsingRequest({
|
|
33
37
|
accessTokenRequest: yield this.createAccessTokenRequest({
|
|
@@ -81,7 +85,7 @@ class AccessTokenClient {
|
|
|
81
85
|
request[oid4vci_common_1.PRE_AUTH_CODE_LITERAL] =
|
|
82
86
|
(_b = (_a = credentialOfferRequest === null || credentialOfferRequest === void 0 ? void 0 : credentialOfferRequest.credential_offer.grants) === null || _a === void 0 ? void 0 : _a['urn:ietf:params:oauth:grant-type:pre-authorized_code']) === null || _b === void 0 ? void 0 : _b[oid4vci_common_1.PRE_AUTH_CODE_LITERAL];
|
|
83
87
|
}
|
|
84
|
-
if ((_d = (_c = credentialOfferRequest.credential_offer.grants) === null || _c === void 0 ? void 0 : _c.authorization_code) === null || _d === void 0 ? void 0 : _d.issuer_state) {
|
|
88
|
+
if (!isPreAuth && ((_d = (_c = credentialOfferRequest.credential_offer.grants) === null || _c === void 0 ? void 0 : _c.authorization_code) === null || _d === void 0 ? void 0 : _d.issuer_state)) {
|
|
85
89
|
this.throwNotSupportedFlow(); // not supported yet
|
|
86
90
|
request.grant_type = oid4vci_common_1.GrantTypes.AUTHORIZATION_CODE;
|
|
87
91
|
}
|
|
@@ -189,7 +193,7 @@ class AccessTokenClient {
|
|
|
189
193
|
url = metadata.token_endpoint;
|
|
190
194
|
}
|
|
191
195
|
else {
|
|
192
|
-
if (!issuerOpts) {
|
|
196
|
+
if (!(issuerOpts === null || issuerOpts === void 0 ? void 0 : issuerOpts.issuer)) {
|
|
193
197
|
throw Error('Either authorization server options, a token endpoint or issuer options are required at this point');
|
|
194
198
|
}
|
|
195
199
|
url = this.creatTokenURLFromURL(issuerOpts.issuer, asOpts === null || asOpts === void 0 ? void 0 : asOpts.allowInsecureEndpoints, issuerOpts.tokenEndpoint);
|
|
@@ -201,7 +205,7 @@ class AccessTokenClient {
|
|
|
201
205
|
return url;
|
|
202
206
|
}
|
|
203
207
|
static creatTokenURLFromURL(url, allowInsecureEndpoints, tokenEndpoint) {
|
|
204
|
-
if (allowInsecureEndpoints !== true && url.startsWith('http
|
|
208
|
+
if (allowInsecureEndpoints !== true && url.startsWith('http:')) {
|
|
205
209
|
throw Error(`Unprotected token endpoints are not allowed ${url}. Adjust settings if you really need this (dev/test settings only!!)`);
|
|
206
210
|
}
|
|
207
211
|
const hostname = url.replace(/https?:\/\//, '').replace(/\/$/, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessTokenClient.js","sourceRoot":"","sources":["../lib/AccessTokenClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAgBkC;AAClC,mDAAkD;AAClD,kDAA0B;AAE1B,qDAAkD;AAClD,2CAAyD;AAEzD,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,wBAAwB,CAAC,CAAC;AAE9C,MAAa,iBAAiB;IACf,kBAAkB,CAAC,IAA4B;;;YAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YAExE,MAAM,eAAe,GAAG,MAAM,IAAA,+CAA8B,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACnF,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YAChF,MAAM,
|
|
1
|
+
{"version":3,"file":"AccessTokenClient.js","sourceRoot":"","sources":["../lib/AccessTokenClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export interface CredentialRequestOpts {
|
|
|
8
8
|
format?: CredentialFormat | OID4VCICredentialFormat;
|
|
9
9
|
proof: ProofOfPossession;
|
|
10
10
|
token: string;
|
|
11
|
-
version
|
|
11
|
+
version: OpenId4VCIVersion;
|
|
12
12
|
}
|
|
13
13
|
export declare class CredentialRequestClient {
|
|
14
14
|
private readonly _credentialRequestOpts;
|
|
@@ -25,7 +25,9 @@ export declare class CredentialRequestClient {
|
|
|
25
25
|
proofInput: ProofOfPossessionBuilder | ProofOfPossession;
|
|
26
26
|
credentialTypes?: string | string[];
|
|
27
27
|
format?: CredentialFormat | OID4VCICredentialFormat;
|
|
28
|
+
version: OpenId4VCIVersion;
|
|
28
29
|
}): Promise<UniformCredentialRequest>;
|
|
30
|
+
private version;
|
|
29
31
|
private isV11OrHigher;
|
|
30
32
|
}
|
|
31
33
|
//# sourceMappingURL=CredentialRequestClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CredentialRequestClient.d.ts","sourceRoot":"","sources":["../lib/CredentialRequestClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,wBAAwB,EAEzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAKtE,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,GAAG,uBAAuB,CAAC;IACpD,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,
|
|
1
|
+
{"version":3,"file":"CredentialRequestClient.d.ts","sourceRoot":"","sources":["../lib/CredentialRequestClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,wBAAwB,EAEzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAKtE,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,GAAG,uBAAuB,CAAC;IACpD,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,iBAAiB,CAAC;CAC5B;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiC;IAExE,IAAI,qBAAqB,IAAI,qBAAqB,CAEjD;IAEM,qBAAqB,IAAI,MAAM;gBAInB,OAAO,EAAE,8BAA8B;IAI7C,4BAA4B,CAAC,IAAI,EAAE;QAC9C,UAAU,EAAE,wBAAwB,GAAG,iBAAiB,CAAC;QACzD,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,EAAE,gBAAgB,GAAG,uBAAuB,CAAC;KACrD,GAAG,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;IAOlC,8BAA8B,CAAC,cAAc,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;IAqBrH,uBAAuB,CAAC,IAAI,EAAE;QACzC,UAAU,EAAE,wBAAwB,GAAG,iBAAiB,CAAC;QACzD,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,EAAE,gBAAgB,GAAG,uBAAuB,CAAC;QACpD,OAAO,EAAE,iBAAiB,CAAC;KAC5B,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAiCrC,OAAO,CAAC,OAAO;IAGf,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -31,7 +31,7 @@ class CredentialRequestClient {
|
|
|
31
31
|
acquireCredentialsUsingProof(opts) {
|
|
32
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
33
33
|
const { credentialTypes, proofInput, format } = opts;
|
|
34
|
-
const request = yield this.createCredentialRequest({ proofInput, credentialTypes, format });
|
|
34
|
+
const request = yield this.createCredentialRequest({ proofInput, credentialTypes, format, version: this.version() });
|
|
35
35
|
return yield this.acquireCredentialsUsingRequest(request);
|
|
36
36
|
});
|
|
37
37
|
}
|
|
@@ -79,7 +79,9 @@ class CredentialRequestClient {
|
|
|
79
79
|
else if (!this.isV11OrHigher() && types.length !== 1) {
|
|
80
80
|
throw Error('Only a single credential type is supported for V8/V9');
|
|
81
81
|
}
|
|
82
|
-
const proof = 'proof_type' in proofInput
|
|
82
|
+
const proof = 'proof_type' in proofInput
|
|
83
|
+
? yield ProofOfPossessionBuilder_1.ProofOfPossessionBuilder.fromProof(proofInput, opts.version).build()
|
|
84
|
+
: yield proofInput.build();
|
|
83
85
|
return {
|
|
84
86
|
types,
|
|
85
87
|
format,
|
|
@@ -87,8 +89,12 @@ class CredentialRequestClient {
|
|
|
87
89
|
};
|
|
88
90
|
});
|
|
89
91
|
}
|
|
92
|
+
version() {
|
|
93
|
+
var _a, _b;
|
|
94
|
+
return (_b = (_a = this.credentialRequestOpts) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : oid4vci_common_1.OpenId4VCIVersion.VER_1_0_11;
|
|
95
|
+
}
|
|
90
96
|
isV11OrHigher() {
|
|
91
|
-
return
|
|
97
|
+
return this.version() >= oid4vci_common_1.OpenId4VCIVersion.VER_1_0_11;
|
|
92
98
|
}
|
|
93
99
|
}
|
|
94
100
|
exports.CredentialRequestClient = CredentialRequestClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CredentialRequestClient.js","sourceRoot":"","sources":["../lib/CredentialRequestClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DASkC;AAElC,kDAA0B;AAG1B,yEAAsE;AACtE,2CAA+C;AAE/C,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,gCAAgC,CAAC,CAAC;AAWtD,MAAa,uBAAuB;IAGlC,IAAI,qBAAqB;QACvB,OAAO,IAAI,CAAC,sBAA+C,CAAC;IAC9D,CAAC;IAEM,qBAAqB;QAC1B,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC;IACvD,CAAC;IAED,YAAmB,OAAuC;QACxD,IAAI,CAAC,sBAAsB,qBAAQ,OAAO,CAAE,CAAC;IAC/C,CAAC;IAEY,4BAA4B,CAAC,IAIzC;;YACC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAErD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"CredentialRequestClient.js","sourceRoot":"","sources":["../lib/CredentialRequestClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ export declare class OpenID4VCIClient {
|
|
|
37
37
|
acquirePushedAuthorizationRequestURI({ clientId, codeChallengeMethod, codeChallenge, authorizationDetails, redirectUri, scope, }: AuthRequestOpts): Promise<OpenIDResponse<PushedAuthorizationResponse>>;
|
|
38
38
|
handleAuthorizationDetails(authorizationDetails?: AuthDetails | AuthDetails[]): AuthDetails | AuthDetails[] | undefined;
|
|
39
39
|
private handleLocations;
|
|
40
|
-
acquireAccessToken(
|
|
40
|
+
acquireAccessToken(opts?: {
|
|
41
41
|
pin?: string;
|
|
42
42
|
clientId?: string;
|
|
43
43
|
codeVerifier?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenID4VCIClient.d.ts","sourceRoot":"","sources":["../lib/OpenID4VCIClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,GAAG,EAEH,aAAa,EACb,mBAAmB,EAEnB,iCAAiC,EACjC,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAEhB,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACd,0BAA0B,EAC1B,2BAA2B,EAE5B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAYvD,UAAU,WAAW;IACnB,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC9B,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IAE9C,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED,UAAU,eAAe;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,oBAAoB,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAC;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoC;IACrE,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,oBAAoB,CAAkC;IAE9D,OAAO;WAca,OAAO,CAAC,EAC1B,GAAG,EACH,QAAQ,EACR,GAAG,EACH,GAAG,EACH,sBAAsB,EACtB,QAAQ,EACR,eAAe,GAChB,EAAE;QACD,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,aAAa,CAAC;QACxB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC;QACnB,sBAAsB,CAAC,EAAE,OAAO,CAAC;QACjC,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAShB,sBAAsB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAQzD,6BAA6B,CAAC,EACnC,QAAQ,EACR,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,KAAK,GACN,EAAE,eAAe,GAAG,MAAM;IAqCd,oCAAoC,CAAC,EAChD,QAAQ,EACR,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,KAAK,GACN,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;IAiClE,0BAA0B,CAAC,oBAAoB,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,WAAW,EAAE,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"OpenID4VCIClient.d.ts","sourceRoot":"","sources":["../lib/OpenID4VCIClient.ts"],"names":[],"mappings":"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"}
|
package/dist/OpenID4VCIClient.js
CHANGED
|
@@ -142,9 +142,10 @@ class OpenID4VCIClient {
|
|
|
142
142
|
}
|
|
143
143
|
return authorizationDetails;
|
|
144
144
|
}
|
|
145
|
-
acquireAccessToken(
|
|
145
|
+
acquireAccessToken(opts) {
|
|
146
146
|
var _a, _b;
|
|
147
147
|
return __awaiter(this, void 0, void 0, function* () {
|
|
148
|
+
const { pin, clientId, codeVerifier, code, redirectUri } = opts !== null && opts !== void 0 ? opts : {};
|
|
148
149
|
this.assertIssuerData();
|
|
149
150
|
if (clientId) {
|
|
150
151
|
this._clientId = clientId;
|
|
@@ -158,7 +159,7 @@ class OpenID4VCIClient {
|
|
|
158
159
|
codeVerifier,
|
|
159
160
|
code,
|
|
160
161
|
redirectUri,
|
|
161
|
-
asOpts: { clientId
|
|
162
|
+
asOpts: { clientId },
|
|
162
163
|
});
|
|
163
164
|
if (response.errorBody) {
|
|
164
165
|
debug(`Access token error:\r\n${response.errorBody}`);
|
|
@@ -194,6 +195,9 @@ class OpenID4VCIClient {
|
|
|
194
195
|
for (const type of types) {
|
|
195
196
|
let typeSupported = false;
|
|
196
197
|
for (const credentialSupported of metadata.credentials_supported) {
|
|
198
|
+
if (!credentialSupported.types || credentialSupported.types.length === 0) {
|
|
199
|
+
throw Error('types is required in the credentials supported');
|
|
200
|
+
}
|
|
197
201
|
if (credentialSupported.types.indexOf(type) != -1) {
|
|
198
202
|
typeSupported = true;
|
|
199
203
|
}
|
|
@@ -215,11 +219,14 @@ class OpenID4VCIClient {
|
|
|
215
219
|
const proofBuilder = ProofOfPossessionBuilder_1.ProofOfPossessionBuilder.fromAccessTokenResponse({
|
|
216
220
|
accessTokenResponse: this.accessTokenResponse,
|
|
217
221
|
callbacks: proofCallbacks,
|
|
222
|
+
version: this.version(),
|
|
218
223
|
})
|
|
219
224
|
.withIssuer(this.getIssuer())
|
|
220
225
|
.withAlg(this.alg)
|
|
221
|
-
.withClientId(this.clientId)
|
|
222
226
|
.withKid(this.kid);
|
|
227
|
+
if (this._clientId) {
|
|
228
|
+
proofBuilder.withClientId(this.clientId);
|
|
229
|
+
}
|
|
223
230
|
if (jti) {
|
|
224
231
|
proofBuilder.withJti(jti);
|
|
225
232
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenID4VCIClient.js","sourceRoot":"","sources":["../lib/OpenID4VCIClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAkBkC;AAGlC,kDAA0B;AAE1B,2DAAwD;AACxD,mEAAgE;AAChE,qFAAkF;AAClF,qDAAkD;AAClD,yEAAsE;AACtE,2CAAyD;AAEzD,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,kBAAkB,CAAC,CAAC;AAmBxC,MAAa,gBAAgB;IAS3B,YACE,eAAkD,EAClD,QAAuB,EACvB,GAAY,EACZ,GAAkB,EAClB,QAAiB;QAEjB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAO,OAAO,CAAC,EAC1B,GAAG,EACH,QAAQ,EACR,GAAG,EACH,GAAG,EACH,sBAAsB,EACtB,QAAQ,EACR,eAAe,GAShB;;YACC,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,MAAM,6CAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;YAE1I,IAAI,sBAAsB,KAAK,SAAS,IAAI,sBAAsB,EAAE;gBAClE,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC;aACvC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAEY,sBAAsB;;YACjC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,+BAAc,CAAC,sCAAsC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC5G;YACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;QAC/B,CAAC;KAAA;IAEM,6BAA6B,CAAC,EACnC,QAAQ,EACR,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,KAAK,GACW;;QAChB,gFAAgF;QAChF,iGAAiG;QACjG,IAAI,CAAC,KAAK,IAAI,CAAC,oBAAoB,EAAE;YACnC,MAAM,KAAK,CAAC,iDAAiD,CAAC,CAAC;SAChE;QACD,yDAAyD;QACzD,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,IAAI,wBAAwB,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE;YACxI,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,sBAAgC,CAAC;SACxH;QACD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,sBAAsB,CAAA,EAAE;YACnD,MAAM,KAAK,CAAC,yDAAyD,CAAC,CAAC;SACxE;QAED,oCAAoC;QACpC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACtC,KAAK,GAAG,UAAU,KAAK,EAAE,CAAC;SAC3B;QAED,4BAA4B;QAC5B,MAAM,QAAQ,GAAG;YACf,aAAa,EAAE,6BAAY,CAAC,SAAS;YACrC,SAAS,EAAE,QAAQ;YACnB,qBAAqB,EAAE,mBAAmB;YAC1C,cAAc,EAAE,aAAa;YAC7B,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,oBAAoB,CAAC,CAAC;YAC5F,YAAY,EAAE,WAAW;YACzB,KAAK,EAAE,KAAK;SACkB,CAAC;QAEjC,OAAO,IAAA,4BAAgB,EAAC,QAAQ,EAAE;YAChC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,sBAAsB;YACtD,iBAAiB,EAAE,CAAC,cAAc,EAAE,OAAO,EAAE,uBAAuB,CAAC;YACrE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;SACxB,CAAC,CAAC;IACL,CAAC;IAEY,oCAAoC,CAAC,EAChD,QAAQ,EACR,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,KAAK,GACW;;;YAChB,gFAAgF;YAChF,iGAAiG;YACjG,IAAI,CAAC,KAAK,IAAI,CAAC,oBAAoB,EAAE;gBACnC,MAAM,KAAK,CAAC,iDAAiD,CAAC,CAAC;aAChE;YAED,6JAA6J;YAC7J,wIAAwI;YACxI,iCAAiC;YACjC,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,cAAc,CAAA,IAAI,CAAC,CAAC,uCAAuC,IAAI,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE;gBAClI,MAAM,KAAK,CAAC,wEAAwE,CAAC,CAAC;aACvF;YAED,oCAAoC;YACpC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACtC,KAAK,GAAG,UAAU,KAAK,EAAE,CAAC;aAC3B;YAED,4BAA4B;YAC5B,MAAM,QAAQ,GAAgC;gBAC5C,aAAa,EAAE,6BAAY,CAAC,SAAS;gBACrC,SAAS,EAAE,QAAQ;gBACnB,qBAAqB,EAAE,mBAAmB;gBAC1C,cAAc,EAAE,aAAa;gBAC7B,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,oBAAoB,CAAC,CAAC;gBAC5F,YAAY,EAAE,WAAW;gBACzB,KAAK,EAAE,KAAK;aACb,CAAC;YACF,oEAAoE;YACpE,OAAO,MAAM,IAAA,oBAAQ,EAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,qCAAsC,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;;KAC/H;IAEM,0BAA0B,CAAC,oBAAkD;QAClF,IAAI,oBAAoB,EAAE;YACxB,IAAI,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;gBACvC,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,mBAAM,KAAK,EAAG,CAAC,CAAC;aAChF;iBAAM;gBACL,OAAO,IAAI,CAAC,eAAe,mBAAM,oBAAoB,EAAG,CAAC;aAC1D;SACF;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACO,eAAe,CAAC,oBAAiC;;QACvD,IAAI,oBAAoB,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,cAAc,0CAAE,oBAAoB,KAAI,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAAE;YACxI,IAAI,oBAAoB,CAAC,SAAS,EAAE;gBAClC,IAAI,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE;oBAChD,oBAAoB,CAAC,SAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;iBACjF;qBAAM;oBACL,oBAAoB,CAAC,SAAS,GAAG,CAAC,oBAAoB,CAAC,SAAmB,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;iBAC3G;aACF;iBAAM;gBACL,oBAAoB,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;aAC/D;SACF;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEY,kBAAkB,CAAC,EAC9B,GAAG,EACH,QAAQ,EACR,YAAY,EACZ,IAAI,EACJ,WAAW,GAOZ;;;YACC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;aAC3B;YACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBAC9B,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,EAAE,CAAC;gBAElD,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,kBAAkB,CAAC;oBAC1D,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,QAAQ,EAAE,IAAI,CAAC,gBAAgB;oBAC/B,GAAG;oBACH,YAAY;oBACZ,IAAI;oBACJ,WAAW;oBACX,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;iBACpC,CAAC,CAAC;gBAEH,IAAI,QAAQ,CAAC,SAAS,EAAE;oBACtB,KAAK,CAAC,0BAA0B,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;oBACtD,MAAM,KAAK,CACT,mCAAmC,MAAA,IAAI,CAAC,iBAAiB,0CAAE,cAAc,eAAe,IAAI,CAAC,SAAS,EAAE,wBACtG,QAAQ,CAAC,YAAY,CAAC,MACxB,EAAE,CACH,CAAC;iBACH;qBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;oBAChC,KAAK,CAAC,qCAAqC,CAAC,CAAC;oBAC7C,MAAM,KAAK,CACT,mCACE,MAAA,IAAI,CAAC,iBAAiB,0CAAE,cAC1B,eAAe,IAAI,CAAC,SAAS,EAAE,+CAA+C,CAC/E,CAAC;iBACH;gBACD,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,WAAW,CAAC;aAClD;YAED,OAAO,IAAI,CAAC,mBAAmB,CAAC;;KACjC;IAEY,kBAAkB,CAAC,EAC9B,eAAe,EACf,cAAc,EACd,MAAM,EACN,GAAG,EACH,GAAG,EACH,GAAG,GAQJ;;;YACC,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;aACjB;YACD,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;aACjB;YAED,MAAM,cAAc,GAAG,+DAA8B,CAAC,mBAAmB,CAAC;gBACxE,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,QAAQ,EAAE,IAAI,CAAC,gBAAgB;aAChC,CAAC,CAAC;YACH,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAChE,IAAI,MAAA,IAAI,CAAC,gBAAgB,0CAAE,cAAc,EAAE;gBACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;gBACtD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;gBACnF,IAAI,QAAQ,CAAC,qBAAqB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;oBACnF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACxB,IAAI,aAAa,GAAG,KAAK,CAAC;wBAC1B,KAAK,MAAM,mBAAmB,IAAI,QAAQ,CAAC,qBAAqB,EAAE;4BAChE,IAAI,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;gCACjD,aAAa,GAAG,IAAI,CAAC;6BACtB;yBACF;wBACD,IAAI,CAAC,aAAa,EAAE;4BAClB,MAAM,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,4BAA4B,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;yBACxH;qBACF;iBACF;qBAAM,IAAI,QAAQ,CAAC,qBAAqB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;oBAC3F,MAAM,oBAAoB,GAAG,QAAQ,CAAC,qBAAuD,CAAC;oBAC9F,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,qBAAqB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE;wBACxF,MAAM,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,4BAA4B,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;qBACxH;iBACF;gBACD,4GAA4G;aAC7G;YACD,MAAM,uBAAuB,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACvD,MAAM,YAAY,GAAG,mDAAwB,CAAC,uBAAuB,CAAC;gBACpE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,SAAS,EAAE,cAAc;aAC1B,CAAC;iBACC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;iBAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;iBACjB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAErB,IAAI,GAAG,EAAE;gBACP,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC3B;YACD,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,4BAA4B,CAAC;gBAC1E,UAAU,EAAE,YAAY;gBACxB,eAAe,EAAE,eAAe;gBAChC,MAAM;aACP,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,SAAS,EAAE;gBACtB,KAAK,CAAC,gCAAgC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC5D,MAAM,KAAK,CACT,gCAAgC,MAAA,IAAI,CAAC,iBAAiB,0CAAE,mBAAmB,eAAe,IAAI,CAAC,SAAS,EAAE,wBACxG,QAAQ,CAAC,YAAY,CAAC,MACxB,EAAE,CACH,CAAC;aACH;iBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;gBAChC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBACnD,MAAM,KAAK,CACT,gCACE,MAAA,IAAI,CAAC,iBAAiB,0CAAE,mBAC1B,eAAe,IAAI,CAAC,SAAS,EAAE,+CAA+C,CAC/E,CAAC;aACH;YACD,OAAO,QAAQ,CAAC,WAAW,CAAC;;KAC7B;IAED,uBAAuB,CAAC,yBAAkC,EAAE,aAAsB;QAChF,qEAAqE;;QAErE,MAAM,oBAAoB,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,cAAc,0CAAE,qBAAqB,CAAC;QAC1F,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO,EAAE,CAAC;SACX;aAAM,IAAI,CAAC,yBAAyB,EAAE;YACrC,OAAO,oBAAoB,CAAC;SAC7B;QACD;;WAEG;QACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACxC,MAAM,sBAAsB,GAA+B,oBAAkD,CAAC;YAC9G,MAAM,eAAe,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACpF,MAAM,SAAS,GAA4B,EAAE,CAAC;YAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE;gBACjE,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACjC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBACxB;aACF;YACD,qHAAqH;YACrH,OAAO,SAA6C,CAAC;SACtD;QACD,MAAM,eAAe,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACpF,MAAM,0BAA0B,GAA0B,EAAE,CAAC;QAC7D,KAAK,MAAM,SAAS,IAAI,oBAAoB,EAAE;YAC5C,MAAM,oBAAoB,GAAa,EAAE,CAAC;YAC1C,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE;gBAClC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC/B,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjC;YACD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnC,0BAA0B,CAAC,IAAI,iCAC1B,SAAS,KACZ,KAAK,EAAE,oBAAoB,IAC3B,CAAC;aACJ;SACF;QACD,OAAO,0BAAmD,CAAC;IAC7D,CAAC;IAED,qBAAqB,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,qDAAqD;IACrD,kBAAkB;QAChB,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,kCAAiB,CAAC,UAAU,EAAE;YAC/D,OAAO,OAAQ,IAAI,CAAC,eAAe,CAAC,yBAA2D,CAAC,eAAe,KAAK,QAAQ;gBAC1H,CAAC,CAAC,CAAE,IAAI,CAAC,eAAe,CAAC,yBAA2D,CAAC,eAAyB,CAAC;gBAC/G,CAAC,CAAG,IAAI,CAAC,eAAe,CAAC,yBAA2D,CAAC,eAA4B,CAAC;SACrH;aAAM;YACL,6JAA6J;YAC7J,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SAChH;IACH,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;IACtC,CAAC;IAED,IAAW,gBAAgB;QACzB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,oEAAoE;QACpE,OAAO,IAAI,CAAC,iBAAkB,CAAC;IACjC,CAAC;IAED,IAAI,GAAG;QACL,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,GAAG;QACL,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,mBAAmB;QACrB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,oEAAoE;QACpE,OAAO,IAAI,CAAC,oBAAqB,CAAC;IACpC,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IAClF,CAAC;IAEM,sBAAsB;QAC3B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,gBAAgB;YAC1B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc;YACtC,CAAC,CAAC,qCAAiB,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IACxF,CAAC;IAEM,qBAAqB;QAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC;IAC9G,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACnE;IACH,CAAC;IAEO,oBAAoB;QAC1B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACnC;IACH,CAAC;IAEO,iBAAiB;QACvB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAC;SACxC;IACH,CAAC;CACF;AAzbD,4CAybC"}
|
|
1
|
+
{"version":3,"file":"OpenID4VCIClient.js","sourceRoot":"","sources":["../lib/OpenID4VCIClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { AccessTokenResponse, Alg, EndpointMetadata, Jwt, ProofOfPossession, ProofOfPossessionCallbacks, Typ } from '@sphereon/oid4vci-common';
|
|
1
|
+
import { AccessTokenResponse, Alg, EndpointMetadata, Jwt, OpenId4VCIVersion, ProofOfPossession, ProofOfPossessionCallbacks, Typ } from '@sphereon/oid4vci-common';
|
|
2
2
|
export declare class ProofOfPossessionBuilder {
|
|
3
3
|
private readonly proof?;
|
|
4
4
|
private readonly callbacks?;
|
|
5
|
+
private version;
|
|
5
6
|
private kid?;
|
|
6
7
|
private clientId?;
|
|
7
8
|
private issuer?;
|
|
@@ -11,15 +12,17 @@ export declare class ProofOfPossessionBuilder {
|
|
|
11
12
|
private cNonce?;
|
|
12
13
|
private typ?;
|
|
13
14
|
private constructor();
|
|
14
|
-
static fromJwt({ jwt, callbacks }: {
|
|
15
|
+
static fromJwt({ jwt, callbacks, version, }: {
|
|
15
16
|
jwt: Jwt;
|
|
16
17
|
callbacks: ProofOfPossessionCallbacks;
|
|
18
|
+
version: OpenId4VCIVersion;
|
|
17
19
|
}): ProofOfPossessionBuilder;
|
|
18
|
-
static fromAccessTokenResponse({ accessTokenResponse, callbacks, }: {
|
|
20
|
+
static fromAccessTokenResponse({ accessTokenResponse, callbacks, version, }: {
|
|
19
21
|
accessTokenResponse: AccessTokenResponse;
|
|
20
22
|
callbacks: ProofOfPossessionCallbacks;
|
|
23
|
+
version: OpenId4VCIVersion;
|
|
21
24
|
}): ProofOfPossessionBuilder;
|
|
22
|
-
static fromProof(proof: ProofOfPossession): ProofOfPossessionBuilder;
|
|
25
|
+
static fromProof(proof: ProofOfPossession, version: OpenId4VCIVersion): ProofOfPossessionBuilder;
|
|
23
26
|
withClientId(clientId: string): ProofOfPossessionBuilder;
|
|
24
27
|
withKid(kid: string): ProofOfPossessionBuilder;
|
|
25
28
|
withIssuer(issuer: string): ProofOfPossessionBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProofOfPossessionBuilder.d.ts","sourceRoot":"","sources":["../lib/ProofOfPossessionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,GAAG,EACH,gBAAgB,EAChB,GAAG,
|
|
1
|
+
{"version":3,"file":"ProofOfPossessionBuilder.d.ts","sourceRoot":"","sources":["../lib/ProofOfPossessionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,GAAG,EACH,gBAAgB,EAChB,GAAG,EAEH,iBAAiB,EAEjB,iBAAiB,EACjB,0BAA0B,EAC1B,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAIlC,qBAAa,wBAAwB;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA6B;IAExD,OAAO,CAAC,OAAO,CAAoB;IAEnC,OAAO,CAAC,GAAG,CAAC,CAAS;IACrB,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,GAAG,CAAC,CAAM;IAClB,OAAO,CAAC,GAAG,CAAC,CAAS;IACrB,OAAO,CAAC,GAAG,CAAC,CAAS;IACrB,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,GAAG,CAAC,CAAM;IAElB,OAAO;IAwBP,MAAM,CAAC,OAAO,CAAC,EACb,GAAG,EACH,SAAS,EACT,OAAO,GACR,EAAE;QACD,GAAG,EAAE,GAAG,CAAC;QACT,SAAS,EAAE,0BAA0B,CAAC;QACtC,OAAO,EAAE,iBAAiB,CAAC;KAC5B,GAAG,wBAAwB;IAI5B,MAAM,CAAC,uBAAuB,CAAC,EAC7B,mBAAmB,EACnB,SAAS,EACT,OAAO,GACR,EAAE;QACD,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,0BAA0B,CAAC;QACtC,OAAO,EAAE,iBAAiB,CAAC;KAC5B,GAAG,wBAAwB;IAI5B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,GAAG,wBAAwB;IAIhG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,wBAAwB;IAKxD,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,wBAAwB;IAK9C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,wBAAwB;IAKpD,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,wBAAwB;IAKpD,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,wBAAwB;IAK9C,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,wBAAwB;IAK3C,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,wBAAwB;IAK9D,uBAAuB,CAAC,WAAW,EAAE,mBAAmB,GAAG,wBAAwB;IAOnF,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,wBAAwB;IAKlF,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,wBAAwB;IA+B9B,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAoBjD"}
|
|
@@ -13,7 +13,7 @@ exports.ProofOfPossessionBuilder = void 0;
|
|
|
13
13
|
const oid4vci_common_1 = require("@sphereon/oid4vci-common");
|
|
14
14
|
const functions_1 = require("./functions");
|
|
15
15
|
class ProofOfPossessionBuilder {
|
|
16
|
-
constructor({ proof, callbacks, jwt, accessTokenResponse, }) {
|
|
16
|
+
constructor({ proof, callbacks, jwt, accessTokenResponse, version, }) {
|
|
17
17
|
this.proof = proof;
|
|
18
18
|
this.callbacks = callbacks;
|
|
19
19
|
if (jwt) {
|
|
@@ -22,15 +22,16 @@ class ProofOfPossessionBuilder {
|
|
|
22
22
|
if (accessTokenResponse) {
|
|
23
23
|
this.withAccessTokenResponse(accessTokenResponse);
|
|
24
24
|
}
|
|
25
|
+
this.version = version;
|
|
25
26
|
}
|
|
26
|
-
static fromJwt({ jwt, callbacks }) {
|
|
27
|
-
return new ProofOfPossessionBuilder({ callbacks, jwt });
|
|
27
|
+
static fromJwt({ jwt, callbacks, version, }) {
|
|
28
|
+
return new ProofOfPossessionBuilder({ callbacks, jwt, version });
|
|
28
29
|
}
|
|
29
|
-
static fromAccessTokenResponse({ accessTokenResponse, callbacks, }) {
|
|
30
|
-
return new ProofOfPossessionBuilder({ callbacks, accessTokenResponse });
|
|
30
|
+
static fromAccessTokenResponse({ accessTokenResponse, callbacks, version, }) {
|
|
31
|
+
return new ProofOfPossessionBuilder({ callbacks, accessTokenResponse, version });
|
|
31
32
|
}
|
|
32
|
-
static fromProof(proof) {
|
|
33
|
-
return new ProofOfPossessionBuilder({ proof });
|
|
33
|
+
static fromProof(proof, version) {
|
|
34
|
+
return new ProofOfPossessionBuilder({ proof, version });
|
|
34
35
|
}
|
|
35
36
|
withClientId(clientId) {
|
|
36
37
|
this.clientId = clientId;
|
|
@@ -75,15 +76,22 @@ class ProofOfPossessionBuilder {
|
|
|
75
76
|
throw new Error(oid4vci_common_1.NO_JWT_PROVIDED);
|
|
76
77
|
}
|
|
77
78
|
this.jwt = jwt;
|
|
78
|
-
if (jwt.header) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
this.
|
|
79
|
+
if (!jwt.header) {
|
|
80
|
+
throw Error(`No JWT header present`);
|
|
81
|
+
}
|
|
82
|
+
else if (!jwt.payload) {
|
|
83
|
+
throw Error(`No JWT payload present`);
|
|
84
|
+
}
|
|
85
|
+
if (jwt.header.kid) {
|
|
86
|
+
this.withKid(jwt.header.kid);
|
|
87
|
+
}
|
|
88
|
+
if (jwt.header.typ) {
|
|
89
|
+
this.withTyp(jwt.header.typ);
|
|
90
|
+
}
|
|
91
|
+
if (this.version >= oid4vci_common_1.OpenId4VCIVersion.VER_1_0_11) {
|
|
92
|
+
this.withTyp('openid4vci-proof+jwt');
|
|
86
93
|
}
|
|
94
|
+
this.withAlg(jwt.header.alg);
|
|
87
95
|
if (jwt.payload) {
|
|
88
96
|
if (jwt.payload.iss)
|
|
89
97
|
this.withClientId(jwt.payload.iss);
|
|
@@ -97,13 +105,14 @@ class ProofOfPossessionBuilder {
|
|
|
97
105
|
return this;
|
|
98
106
|
}
|
|
99
107
|
build() {
|
|
108
|
+
var _a;
|
|
100
109
|
return __awaiter(this, void 0, void 0, function* () {
|
|
101
110
|
if (this.proof) {
|
|
102
111
|
return Promise.resolve(this.proof);
|
|
103
112
|
}
|
|
104
113
|
else if (this.callbacks) {
|
|
105
114
|
return yield (0, functions_1.createProofOfPossession)(this.callbacks, {
|
|
106
|
-
typ: this.typ,
|
|
115
|
+
typ: (_a = this.typ) !== null && _a !== void 0 ? _a : (this.version < oid4vci_common_1.OpenId4VCIVersion.VER_1_0_11 ? 'jwt' : 'openid4vci-proof+jwt'),
|
|
107
116
|
kid: this.kid,
|
|
108
117
|
jti: this.jti,
|
|
109
118
|
alg: this.alg,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProofOfPossessionBuilder.js","sourceRoot":"","sources":["../lib/ProofOfPossessionBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ProofOfPossessionBuilder.js","sourceRoot":"","sources":["../lib/ProofOfPossessionBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ const debug = (0, debug_1.default)('sphereon:openid4vci:token');
|
|
|
34
34
|
* - Optional, clientId of the party requesting the credential
|
|
35
35
|
*/
|
|
36
36
|
const createProofOfPossession = (callbacks, jwtProps, existingJwt) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
var _a;
|
|
37
38
|
if (!callbacks.signCallback) {
|
|
38
39
|
debug(`no jwt signer callback or arguments supplied!`);
|
|
39
40
|
throw new Error(oid4vci_common_1.BAD_PARAMS);
|
|
@@ -41,7 +42,7 @@ const createProofOfPossession = (callbacks, jwtProps, existingJwt) => __awaiter(
|
|
|
41
42
|
const signerArgs = createJWT(jwtProps, existingJwt);
|
|
42
43
|
const jwt = yield callbacks.signCallback(signerArgs, signerArgs.header.kid);
|
|
43
44
|
const proof = {
|
|
44
|
-
proof_type: 'jwt',
|
|
45
|
+
proof_type: (_a = signerArgs.header.typ) !== null && _a !== void 0 ? _a : 'jwt',
|
|
45
46
|
jwt,
|
|
46
47
|
};
|
|
47
48
|
try {
|
|
@@ -52,7 +53,7 @@ const createProofOfPossession = (callbacks, jwtProps, existingJwt) => __awaiter(
|
|
|
52
53
|
debug(`Supplied verify callback return success result`);
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
|
-
catch (
|
|
56
|
+
catch (_b) {
|
|
56
57
|
debug(`JWS was not valid`);
|
|
57
58
|
throw new Error(oid4vci_common_1.JWS_NOT_VALID);
|
|
58
59
|
}
|
|
@@ -66,7 +67,7 @@ const partiallyValidateJWS = (jws) => {
|
|
|
66
67
|
}
|
|
67
68
|
};
|
|
68
69
|
const createJWT = (jwtProps, existingJwt) => {
|
|
69
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
70
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
70
71
|
const aud = getJwtProperty('aud', true, jwtProps === null || jwtProps === void 0 ? void 0 : jwtProps.issuer, (_a = existingJwt === null || existingJwt === void 0 ? void 0 : existingJwt.payload) === null || _a === void 0 ? void 0 : _a.aud);
|
|
71
72
|
const iss = getJwtProperty('iss', false, jwtProps === null || jwtProps === void 0 ? void 0 : jwtProps.clientId, (_b = existingJwt === null || existingJwt === void 0 ? void 0 : existingJwt.payload) === null || _b === void 0 ? void 0 : _b.iss);
|
|
72
73
|
const jti = getJwtProperty('jti', false, jwtProps === null || jwtProps === void 0 ? void 0 : jwtProps.jti, (_c = existingJwt === null || existingJwt === void 0 ? void 0 : existingJwt.payload) === null || _c === void 0 ? void 0 : _c.jti);
|
|
@@ -78,7 +79,7 @@ const createJWT = (jwtProps, existingJwt) => {
|
|
|
78
79
|
const now = +new Date();
|
|
79
80
|
const jwtPayload = Object.assign(Object.assign({ aud, iat: ((_g = jwt.payload) === null || _g === void 0 ? void 0 : _g.iat) ? jwt.payload.iat : now / 1000 - 60, exp: ((_h = jwt.payload) === null || _h === void 0 ? void 0 : _h.exp) ? jwt.payload.exp : now / 1000 + 10 * 60, nonce }, (iss ? { iss } : {})), (jti ? { jti } : {}));
|
|
80
81
|
const jwtHeader = {
|
|
81
|
-
typ: 'jwt',
|
|
82
|
+
typ: (_k = (_j = jwtProps === null || jwtProps === void 0 ? void 0 : jwtProps.typ) !== null && _j !== void 0 ? _j : existingJwt === null || existingJwt === void 0 ? void 0 : existingJwt.header.typ) !== null && _k !== void 0 ? _k : 'jwt',
|
|
82
83
|
alg,
|
|
83
84
|
kid,
|
|
84
85
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProofUtil.js","sourceRoot":"","sources":["../../lib/functions/ProofUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAqJ;AACrJ,kDAA0B;AAE1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAEjD;;;;;;;;;;;;;;;;GAgBG;AACI,MAAM,uBAAuB,GAAG,CACrC,SAAqC,EACrC,QAAmB,EACnB,WAAiB,EACW,EAAE
|
|
1
|
+
{"version":3,"file":"ProofUtil.js","sourceRoot":"","sources":["../../lib/functions/ProofUtil.ts"],"names":[],"mappings":"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"}
|
package/lib/AccessTokenClient.ts
CHANGED
|
@@ -29,8 +29,12 @@ export class AccessTokenClient {
|
|
|
29
29
|
|
|
30
30
|
const credentialOffer = await assertedUniformCredentialOffer(opts.credentialOffer);
|
|
31
31
|
const isPinRequired = this.isPinRequiredValue(credentialOffer.credential_offer);
|
|
32
|
+
const issuer = getIssuerFromCredentialOfferPayload(credentialOffer.credential_offer) ?? (metadata?.issuer as string);
|
|
33
|
+
if (!issuer) {
|
|
34
|
+
throw Error('Issuer required at this point');
|
|
35
|
+
}
|
|
32
36
|
const issuerOpts = {
|
|
33
|
-
issuer
|
|
37
|
+
issuer,
|
|
34
38
|
};
|
|
35
39
|
|
|
36
40
|
return await this.acquireAccessTokenUsingRequest({
|
|
@@ -96,7 +100,7 @@ export class AccessTokenClient {
|
|
|
96
100
|
request[PRE_AUTH_CODE_LITERAL] =
|
|
97
101
|
credentialOfferRequest?.credential_offer.grants?.['urn:ietf:params:oauth:grant-type:pre-authorized_code']?.[PRE_AUTH_CODE_LITERAL];
|
|
98
102
|
}
|
|
99
|
-
if (credentialOfferRequest.credential_offer.grants?.authorization_code?.issuer_state) {
|
|
103
|
+
if (!isPreAuth && credentialOfferRequest.credential_offer.grants?.authorization_code?.issuer_state) {
|
|
100
104
|
this.throwNotSupportedFlow(); // not supported yet
|
|
101
105
|
request.grant_type = GrantTypes.AUTHORIZATION_CODE;
|
|
102
106
|
}
|
|
@@ -215,7 +219,7 @@ export class AccessTokenClient {
|
|
|
215
219
|
} else if (metadata?.token_endpoint) {
|
|
216
220
|
url = metadata.token_endpoint;
|
|
217
221
|
} else {
|
|
218
|
-
if (!issuerOpts) {
|
|
222
|
+
if (!issuerOpts?.issuer) {
|
|
219
223
|
throw Error('Either authorization server options, a token endpoint or issuer options are required at this point');
|
|
220
224
|
}
|
|
221
225
|
url = this.creatTokenURLFromURL(issuerOpts.issuer, asOpts?.allowInsecureEndpoints, issuerOpts.tokenEndpoint);
|
|
@@ -229,7 +233,7 @@ export class AccessTokenClient {
|
|
|
229
233
|
}
|
|
230
234
|
|
|
231
235
|
private static creatTokenURLFromURL(url: string, allowInsecureEndpoints?: boolean, tokenEndpoint?: string): string {
|
|
232
|
-
if (allowInsecureEndpoints !== true && url.startsWith('http
|
|
236
|
+
if (allowInsecureEndpoints !== true && url.startsWith('http:')) {
|
|
233
237
|
throw Error(`Unprotected token endpoints are not allowed ${url}. Adjust settings if you really need this (dev/test settings only!!)`);
|
|
234
238
|
}
|
|
235
239
|
const hostname = url.replace(/https?:\/\//, '').replace(/\/$/, '');
|
|
@@ -23,7 +23,7 @@ export interface CredentialRequestOpts {
|
|
|
23
23
|
format?: CredentialFormat | OID4VCICredentialFormat;
|
|
24
24
|
proof: ProofOfPossession;
|
|
25
25
|
token: string;
|
|
26
|
-
version
|
|
26
|
+
version: OpenId4VCIVersion;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
export class CredentialRequestClient {
|
|
@@ -48,7 +48,7 @@ export class CredentialRequestClient {
|
|
|
48
48
|
}): Promise<OpenIDResponse<CredentialResponse>> {
|
|
49
49
|
const { credentialTypes, proofInput, format } = opts;
|
|
50
50
|
|
|
51
|
-
const request = await this.createCredentialRequest({ proofInput, credentialTypes, format });
|
|
51
|
+
const request = await this.createCredentialRequest({ proofInput, credentialTypes, format, version: this.version() });
|
|
52
52
|
return await this.acquireCredentialsUsingRequest(request);
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -77,6 +77,7 @@ export class CredentialRequestClient {
|
|
|
77
77
|
proofInput: ProofOfPossessionBuilder | ProofOfPossession;
|
|
78
78
|
credentialTypes?: string | string[];
|
|
79
79
|
format?: CredentialFormat | OID4VCICredentialFormat;
|
|
80
|
+
version: OpenId4VCIVersion;
|
|
80
81
|
}): Promise<UniformCredentialRequest> {
|
|
81
82
|
const { proofInput } = opts;
|
|
82
83
|
const formatSelection = opts.format ?? this.credentialRequestOpts.format;
|
|
@@ -100,7 +101,9 @@ export class CredentialRequestClient {
|
|
|
100
101
|
}
|
|
101
102
|
|
|
102
103
|
const proof =
|
|
103
|
-
'proof_type' in proofInput
|
|
104
|
+
'proof_type' in proofInput
|
|
105
|
+
? await ProofOfPossessionBuilder.fromProof(proofInput as ProofOfPossession, opts.version).build()
|
|
106
|
+
: await proofInput.build();
|
|
104
107
|
return {
|
|
105
108
|
types,
|
|
106
109
|
format,
|
|
@@ -108,7 +111,10 @@ export class CredentialRequestClient {
|
|
|
108
111
|
} as UniformCredentialRequest;
|
|
109
112
|
}
|
|
110
113
|
|
|
114
|
+
private version(): OpenId4VCIVersion {
|
|
115
|
+
return this.credentialRequestOpts?.version ?? OpenId4VCIVersion.VER_1_0_11;
|
|
116
|
+
}
|
|
111
117
|
private isV11OrHigher(): boolean {
|
|
112
|
-
return
|
|
118
|
+
return this.version() >= OpenId4VCIVersion.VER_1_0_11;
|
|
113
119
|
}
|
|
114
120
|
}
|
package/lib/OpenID4VCIClient.ts
CHANGED
|
@@ -197,6 +197,7 @@ export class OpenID4VCIClient {
|
|
|
197
197
|
}
|
|
198
198
|
return authorizationDetails;
|
|
199
199
|
}
|
|
200
|
+
|
|
200
201
|
private handleLocations(authorizationDetails: AuthDetails) {
|
|
201
202
|
if (authorizationDetails && (this.endpointMetadata.issuerMetadata?.authorization_server || this.endpointMetadata.authorization_endpoint)) {
|
|
202
203
|
if (authorizationDetails.locations) {
|
|
@@ -212,19 +213,14 @@ export class OpenID4VCIClient {
|
|
|
212
213
|
return authorizationDetails;
|
|
213
214
|
}
|
|
214
215
|
|
|
215
|
-
public async acquireAccessToken({
|
|
216
|
-
pin,
|
|
217
|
-
clientId,
|
|
218
|
-
codeVerifier,
|
|
219
|
-
code,
|
|
220
|
-
redirectUri,
|
|
221
|
-
}: {
|
|
216
|
+
public async acquireAccessToken(opts?: {
|
|
222
217
|
pin?: string;
|
|
223
218
|
clientId?: string;
|
|
224
219
|
codeVerifier?: string;
|
|
225
220
|
code?: string;
|
|
226
221
|
redirectUri?: string;
|
|
227
222
|
}): Promise<AccessTokenResponse> {
|
|
223
|
+
const { pin, clientId, codeVerifier, code, redirectUri } = opts ?? {};
|
|
228
224
|
this.assertIssuerData();
|
|
229
225
|
if (clientId) {
|
|
230
226
|
this._clientId = clientId;
|
|
@@ -239,7 +235,7 @@ export class OpenID4VCIClient {
|
|
|
239
235
|
codeVerifier,
|
|
240
236
|
code,
|
|
241
237
|
redirectUri,
|
|
242
|
-
asOpts: { clientId
|
|
238
|
+
asOpts: { clientId },
|
|
243
239
|
});
|
|
244
240
|
|
|
245
241
|
if (response.errorBody) {
|
|
@@ -297,6 +293,9 @@ export class OpenID4VCIClient {
|
|
|
297
293
|
for (const type of types) {
|
|
298
294
|
let typeSupported = false;
|
|
299
295
|
for (const credentialSupported of metadata.credentials_supported) {
|
|
296
|
+
if (!credentialSupported.types || credentialSupported.types.length === 0) {
|
|
297
|
+
throw Error('types is required in the credentials supported');
|
|
298
|
+
}
|
|
300
299
|
if (credentialSupported.types.indexOf(type) != -1) {
|
|
301
300
|
typeSupported = true;
|
|
302
301
|
}
|
|
@@ -317,12 +316,15 @@ export class OpenID4VCIClient {
|
|
|
317
316
|
const proofBuilder = ProofOfPossessionBuilder.fromAccessTokenResponse({
|
|
318
317
|
accessTokenResponse: this.accessTokenResponse,
|
|
319
318
|
callbacks: proofCallbacks,
|
|
319
|
+
version: this.version(),
|
|
320
320
|
})
|
|
321
321
|
.withIssuer(this.getIssuer())
|
|
322
322
|
.withAlg(this.alg)
|
|
323
|
-
.withClientId(this.clientId)
|
|
324
323
|
.withKid(this.kid);
|
|
325
324
|
|
|
325
|
+
if (this._clientId) {
|
|
326
|
+
proofBuilder.withClientId(this.clientId);
|
|
327
|
+
}
|
|
326
328
|
if (jti) {
|
|
327
329
|
proofBuilder.withJti(jti);
|
|
328
330
|
}
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
EndpointMetadata,
|
|
5
5
|
Jwt,
|
|
6
6
|
NO_JWT_PROVIDED,
|
|
7
|
+
OpenId4VCIVersion,
|
|
7
8
|
PROOF_CANT_BE_CONSTRUCTED,
|
|
8
9
|
ProofOfPossession,
|
|
9
10
|
ProofOfPossessionCallbacks,
|
|
@@ -16,6 +17,8 @@ export class ProofOfPossessionBuilder {
|
|
|
16
17
|
private readonly proof?: ProofOfPossession;
|
|
17
18
|
private readonly callbacks?: ProofOfPossessionCallbacks;
|
|
18
19
|
|
|
20
|
+
private version: OpenId4VCIVersion;
|
|
21
|
+
|
|
19
22
|
private kid?: string;
|
|
20
23
|
private clientId?: string;
|
|
21
24
|
private issuer?: string;
|
|
@@ -30,11 +33,13 @@ export class ProofOfPossessionBuilder {
|
|
|
30
33
|
callbacks,
|
|
31
34
|
jwt,
|
|
32
35
|
accessTokenResponse,
|
|
36
|
+
version,
|
|
33
37
|
}: {
|
|
34
38
|
proof?: ProofOfPossession;
|
|
35
39
|
callbacks?: ProofOfPossessionCallbacks;
|
|
36
40
|
accessTokenResponse?: AccessTokenResponse;
|
|
37
41
|
jwt?: Jwt;
|
|
42
|
+
version: OpenId4VCIVersion;
|
|
38
43
|
}) {
|
|
39
44
|
this.proof = proof;
|
|
40
45
|
this.callbacks = callbacks;
|
|
@@ -44,24 +49,35 @@ export class ProofOfPossessionBuilder {
|
|
|
44
49
|
if (accessTokenResponse) {
|
|
45
50
|
this.withAccessTokenResponse(accessTokenResponse);
|
|
46
51
|
}
|
|
52
|
+
this.version = version;
|
|
47
53
|
}
|
|
48
54
|
|
|
49
|
-
static fromJwt({
|
|
50
|
-
|
|
55
|
+
static fromJwt({
|
|
56
|
+
jwt,
|
|
57
|
+
callbacks,
|
|
58
|
+
version,
|
|
59
|
+
}: {
|
|
60
|
+
jwt: Jwt;
|
|
61
|
+
callbacks: ProofOfPossessionCallbacks;
|
|
62
|
+
version: OpenId4VCIVersion;
|
|
63
|
+
}): ProofOfPossessionBuilder {
|
|
64
|
+
return new ProofOfPossessionBuilder({ callbacks, jwt, version });
|
|
51
65
|
}
|
|
52
66
|
|
|
53
67
|
static fromAccessTokenResponse({
|
|
54
68
|
accessTokenResponse,
|
|
55
69
|
callbacks,
|
|
70
|
+
version,
|
|
56
71
|
}: {
|
|
57
72
|
accessTokenResponse: AccessTokenResponse;
|
|
58
73
|
callbacks: ProofOfPossessionCallbacks;
|
|
74
|
+
version: OpenId4VCIVersion;
|
|
59
75
|
}): ProofOfPossessionBuilder {
|
|
60
|
-
return new ProofOfPossessionBuilder({ callbacks, accessTokenResponse });
|
|
76
|
+
return new ProofOfPossessionBuilder({ callbacks, accessTokenResponse, version });
|
|
61
77
|
}
|
|
62
78
|
|
|
63
|
-
static fromProof(proof: ProofOfPossession): ProofOfPossessionBuilder {
|
|
64
|
-
return new ProofOfPossessionBuilder({ proof });
|
|
79
|
+
static fromProof(proof: ProofOfPossession, version: OpenId4VCIVersion): ProofOfPossessionBuilder {
|
|
80
|
+
return new ProofOfPossessionBuilder({ proof, version });
|
|
65
81
|
}
|
|
66
82
|
|
|
67
83
|
withClientId(clientId: string): ProofOfPossessionBuilder {
|
|
@@ -116,15 +132,23 @@ export class ProofOfPossessionBuilder {
|
|
|
116
132
|
throw new Error(NO_JWT_PROVIDED);
|
|
117
133
|
}
|
|
118
134
|
this.jwt = jwt;
|
|
119
|
-
if (jwt.header) {
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
if (jwt.header.typ) {
|
|
124
|
-
this.withTyp(jwt.header.typ as Typ);
|
|
125
|
-
}
|
|
126
|
-
this.withAlg(jwt.header.alg);
|
|
135
|
+
if (!jwt.header) {
|
|
136
|
+
throw Error(`No JWT header present`);
|
|
137
|
+
} else if (!jwt.payload) {
|
|
138
|
+
throw Error(`No JWT payload present`);
|
|
127
139
|
}
|
|
140
|
+
|
|
141
|
+
if (jwt.header.kid) {
|
|
142
|
+
this.withKid(jwt.header.kid);
|
|
143
|
+
}
|
|
144
|
+
if (jwt.header.typ) {
|
|
145
|
+
this.withTyp(jwt.header.typ as Typ);
|
|
146
|
+
}
|
|
147
|
+
if (this.version >= OpenId4VCIVersion.VER_1_0_11) {
|
|
148
|
+
this.withTyp('openid4vci-proof+jwt');
|
|
149
|
+
}
|
|
150
|
+
this.withAlg(jwt.header.alg);
|
|
151
|
+
|
|
128
152
|
if (jwt.payload) {
|
|
129
153
|
if (jwt.payload.iss) this.withClientId(jwt.payload.iss);
|
|
130
154
|
if (jwt.payload.aud) this.withIssuer(jwt.payload.aud);
|
|
@@ -141,7 +165,7 @@ export class ProofOfPossessionBuilder {
|
|
|
141
165
|
return await createProofOfPossession(
|
|
142
166
|
this.callbacks,
|
|
143
167
|
{
|
|
144
|
-
typ: this.typ,
|
|
168
|
+
typ: this.typ ?? (this.version < OpenId4VCIVersion.VER_1_0_11 ? 'jwt' : 'openid4vci-proof+jwt'),
|
|
145
169
|
kid: this.kid,
|
|
146
170
|
jti: this.jti,
|
|
147
171
|
alg: this.alg,
|
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
EndpointMetadata,
|
|
6
6
|
getIssuerFromCredentialOfferPayload,
|
|
7
7
|
Jwt,
|
|
8
|
+
OpenId4VCIVersion,
|
|
8
9
|
ProofOfPossession,
|
|
9
10
|
URL_NOT_VALID,
|
|
10
11
|
WellKnownEndpoints,
|
|
@@ -82,13 +83,14 @@ describe('Credential Request Client ', () => {
|
|
|
82
83
|
callbacks: {
|
|
83
84
|
signCallback: proofOfPossessionCallbackFunction,
|
|
84
85
|
},
|
|
86
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
85
87
|
})
|
|
86
88
|
// .withEndpointMetadata(metadata)
|
|
87
89
|
.withClientId('sphereon:wallet')
|
|
88
90
|
.withKid(kid)
|
|
89
91
|
.build();
|
|
90
92
|
expect(credReqClient.getCredentialEndpoint()).toEqual(basePath + '/credential');
|
|
91
|
-
const credentialRequest = await credReqClient.createCredentialRequest({ proofInput: proof });
|
|
93
|
+
const credentialRequest = await credReqClient.createCredentialRequest({ proofInput: proof, version: OpenId4VCIVersion.VER_1_0_08 });
|
|
92
94
|
expect(credentialRequest.proof?.jwt?.includes(partialJWT)).toBeTruthy();
|
|
93
95
|
const result = await credReqClient.acquireCredentialsUsingRequest(credentialRequest);
|
|
94
96
|
expect(result?.errorBody?.error).toBe('unsupported_format');
|
|
@@ -113,12 +115,17 @@ describe('Credential Request Client ', () => {
|
|
|
113
115
|
callbacks: {
|
|
114
116
|
signCallback: proofOfPossessionCallbackFunction,
|
|
115
117
|
},
|
|
118
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
116
119
|
})
|
|
117
120
|
// .withEndpointMetadata(metadata)
|
|
118
121
|
.withKid(kid)
|
|
119
122
|
.withClientId('sphereon:wallet')
|
|
120
123
|
.build();
|
|
121
|
-
const credentialRequest = await credReqClient.createCredentialRequest({
|
|
124
|
+
const credentialRequest = await credReqClient.createCredentialRequest({
|
|
125
|
+
proofInput: proof,
|
|
126
|
+
format: 'jwt',
|
|
127
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
128
|
+
});
|
|
122
129
|
expect(credentialRequest.proof?.jwt?.includes(partialJWT)).toBeTruthy();
|
|
123
130
|
expect(credentialRequest.format).toEqual('jwt_vc_json_ld');
|
|
124
131
|
const result = await credReqClient.acquireCredentialsUsingRequest(credentialRequest);
|
|
@@ -136,6 +143,7 @@ describe('Credential Request Client ', () => {
|
|
|
136
143
|
callbacks: {
|
|
137
144
|
signCallback: proofOfPossessionCallbackFunction,
|
|
138
145
|
},
|
|
146
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
139
147
|
})
|
|
140
148
|
// .withEndpointMetadata(metadata)
|
|
141
149
|
.withKid(kid)
|
|
@@ -187,6 +195,7 @@ describe('Credential Request Client with different issuers ', () => {
|
|
|
187
195
|
},
|
|
188
196
|
credentialTypes: ['OpenBadgeCredential'],
|
|
189
197
|
format: 'jwt_vc_json_ld',
|
|
198
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
190
199
|
});
|
|
191
200
|
expect(credentialRequest).toEqual(getMockData('spruce')?.credential.request);
|
|
192
201
|
});
|
|
@@ -208,6 +217,7 @@ describe('Credential Request Client with different issuers ', () => {
|
|
|
208
217
|
},
|
|
209
218
|
credentialTypes: ['OpenBadgeCredential'],
|
|
210
219
|
format: 'jwt_vc',
|
|
220
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
211
221
|
});
|
|
212
222
|
expect(credentialOffer).toEqual(getMockData('walt')?.credential.request);
|
|
213
223
|
});
|
|
@@ -230,6 +240,7 @@ describe('Credential Request Client with different issuers ', () => {
|
|
|
230
240
|
},
|
|
231
241
|
credentialTypes: ['OpenBadgeCredential'],
|
|
232
242
|
format: 'jwt_vc',
|
|
243
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
233
244
|
});
|
|
234
245
|
expect(credentialOffer).toEqual(getMockData('uniissuer')?.credential.request);
|
|
235
246
|
});
|
|
@@ -251,6 +262,7 @@ describe('Credential Request Client with different issuers ', () => {
|
|
|
251
262
|
},
|
|
252
263
|
credentialTypes: ['OpenBadgeCredential'],
|
|
253
264
|
format: 'ldp_vc',
|
|
265
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
254
266
|
});
|
|
255
267
|
expect(credentialOffer).toEqual(getMockData('mattr')?.credential.request);
|
|
256
268
|
});
|
|
@@ -272,6 +284,7 @@ describe('Credential Request Client with different issuers ', () => {
|
|
|
272
284
|
},
|
|
273
285
|
credentialTypes: ['OpenBadgeCredential'],
|
|
274
286
|
format: 'ldp_vc',
|
|
287
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
275
288
|
});
|
|
276
289
|
expect(credentialOffer).toEqual(getMockData('diwala')?.credential.request);
|
|
277
290
|
});
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { KeyObject } from 'crypto';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
Alg,
|
|
5
|
+
CredentialIssuerMetadata,
|
|
6
|
+
Jwt,
|
|
7
|
+
JWTPayload,
|
|
8
|
+
OpenId4VCIVersion,
|
|
9
|
+
ProofOfPossession,
|
|
10
|
+
UniformCredentialRequest,
|
|
11
|
+
} from '@sphereon/oid4vci-common';
|
|
4
12
|
import * as jose from 'jose';
|
|
5
13
|
|
|
6
14
|
import { CredentialRequestClientBuilder, ProofOfPossessionBuilder } from '..';
|
|
@@ -74,12 +82,16 @@ describe('Credential Request Client Builder', () => {
|
|
|
74
82
|
signCallback: proofOfPossessionCallbackFunction,
|
|
75
83
|
verifyCallback: proofOfPossessionVerifierCallbackFunction,
|
|
76
84
|
},
|
|
85
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
77
86
|
})
|
|
78
87
|
.withClientId('sphereon:wallet')
|
|
79
88
|
.withKid(kid)
|
|
80
89
|
.build();
|
|
81
90
|
await proofOfPossessionVerifierCallbackFunction({ ...proof, kid });
|
|
82
|
-
const credentialRequest: UniformCredentialRequest = await credReqClient.createCredentialRequest({
|
|
91
|
+
const credentialRequest: UniformCredentialRequest = await credReqClient.createCredentialRequest({
|
|
92
|
+
proofInput: proof,
|
|
93
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
94
|
+
});
|
|
83
95
|
expect(credentialRequest.proof?.jwt).toContain(partialJWT);
|
|
84
96
|
expect('types' in credentialRequest).toBe(true);
|
|
85
97
|
if ('types' in credentialRequest) {
|
package/lib/__tests__/IT.spec.ts
CHANGED
|
@@ -1,4 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
AccessTokenResponse,
|
|
3
|
+
Alg,
|
|
4
|
+
AuthzFlowType,
|
|
5
|
+
CredentialOfferRequestWithBaseUrl,
|
|
6
|
+
Jwt,
|
|
7
|
+
OpenId4VCIVersion,
|
|
8
|
+
ProofOfPossession,
|
|
9
|
+
} from '@sphereon/oid4vci-common';
|
|
2
10
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
3
11
|
// @ts-ignore
|
|
4
12
|
import nock from 'nock';
|
|
@@ -148,6 +156,7 @@ describe('OID4VCI-Client should', () => {
|
|
|
148
156
|
callbacks: {
|
|
149
157
|
signCallback: proofOfPossessionCallbackFunction,
|
|
150
158
|
},
|
|
159
|
+
version: OpenId4VCIVersion.VER_1_0_11,
|
|
151
160
|
})
|
|
152
161
|
.withEndpointMetadata({
|
|
153
162
|
issuer: 'https://issuer.research.identiproof.io',
|
|
@@ -30,12 +30,12 @@ describe('Issuance Initiation', () => {
|
|
|
30
30
|
});
|
|
31
31
|
|
|
32
32
|
it('Should return Issuance Initiation URI from request', async () => {
|
|
33
|
-
expect(
|
|
33
|
+
expect(CredentialOfferClient.toURI(INITIATION_TEST)).toEqual(INITIATION_TEST_URI);
|
|
34
34
|
});
|
|
35
35
|
|
|
36
36
|
it('Should return URI from Issuance Initiation Request', async () => {
|
|
37
37
|
const issuanceInitiationClient = await CredentialOfferClient.fromURI(INITIATION_TEST_HTTPS_URI);
|
|
38
|
-
expect(
|
|
38
|
+
expect(CredentialOfferClient.toURI(issuanceInitiationClient)).toEqual(INITIATION_TEST_HTTPS_URI);
|
|
39
39
|
});
|
|
40
40
|
|
|
41
41
|
it('Should throw error on invalid URI', async () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { convertJsonToURI, convertURIToJsonObject, OpenId4VCIVersion } from '@sphereon/oid4vci-common';
|
|
2
2
|
|
|
3
|
-
describe('JSON To URI', () => {
|
|
3
|
+
describe('JSON To URI v8', () => {
|
|
4
4
|
it('should parse an object into open-id-URI with a single credential_type', () => {
|
|
5
5
|
expect(
|
|
6
6
|
convertJsonToURI(
|
|
@@ -11,7 +11,7 @@ describe('JSON To URI', () => {
|
|
|
11
11
|
},
|
|
12
12
|
{
|
|
13
13
|
uriTypeProperties: ['issuer', 'credential_type'],
|
|
14
|
-
version: OpenId4VCIVersion.
|
|
14
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
15
15
|
}
|
|
16
16
|
)
|
|
17
17
|
).toEqual(
|
|
@@ -29,7 +29,7 @@ describe('JSON To URI', () => {
|
|
|
29
29
|
{
|
|
30
30
|
arrayTypeProperties: ['credential_type'],
|
|
31
31
|
uriTypeProperties: ['issuer', 'credential_type'],
|
|
32
|
-
version: OpenId4VCIVersion.
|
|
32
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
33
33
|
}
|
|
34
34
|
)
|
|
35
35
|
).toEqual(
|
|
@@ -47,7 +47,7 @@ describe('JSON To URI', () => {
|
|
|
47
47
|
{
|
|
48
48
|
arrayTypeProperties: ['credential_type'],
|
|
49
49
|
uriTypeProperties: ['issuer', 'credential_type'],
|
|
50
|
-
version: OpenId4VCIVersion.
|
|
50
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
51
51
|
}
|
|
52
52
|
)
|
|
53
53
|
).toEqual(
|
|
@@ -55,6 +55,63 @@ describe('JSON To URI', () => {
|
|
|
55
55
|
);
|
|
56
56
|
});
|
|
57
57
|
});
|
|
58
|
+
|
|
59
|
+
describe('JSON To URI v9', () => {
|
|
60
|
+
it('should parse an object into open-id-URI with a single credential_type', () => {
|
|
61
|
+
expect(
|
|
62
|
+
convertJsonToURI(
|
|
63
|
+
{
|
|
64
|
+
issuer: 'https://server.example.com',
|
|
65
|
+
credential_type: 'https://did.example.org/healthCard',
|
|
66
|
+
op_state: 'eyJhbGciOiJSU0Et...FYUaBy',
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
uriTypeProperties: ['issuer', 'credential_type'],
|
|
70
|
+
version: OpenId4VCIVersion.VER_1_0_09,
|
|
71
|
+
}
|
|
72
|
+
)
|
|
73
|
+
).toEqual(
|
|
74
|
+
'%7B%22issuer%22%3A%22https%3A%2F%2Fserver.example.com%22%2C%22credential_type%22%3A%22https%3A%2F%2Fdid.example.org%2FhealthCard%22%2C%22op_state%22%3A%22eyJhbGciOiJSU0Et...FYUaBy%22%7D'
|
|
75
|
+
);
|
|
76
|
+
});
|
|
77
|
+
it('should parse an object into open-id-URI with an array of credential_type', () => {
|
|
78
|
+
expect(
|
|
79
|
+
convertJsonToURI(
|
|
80
|
+
{
|
|
81
|
+
issuer: 'https://server.example.com',
|
|
82
|
+
credential_type: ['https://did.example.org/healthCard', 'https://did.example.org/driverLicense'],
|
|
83
|
+
op_state: 'eyJhbGciOiJSU0Et...FYUaBy',
|
|
84
|
+
},
|
|
85
|
+
{
|
|
86
|
+
arrayTypeProperties: ['credential_type'],
|
|
87
|
+
uriTypeProperties: ['issuer', 'credential_type'],
|
|
88
|
+
version: OpenId4VCIVersion.VER_1_0_09,
|
|
89
|
+
}
|
|
90
|
+
)
|
|
91
|
+
).toEqual(
|
|
92
|
+
'%7B%22issuer%22%3A%22https%3A%2F%2Fserver.example.com%22%2C%22credential_type%22%3A%5B%22https%3A%2F%2Fdid.example.org%2FhealthCard%22%2C%22https%3A%2F%2Fdid.example.org%2FdriverLicense%22%5D%2C%22op_state%22%3A%22eyJhbGciOiJSU0Et...FYUaBy%22%7D'
|
|
93
|
+
);
|
|
94
|
+
});
|
|
95
|
+
it('should parse an object into open-id-URI with an array of credential_type and json string', () => {
|
|
96
|
+
expect(
|
|
97
|
+
convertJsonToURI(
|
|
98
|
+
JSON.stringify({
|
|
99
|
+
issuer: 'https://server.example.com',
|
|
100
|
+
credential_type: ['https://did.example.org/healthCard', 'https://did.example.org/driverLicense'],
|
|
101
|
+
op_state: 'eyJhbGciOiJSU0Et...FYUaBy',
|
|
102
|
+
}),
|
|
103
|
+
{
|
|
104
|
+
arrayTypeProperties: ['credential_type'],
|
|
105
|
+
uriTypeProperties: ['issuer', 'credential_type'],
|
|
106
|
+
version: OpenId4VCIVersion.VER_1_0_09,
|
|
107
|
+
}
|
|
108
|
+
)
|
|
109
|
+
).toEqual(
|
|
110
|
+
'%7B%22issuer%22%3A%22https%3A%2F%2Fserver.example.com%22%2C%22credential_type%22%3A%5B%22https%3A%2F%2Fdid.example.org%2FhealthCard%22%2C%22https%3A%2F%2Fdid.example.org%2FdriverLicense%22%5D%2C%22op_state%22%3A%22eyJhbGciOiJSU0Et...FYUaBy%22%7D'
|
|
111
|
+
);
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
|
|
58
115
|
describe('URI To Json Object', () => {
|
|
59
116
|
it('should parse open-id-URI as json object with a single credential_type', () => {
|
|
60
117
|
expect(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { KeyObject } from 'crypto';
|
|
2
2
|
|
|
3
|
-
import { Alg, JWS_NOT_VALID, Jwt, NO_JWT_PROVIDED, PROOF_CANT_BE_CONSTRUCTED, ProofOfPossession } from '@sphereon/oid4vci-common';
|
|
3
|
+
import { Alg, JWS_NOT_VALID, Jwt, NO_JWT_PROVIDED, OpenId4VCIVersion, PROOF_CANT_BE_CONSTRUCTED, ProofOfPossession } from '@sphereon/oid4vci-common';
|
|
4
4
|
import * as jose from 'jose';
|
|
5
5
|
|
|
6
6
|
import { ProofOfPossessionBuilder } from '..';
|
|
@@ -44,7 +44,7 @@ beforeAll(async () => {
|
|
|
44
44
|
describe('ProofOfPossession Builder ', () => {
|
|
45
45
|
it('should fail without supplied proof or callbacks', async function () {
|
|
46
46
|
await expect(
|
|
47
|
-
ProofOfPossessionBuilder.fromProof(undefined as never)
|
|
47
|
+
ProofOfPossessionBuilder.fromProof(undefined as never, OpenId4VCIVersion.VER_1_0_11)
|
|
48
48
|
.withIssuer(IDENTIPROOF_ISSUER_URL)
|
|
49
49
|
.withClientId('sphereon:wallet')
|
|
50
50
|
.withKid(kid)
|
|
@@ -54,7 +54,7 @@ describe('ProofOfPossession Builder ', () => {
|
|
|
54
54
|
|
|
55
55
|
it('should fail wit undefined jwt supplied', async function () {
|
|
56
56
|
await expect(() =>
|
|
57
|
-
ProofOfPossessionBuilder.fromJwt({ jwt, callbacks: { signCallback: proofOfPossessionCallbackFunction } })
|
|
57
|
+
ProofOfPossessionBuilder.fromJwt({ jwt, callbacks: { signCallback: proofOfPossessionCallbackFunction }, version: OpenId4VCIVersion.VER_1_0_08 })
|
|
58
58
|
.withJwt(undefined as never)
|
|
59
59
|
.withIssuer(IDENTIPROOF_ISSUER_URL)
|
|
60
60
|
.withClientId('sphereon:wallet')
|
|
@@ -69,6 +69,7 @@ describe('ProofOfPossession Builder ', () => {
|
|
|
69
69
|
callbacks: {
|
|
70
70
|
signCallback: proofOfPossessionCallbackFunction,
|
|
71
71
|
},
|
|
72
|
+
version: OpenId4VCIVersion.VER_1_0_08,
|
|
72
73
|
})
|
|
73
74
|
.withIssuer(IDENTIPROOF_ISSUER_URL)
|
|
74
75
|
.withKid(kid)
|
|
@@ -84,7 +85,7 @@ describe('ProofOfPossession Builder ', () => {
|
|
|
84
85
|
}
|
|
85
86
|
|
|
86
87
|
await expect(
|
|
87
|
-
ProofOfPossessionBuilder.fromJwt({ jwt, callbacks: { signCallback: proofOfPossessionCallbackFunction } })
|
|
88
|
+
ProofOfPossessionBuilder.fromJwt({ jwt, callbacks: { signCallback: proofOfPossessionCallbackFunction }, version: OpenId4VCIVersion.VER_1_0_08 })
|
|
88
89
|
.withIssuer(IDENTIPROOF_ISSUER_URL)
|
|
89
90
|
.withClientId('sphereon:wallet')
|
|
90
91
|
.withKid(kid)
|
|
@@ -99,7 +100,7 @@ describe('ProofOfPossession Builder ', () => {
|
|
|
99
100
|
}
|
|
100
101
|
|
|
101
102
|
await expect(
|
|
102
|
-
ProofOfPossessionBuilder.fromJwt({ jwt, callbacks: { signCallback: proofOfPossessionCallbackFunction } })
|
|
103
|
+
ProofOfPossessionBuilder.fromJwt({ jwt, callbacks: { signCallback: proofOfPossessionCallbackFunction }, version: OpenId4VCIVersion.VER_1_0_08 })
|
|
103
104
|
.withIssuer(IDENTIPROOF_ISSUER_URL)
|
|
104
105
|
.withClientId('sphereon:wallet')
|
|
105
106
|
.withKid(kid)
|
|
@@ -32,7 +32,7 @@ export const createProofOfPossession = async (
|
|
|
32
32
|
const signerArgs = createJWT(jwtProps, existingJwt);
|
|
33
33
|
const jwt = await callbacks.signCallback(signerArgs, signerArgs.header.kid);
|
|
34
34
|
const proof = {
|
|
35
|
-
proof_type: 'jwt',
|
|
35
|
+
proof_type: signerArgs.header.typ ?? 'jwt',
|
|
36
36
|
jwt,
|
|
37
37
|
} as ProofOfPossession;
|
|
38
38
|
|
|
@@ -87,7 +87,7 @@ const createJWT = (jwtProps?: JwtProps, existingJwt?: Jwt): Jwt => {
|
|
|
87
87
|
};
|
|
88
88
|
|
|
89
89
|
const jwtHeader: JWTHeader = {
|
|
90
|
-
typ: 'jwt',
|
|
90
|
+
typ: jwtProps?.typ ?? existingJwt?.header.typ ?? 'jwt',
|
|
91
91
|
alg,
|
|
92
92
|
kid,
|
|
93
93
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/oid4vci-client",
|
|
3
|
-
"version": "0.4.1-unstable.
|
|
3
|
+
"version": "0.4.1-unstable.255+5cab075",
|
|
4
4
|
"description": "OpenID for Verifiable Credential Issuance (OpenID4VCI) client",
|
|
5
5
|
"source": "lib/index.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"build": "tsc"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@sphereon/oid4vci-common": "0.4.1-unstable.
|
|
18
|
+
"@sphereon/oid4vci-common": "0.4.1-unstable.255+5cab075",
|
|
19
19
|
"@sphereon/ssi-types": "^0.9.0",
|
|
20
20
|
"cross-fetch": "^3.1.5",
|
|
21
21
|
"debug": "^4.3.4",
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"OIDC4VCI",
|
|
65
65
|
"OID4VCI"
|
|
66
66
|
],
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "5cab07534e7a8b340f7a05343f56fbf091d64738"
|
|
68
68
|
}
|