@sphereon/oid4vci-client 0.16.1-feature.SPRIND.89.251 → 0.16.1-feature.SPRIND.89.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/MetadataClient.d.ts.map +1 -1
- package/dist/MetadataClient.js +10 -1
- package/dist/MetadataClient.js.map +1 -1
- package/dist/MetadataClientV1_0_11.d.ts.map +1 -1
- package/dist/MetadataClientV1_0_11.js +10 -1
- package/dist/MetadataClientV1_0_11.js.map +1 -1
- package/dist/MetadataClientV1_0_13.d.ts.map +1 -1
- package/dist/MetadataClientV1_0_13.js +10 -1
- package/dist/MetadataClientV1_0_13.js.map +1 -1
- package/lib/MetadataClient.ts +11 -1
- package/lib/MetadataClientV1_0_11.ts +11 -1
- package/lib/MetadataClientV1_0_13.ts +11 -1
- package/lib/__tests__/MetadataClient.spec.ts +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataClient.d.ts","sourceRoot":"","sources":["../lib/MetadataClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAE3B,+BAA+B,EAC/B,+BAA+B,EAC/B,sBAAsB,EAEtB,iCAAiC,EAEjC,6BAA6B,EAC7B,6BAA6B,EAE7B,qBAAqB,EAErB,cAAc,EAEf,MAAM,0BAA0B,CAAC;AASlC,qBAAa,cAAc;IACzB;;;;OAIG;WACiB,sCAAsC,CACxD,eAAe,EAAE,iCAAiC,GACjD,OAAO,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;IAQzE;;;OAGG;WACiB,6CAA6C,CAC/D,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;IAYzE;;;;OAIG;WACiB,mBAAmB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,GAClC,OAAO,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"MetadataClient.d.ts","sourceRoot":"","sources":["../lib/MetadataClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAE3B,+BAA+B,EAC/B,+BAA+B,EAC/B,sBAAsB,EAEtB,iCAAiC,EAEjC,6BAA6B,EAC7B,6BAA6B,EAE7B,qBAAqB,EAErB,cAAc,EAEf,MAAM,0BAA0B,CAAC;AASlC,qBAAa,cAAc;IACzB;;;;OAIG;WACiB,sCAAsC,CACxD,eAAe,EAAE,iCAAiC,GACjD,OAAO,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;IAQzE;;;OAGG;WACiB,6CAA6C,CAC/D,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;IAYzE;;;;OAIG;WACiB,mBAAmB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,GAClC,OAAO,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;IAkJzE;;;;;OAKG;WACiB,gCAAgC,CAClD,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE;QACL,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GACA,OAAO,CACN,cAAc,CACZ,+BAA+B,GAAG,+BAA+B,GAAG,CAAC,qBAAqB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC,CACnI,GACD,SAAS,CACZ;CAKF"}
|
package/dist/MetadataClient.js
CHANGED
|
@@ -64,6 +64,7 @@ class MetadataClient {
|
|
|
64
64
|
let credential_endpoint;
|
|
65
65
|
let deferred_credential_endpoint;
|
|
66
66
|
let authorization_endpoint;
|
|
67
|
+
let authorization_challenge_endpoint;
|
|
67
68
|
let authorizationServerType = 'OID4VCI';
|
|
68
69
|
let authorization_servers = [issuer];
|
|
69
70
|
let authorization_server = undefined;
|
|
@@ -120,8 +121,15 @@ class MetadataClient {
|
|
|
120
121
|
throw Error(`Credential issuer has a different authorization_endpoint (${authorization_endpoint}) from the Authorization Server (${authMetadata.authorization_endpoint})`);
|
|
121
122
|
}
|
|
122
123
|
authorization_endpoint = authMetadata.authorization_endpoint;
|
|
124
|
+
if (!authMetadata.authorization_challenge_endpoint) {
|
|
125
|
+
console.warn(`Authorization Server ${authorization_challenge_endpoint} did not provide a authorization_challenge_endpoint`);
|
|
126
|
+
}
|
|
127
|
+
else if (authorization_challenge_endpoint && authMetadata.authorization_challenge_endpoint !== authorization_challenge_endpoint) {
|
|
128
|
+
throw Error(`Credential issuer has a different authorization_challenge_endpoint (${authorization_challenge_endpoint}) from the Authorization Server (${authMetadata.authorization_challenge_endpoint})`);
|
|
129
|
+
}
|
|
130
|
+
authorization_challenge_endpoint = authMetadata.authorization_challenge_endpoint;
|
|
123
131
|
if (!authMetadata.token_endpoint) {
|
|
124
|
-
throw Error(`Authorization
|
|
132
|
+
throw Error(`Authorization Server ${authorization_servers} did not provide a token_endpoint`);
|
|
125
133
|
}
|
|
126
134
|
else if (token_endpoint && authMetadata.token_endpoint !== token_endpoint) {
|
|
127
135
|
throw Error(`Credential issuer has a different token_endpoint (${token_endpoint}) from the Authorization Server (${authMetadata.token_endpoint})`);
|
|
@@ -176,6 +184,7 @@ class MetadataClient {
|
|
|
176
184
|
token_endpoint,
|
|
177
185
|
credential_endpoint,
|
|
178
186
|
deferred_credential_endpoint }, (authorization_server ? { authorization_server } : { authorization_servers: authorization_servers })), { authorization_endpoint,
|
|
187
|
+
authorization_challenge_endpoint,
|
|
179
188
|
authorizationServerType, credentialIssuerMetadata: authorization_server
|
|
180
189
|
? credentialIssuerMetadata
|
|
181
190
|
: credentialIssuerMetadata, authorizationServerMetadata: authMetadata });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataClient.js","sourceRoot":"","sources":["../lib/MetadataClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MetadataClient.js","sourceRoot":"","sources":["../lib/MetadataClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataClientV1_0_11.d.ts","sourceRoot":"","sources":["../lib/MetadataClientV1_0_11.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,+BAA+B,EAC/B,sBAAsB,EACtB,iCAAiC,EACjC,6BAA6B,EAG7B,cAAc,EAEf,MAAM,0BAA0B,CAAC;AAOlC,qBAAa,qBAAqB;IAChC;;;;OAIG;WACiB,sCAAsC,CACxD,eAAe,EAAE,iCAAiC,GACjD,OAAO,CAAC,6BAA6B,CAAC;IAIzC;;;OAGG;WACiB,6CAA6C,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAQ1I;;;;OAIG;WACiB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"MetadataClientV1_0_11.d.ts","sourceRoot":"","sources":["../lib/MetadataClientV1_0_11.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,+BAA+B,EAC/B,sBAAsB,EACtB,iCAAiC,EACjC,6BAA6B,EAG7B,cAAc,EAEf,MAAM,0BAA0B,CAAC;AAOlC,qBAAa,qBAAqB;IAChC;;;;OAIG;WACiB,sCAAsC,CACxD,eAAe,EAAE,iCAAiC,GACjD,OAAO,CAAC,6BAA6B,CAAC;IAIzC;;;OAGG;WACiB,6CAA6C,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAQ1I;;;;OAIG;WACiB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAwIpI;;;;OAIG;WACiB,gCAAgC,CAClD,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE;QACL,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GACA,OAAO,CAAC,cAAc,CAAC,+BAA+B,CAAC,GAAG,SAAS,CAAC;CAKxE"}
|
|
@@ -52,6 +52,7 @@ class MetadataClientV1_0_11 {
|
|
|
52
52
|
let credential_endpoint;
|
|
53
53
|
let deferred_credential_endpoint;
|
|
54
54
|
let authorization_endpoint;
|
|
55
|
+
let authorization_challenge_endpoint;
|
|
55
56
|
let authorizationServerType = 'OID4VCI';
|
|
56
57
|
let authorization_server = issuer;
|
|
57
58
|
const oid4vciResponse = yield MetadataClientV1_0_11.retrieveOpenID4VCIServerMetadata(issuer, { errorOnNotFound: false }); // We will handle errors later, given we will also try other metadata locations
|
|
@@ -102,8 +103,15 @@ class MetadataClientV1_0_11 {
|
|
|
102
103
|
throw Error(`Credential issuer has a different authorization_endpoint (${authorization_endpoint}) from the Authorization Server (${authMetadata.authorization_endpoint})`);
|
|
103
104
|
}
|
|
104
105
|
authorization_endpoint = authMetadata.authorization_endpoint;
|
|
106
|
+
if (!authMetadata.authorization_challenge_endpoint) {
|
|
107
|
+
console.warn(`Authorization Server ${authorization_challenge_endpoint} did not provide a authorization_challenge_endpoint`);
|
|
108
|
+
}
|
|
109
|
+
else if (authorization_challenge_endpoint && authMetadata.authorization_challenge_endpoint !== authorization_challenge_endpoint) {
|
|
110
|
+
throw Error(`Credential issuer has a different authorization_challenge_endpoint (${authorization_challenge_endpoint}) from the Authorization Server (${authMetadata.authorization_challenge_endpoint})`);
|
|
111
|
+
}
|
|
112
|
+
authorization_challenge_endpoint = authMetadata.authorization_challenge_endpoint;
|
|
105
113
|
if (!authMetadata.token_endpoint) {
|
|
106
|
-
throw Error(`Authorization
|
|
114
|
+
throw Error(`Authorization Server ${authorization_server} did not provide a token_endpoint`);
|
|
107
115
|
}
|
|
108
116
|
else if (token_endpoint && authMetadata.token_endpoint !== token_endpoint) {
|
|
109
117
|
throw Error(`Credential issuer has a different token_endpoint (${token_endpoint}) from the Authorization Server (${authMetadata.token_endpoint})`);
|
|
@@ -159,6 +167,7 @@ class MetadataClientV1_0_11 {
|
|
|
159
167
|
deferred_credential_endpoint,
|
|
160
168
|
authorization_server,
|
|
161
169
|
authorization_endpoint,
|
|
170
|
+
authorization_challenge_endpoint,
|
|
162
171
|
authorizationServerType,
|
|
163
172
|
credentialIssuerMetadata: credentialIssuerMetadata,
|
|
164
173
|
authorizationServerMetadata: authMetadata,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataClientV1_0_11.js","sourceRoot":"","sources":["../lib/MetadataClientV1_0_11.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MetadataClientV1_0_11.js","sourceRoot":"","sources":["../lib/MetadataClientV1_0_11.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAWkC;AAClC,kDAA0B;AAE1B,yDAA4D;AAE5D,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAEjD,MAAa,qBAAqB;IAChC;;;;OAIG;IACI,MAAM,CAAO,sCAAsC,CACxD,eAAkD;;YAElD,OAAO,qBAAqB,CAAC,6CAA6C,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC/G,CAAC;KAAA;IAED;;;OAGG;IACI,MAAM,CAAO,6CAA6C,CAAC,OAA+B;;YAC/F,MAAM,MAAM,GAAG,IAAA,oDAAmC,EAAC,OAAO,CAAC,CAAC;YAC5D,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,qBAAqB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;QACrG,CAAC;KAAA;IAED;;;;OAIG;IACI,MAAM,CAAO,mBAAmB,CAAC,MAAc,EAAE,IAAmC;;YACzF,IAAI,cAAkC,CAAC;YACvC,IAAI,mBAAuC,CAAC;YAC5C,IAAI,4BAAgD,CAAC;YACrD,IAAI,sBAA0C,CAAC;YAC/C,IAAI,gCAAoD,CAAC;YACzD,IAAI,uBAAuB,GAA4B,SAAS,CAAC;YACjE,IAAI,oBAAoB,GAAW,MAAM,CAAC;YAC1C,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC,gCAAgC,CAAC,MAAM,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,+EAA+E;YACzM,IAAI,wBAAwB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,CAAC;YAC5D,IAAI,wBAAwB,EAAE,CAAC;gBAC7B,KAAK,CAAC,UAAU,MAAM,0CAA0C,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;gBAC5G,mBAAmB,GAAG,wBAAwB,CAAC,mBAAmB,CAAC;gBACnE,4BAA4B,GAAG,wBAAwB,CAAC,4BAA4B,CAAC;gBACrF,IAAI,wBAAwB,CAAC,cAAc,EAAE,CAAC;oBAC5C,cAAc,GAAG,wBAAwB,CAAC,cAAc,CAAC;gBAC3D,CAAC;gBACD,IAAI,wBAAwB,CAAC,oBAAoB,EAAE,CAAC;oBAClD,oBAAoB,GAAG,wBAAwB,CAAC,oBAAoB,CAAC;gBACvE,CAAC;gBACD,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,CAAC;oBACpD,sBAAsB,GAAG,wBAAwB,CAAC,sBAAsB,CAAC;gBAC3E,CAAC;YACH,CAAC;YACD,uGAAuG;YACvG,IAAI,QAAQ,GAAgD,MAAM,IAAA,+BAAiB,EACjF,oBAAoB,EACpB,mCAAkB,CAAC,oBAAoB,EACvC;gBACE,eAAe,EAAE,KAAK;aACvB,CACF,CAAC;YACF,IAAI,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC;YACxC,IAAI,YAAY,EAAE,CAAC;gBACjB,KAAK,CAAC,UAAU,MAAM,4DAA4D,CAAC,CAAC;gBACpF,uBAAuB,GAAG,MAAM,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,sBAAsB;gBACtB,QAAQ,GAAG,MAAM,IAAA,+BAAiB,EAAC,oBAAoB,EAAE,mCAAkB,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;gBAClH,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC;YACtC,CAAC;YACD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,6GAA6G;gBAC7G,IAAI,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBACpC,MAAM,KAAK,CAAC,UAAU,MAAM,6CAA6C,oBAAoB,4CAA4C,CAAC,CAAC;gBAC7I,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7B,uBAAuB,GAAG,WAAW,CAAC;gBACxC,CAAC;gBACD,KAAK,CAAC,UAAU,MAAM,QAAQ,uBAAuB,yCAAyC,CAAC,CAAC;gBAChG,IAAI,CAAC,YAAY,CAAC,sBAAsB,EAAE,CAAC;oBACzC,OAAO,CAAC,IAAI,CACV,UAAU,MAAM,YAAY,uBAAuB,4CAA4C,sBAAsB,4CAA4C,CAClK,CAAC;gBACJ,CAAC;qBAAM,IAAI,sBAAsB,IAAI,YAAY,CAAC,sBAAsB,KAAK,sBAAsB,EAAE,CAAC;oBACpG,MAAM,KAAK,CACT,6DAA6D,sBAAsB,oCAAoC,YAAY,CAAC,sBAAsB,GAAG,CAC9J,CAAC;gBACJ,CAAC;gBACD,sBAAsB,GAAG,YAAY,CAAC,sBAAsB,CAAC;gBAC7D,IAAI,CAAC,YAAY,CAAC,gCAAgC,EAAE,CAAC;oBACnD,OAAO,CAAC,IAAI,CAAC,wBAAwB,gCAAgC,qDAAqD,CAAC,CAAC;gBAC9H,CAAC;qBAAM,IAAI,gCAAgC,IAAI,YAAY,CAAC,gCAAgC,KAAK,gCAAgC,EAAE,CAAC;oBAClI,MAAM,KAAK,CACT,uEAAuE,gCAAgC,oCAAoC,YAAY,CAAC,gCAAgC,GAAG,CAC5L,CAAC;gBACJ,CAAC;gBACD,gCAAgC,GAAG,YAAY,CAAC,gCAAgC,CAAC;gBACjF,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;oBACjC,MAAM,KAAK,CAAC,wBAAwB,oBAAoB,mCAAmC,CAAC,CAAC;gBAC/F,CAAC;qBAAM,IAAI,cAAc,IAAI,YAAY,CAAC,cAAc,KAAK,cAAc,EAAE,CAAC;oBAC5E,MAAM,KAAK,CACT,qDAAqD,cAAc,oCAAoC,YAAY,CAAC,cAAc,GAAG,CACtI,CAAC;gBACJ,CAAC;gBACD,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC;gBAC7C,IAAI,YAAY,CAAC,mBAAmB,EAAE,CAAC;oBACrC,IAAI,mBAAmB,IAAI,YAAY,CAAC,mBAAmB,KAAK,mBAAmB,EAAE,CAAC;wBACpF,KAAK,CACH,0DAA0D,mBAAmB,oCAAoC,YAAY,CAAC,mBAAmB,8BAA8B,CAChL,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,mBAAmB,GAAG,YAAY,CAAC,mBAAmB,CAAC;oBACzD,CAAC;gBACH,CAAC;gBACD,IAAI,YAAY,CAAC,4BAA4B,EAAE,CAAC;oBAC9C,IAAI,4BAA4B,IAAI,YAAY,CAAC,4BAA4B,KAAK,4BAA4B,EAAE,CAAC;wBAC/G,KAAK,CACH,mEAAmE,4BAA4B,oCAAoC,YAAY,CAAC,4BAA4B,8BAA8B,CAC3M,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,4BAA4B,GAAG,YAAY,CAAC,4BAA4B,CAAC;oBAC3E,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5B,KAAK,CAAC,UAAU,MAAM,6EAA6E,CAAC,CAAC;YACvG,CAAC;YACD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,KAAK,CAAC,UAAU,MAAM,iEAAiE,CAAC,CAAC;gBACzF,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,EAAE,CAAC;oBAC1B,MAAM,KAAK,CAAC,2CAA2C,MAAM,EAAE,CAAC,CAAC;gBACnE,CAAC;qBAAM,CAAC;oBACN,cAAc,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3E,CAAC;YACH,CAAC;YACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,KAAK,CAAC,UAAU,MAAM,sEAAsE,CAAC,CAAC;gBAC9F,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,EAAE,CAAC;oBAC1B,MAAM,KAAK,CAAC,gDAAgD,MAAM,EAAE,CAAC,CAAC;gBACxE,CAAC;qBAAM,CAAC;oBACN,mBAAmB,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;gBAC1F,CAAC;YACH,CAAC;YAED,IAAI,CAAC,wBAAwB,IAAI,YAAY,EAAE,CAAC;gBAC9C,+JAA+J;gBAC/J,wBAAwB,GAAG,YAA+C,CAAC;YAC7E,CAAC;YACD,KAAK,CAAC,UAAU,MAAM,mBAAmB,cAAc,yBAAyB,mBAAmB,EAAE,CAAC,CAAC;YACvG,OAAO;gBACL,MAAM;gBACN,cAAc;gBACd,mBAAmB;gBACnB,4BAA4B;gBAC5B,oBAAoB;gBACpB,sBAAsB;gBACtB,gCAAgC;gBAChC,uBAAuB;gBACvB,wBAAwB,EAAE,wBAAmG;gBAC7H,2BAA2B,EAAE,YAAY;aAC1C,CAAC;QACJ,CAAC;KAAA;IAED;;;;OAIG;IACI,MAAM,CAAO,gCAAgC,CAClD,UAAkB,EAClB,IAEC;;YAED,OAAO,IAAA,+BAAiB,EAAC,UAAU,EAAE,mCAAkB,CAAC,iBAAiB,EAAE;gBACzE,eAAe,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,MAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe;aACnF,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AApLD,sDAoLC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataClientV1_0_13.d.ts","sourceRoot":"","sources":["../lib/MetadataClientV1_0_13.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,6BAA6B,EAC7B,iCAAiC,EACjC,6BAA6B,EAE7B,qBAAqB,EACrB,cAAc,EAEf,MAAM,0BAA0B,CAAC;AAOlC,qBAAa,qBAAqB;IAChC;;;;OAIG;WACiB,sCAAsC,CACxD,eAAe,EAAE,iCAAiC,GACjD,OAAO,CAAC,6BAA6B,CAAC;IAIzC;;;OAGG;WACiB,6CAA6C,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAQjJ;;;;OAIG;WACiB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"MetadataClientV1_0_13.d.ts","sourceRoot":"","sources":["../lib/MetadataClientV1_0_13.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,6BAA6B,EAC7B,iCAAiC,EACjC,6BAA6B,EAE7B,qBAAqB,EACrB,cAAc,EAEf,MAAM,0BAA0B,CAAC;AAOlC,qBAAa,qBAAqB;IAChC;;;;OAIG;WACiB,sCAAsC,CACxD,eAAe,EAAE,iCAAiC,GACjD,OAAO,CAAC,6BAA6B,CAAC;IAIzC;;;OAGG;WACiB,6CAA6C,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAQjJ;;;;OAIG;WACiB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAuIpI;;;;;OAKG;WACiB,gCAAgC,CAClD,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE;QACL,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GACA,OAAO,CAAC,cAAc,CAAC,qBAAqB,CAAC,GAAG,SAAS,CAAC;CAK9D"}
|
|
@@ -52,6 +52,7 @@ class MetadataClientV1_0_13 {
|
|
|
52
52
|
let credential_endpoint;
|
|
53
53
|
let deferred_credential_endpoint;
|
|
54
54
|
let authorization_endpoint;
|
|
55
|
+
let authorization_challenge_endpoint;
|
|
55
56
|
let authorizationServerType = 'OID4VCI';
|
|
56
57
|
let authorization_servers = [issuer];
|
|
57
58
|
const oid4vciResponse = yield MetadataClientV1_0_13.retrieveOpenID4VCIServerMetadata(issuer, { errorOnNotFound: false }); // We will handle errors later, given we will also try other metadata locations
|
|
@@ -101,8 +102,15 @@ class MetadataClientV1_0_13 {
|
|
|
101
102
|
throw Error(`Credential issuer has a different authorization_endpoint (${authorization_endpoint}) from the Authorization Server (${authMetadata.authorization_endpoint})`);
|
|
102
103
|
}
|
|
103
104
|
authorization_endpoint = authMetadata.authorization_endpoint;
|
|
105
|
+
if (!authMetadata.authorization_challenge_endpoint) {
|
|
106
|
+
console.warn(`Authorization Server ${authorization_challenge_endpoint} did not provide a authorization_challenge_endpoint`);
|
|
107
|
+
}
|
|
108
|
+
else if (authorization_challenge_endpoint && authMetadata.authorization_challenge_endpoint !== authorization_challenge_endpoint) {
|
|
109
|
+
throw Error(`Credential issuer has a different authorization_challenge_endpoint (${authorization_challenge_endpoint}) from the Authorization Server (${authMetadata.authorization_challenge_endpoint})`);
|
|
110
|
+
}
|
|
111
|
+
authorization_challenge_endpoint = authMetadata.authorization_challenge_endpoint;
|
|
104
112
|
if (!authMetadata.token_endpoint) {
|
|
105
|
-
throw Error(`Authorization
|
|
113
|
+
throw Error(`Authorization Server ${authorization_servers} did not provide a token_endpoint`);
|
|
106
114
|
}
|
|
107
115
|
else if (token_endpoint && authMetadata.token_endpoint !== token_endpoint) {
|
|
108
116
|
throw Error(`Credential issuer has a different token_endpoint (${token_endpoint}) from the Authorization Server (${authMetadata.token_endpoint})`);
|
|
@@ -158,6 +166,7 @@ class MetadataClientV1_0_13 {
|
|
|
158
166
|
deferred_credential_endpoint,
|
|
159
167
|
authorization_server: authorization_servers[0],
|
|
160
168
|
authorization_endpoint,
|
|
169
|
+
authorization_challenge_endpoint,
|
|
161
170
|
authorizationServerType,
|
|
162
171
|
credentialIssuerMetadata: credentialIssuerMetadata,
|
|
163
172
|
authorizationServerMetadata: authMetadata,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataClientV1_0_13.js","sourceRoot":"","sources":["../lib/MetadataClientV1_0_13.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MetadataClientV1_0_13.js","sourceRoot":"","sources":["../lib/MetadataClientV1_0_13.ts"],"names":[],"mappings":"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"}
|
package/lib/MetadataClient.ts
CHANGED
|
@@ -70,6 +70,7 @@ export class MetadataClient {
|
|
|
70
70
|
let credential_endpoint: string | undefined;
|
|
71
71
|
let deferred_credential_endpoint: string | undefined;
|
|
72
72
|
let authorization_endpoint: string | undefined;
|
|
73
|
+
let authorization_challenge_endpoint: string | undefined;
|
|
73
74
|
let authorizationServerType: AuthorizationServerType = 'OID4VCI';
|
|
74
75
|
let authorization_servers: string[] | undefined = [issuer];
|
|
75
76
|
let authorization_server: string | undefined = undefined;
|
|
@@ -130,8 +131,16 @@ export class MetadataClient {
|
|
|
130
131
|
);
|
|
131
132
|
}
|
|
132
133
|
authorization_endpoint = authMetadata.authorization_endpoint;
|
|
134
|
+
if (!authMetadata.authorization_challenge_endpoint) {
|
|
135
|
+
console.warn(`Authorization Server ${authorization_challenge_endpoint} did not provide a authorization_challenge_endpoint`);
|
|
136
|
+
} else if (authorization_challenge_endpoint && authMetadata.authorization_challenge_endpoint !== authorization_challenge_endpoint) {
|
|
137
|
+
throw Error(
|
|
138
|
+
`Credential issuer has a different authorization_challenge_endpoint (${authorization_challenge_endpoint}) from the Authorization Server (${authMetadata.authorization_challenge_endpoint})`,
|
|
139
|
+
);
|
|
140
|
+
}
|
|
141
|
+
authorization_challenge_endpoint = authMetadata.authorization_challenge_endpoint;
|
|
133
142
|
if (!authMetadata.token_endpoint) {
|
|
134
|
-
throw Error(`Authorization
|
|
143
|
+
throw Error(`Authorization Server ${authorization_servers} did not provide a token_endpoint`);
|
|
135
144
|
} else if (token_endpoint && authMetadata.token_endpoint !== token_endpoint) {
|
|
136
145
|
throw Error(
|
|
137
146
|
`Credential issuer has a different token_endpoint (${token_endpoint}) from the Authorization Server (${authMetadata.token_endpoint})`,
|
|
@@ -193,6 +202,7 @@ export class MetadataClient {
|
|
|
193
202
|
deferred_credential_endpoint,
|
|
194
203
|
...(authorization_server ? { authorization_server } : { authorization_servers: authorization_servers }),
|
|
195
204
|
authorization_endpoint,
|
|
205
|
+
authorization_challenge_endpoint,
|
|
196
206
|
authorizationServerType,
|
|
197
207
|
credentialIssuerMetadata: authorization_server
|
|
198
208
|
? (credentialIssuerMetadata as IssuerMetadataV1_0_08 & Partial<AuthorizationServerMetadata>)
|
|
@@ -50,6 +50,7 @@ export class MetadataClientV1_0_11 {
|
|
|
50
50
|
let credential_endpoint: string | undefined;
|
|
51
51
|
let deferred_credential_endpoint: string | undefined;
|
|
52
52
|
let authorization_endpoint: string | undefined;
|
|
53
|
+
let authorization_challenge_endpoint: string | undefined;
|
|
53
54
|
let authorizationServerType: AuthorizationServerType = 'OID4VCI';
|
|
54
55
|
let authorization_server: string = issuer;
|
|
55
56
|
const oid4vciResponse = await MetadataClientV1_0_11.retrieveOpenID4VCIServerMetadata(issuer, { errorOnNotFound: false }); // We will handle errors later, given we will also try other metadata locations
|
|
@@ -105,8 +106,16 @@ export class MetadataClientV1_0_11 {
|
|
|
105
106
|
);
|
|
106
107
|
}
|
|
107
108
|
authorization_endpoint = authMetadata.authorization_endpoint;
|
|
109
|
+
if (!authMetadata.authorization_challenge_endpoint) {
|
|
110
|
+
console.warn(`Authorization Server ${authorization_challenge_endpoint} did not provide a authorization_challenge_endpoint`);
|
|
111
|
+
} else if (authorization_challenge_endpoint && authMetadata.authorization_challenge_endpoint !== authorization_challenge_endpoint) {
|
|
112
|
+
throw Error(
|
|
113
|
+
`Credential issuer has a different authorization_challenge_endpoint (${authorization_challenge_endpoint}) from the Authorization Server (${authMetadata.authorization_challenge_endpoint})`,
|
|
114
|
+
);
|
|
115
|
+
}
|
|
116
|
+
authorization_challenge_endpoint = authMetadata.authorization_challenge_endpoint;
|
|
108
117
|
if (!authMetadata.token_endpoint) {
|
|
109
|
-
throw Error(`Authorization
|
|
118
|
+
throw Error(`Authorization Server ${authorization_server} did not provide a token_endpoint`);
|
|
110
119
|
} else if (token_endpoint && authMetadata.token_endpoint !== token_endpoint) {
|
|
111
120
|
throw Error(
|
|
112
121
|
`Credential issuer has a different token_endpoint (${token_endpoint}) from the Authorization Server (${authMetadata.token_endpoint})`,
|
|
@@ -165,6 +174,7 @@ export class MetadataClientV1_0_11 {
|
|
|
165
174
|
deferred_credential_endpoint,
|
|
166
175
|
authorization_server,
|
|
167
176
|
authorization_endpoint,
|
|
177
|
+
authorization_challenge_endpoint,
|
|
168
178
|
authorizationServerType,
|
|
169
179
|
credentialIssuerMetadata: credentialIssuerMetadata as unknown as Partial<AuthorizationServerMetadata> & IssuerMetadataV1_0_08,
|
|
170
180
|
authorizationServerMetadata: authMetadata,
|
|
@@ -50,6 +50,7 @@ export class MetadataClientV1_0_13 {
|
|
|
50
50
|
let credential_endpoint: string | undefined;
|
|
51
51
|
let deferred_credential_endpoint: string | undefined;
|
|
52
52
|
let authorization_endpoint: string | undefined;
|
|
53
|
+
let authorization_challenge_endpoint: string | undefined;
|
|
53
54
|
let authorizationServerType: AuthorizationServerType = 'OID4VCI';
|
|
54
55
|
let authorization_servers: string[] = [issuer];
|
|
55
56
|
const oid4vciResponse = await MetadataClientV1_0_13.retrieveOpenID4VCIServerMetadata(issuer, { errorOnNotFound: false }); // We will handle errors later, given we will also try other metadata locations
|
|
@@ -104,8 +105,16 @@ export class MetadataClientV1_0_13 {
|
|
|
104
105
|
);
|
|
105
106
|
}
|
|
106
107
|
authorization_endpoint = authMetadata.authorization_endpoint;
|
|
108
|
+
if (!authMetadata.authorization_challenge_endpoint) {
|
|
109
|
+
console.warn(`Authorization Server ${authorization_challenge_endpoint} did not provide a authorization_challenge_endpoint`);
|
|
110
|
+
} else if (authorization_challenge_endpoint && authMetadata.authorization_challenge_endpoint !== authorization_challenge_endpoint) {
|
|
111
|
+
throw Error(
|
|
112
|
+
`Credential issuer has a different authorization_challenge_endpoint (${authorization_challenge_endpoint}) from the Authorization Server (${authMetadata.authorization_challenge_endpoint})`,
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
authorization_challenge_endpoint = authMetadata.authorization_challenge_endpoint;
|
|
107
116
|
if (!authMetadata.token_endpoint) {
|
|
108
|
-
throw Error(`Authorization
|
|
117
|
+
throw Error(`Authorization Server ${authorization_servers} did not provide a token_endpoint`);
|
|
109
118
|
} else if (token_endpoint && authMetadata.token_endpoint !== token_endpoint) {
|
|
110
119
|
throw Error(
|
|
111
120
|
`Credential issuer has a different token_endpoint (${token_endpoint}) from the Authorization Server (${authMetadata.token_endpoint})`,
|
|
@@ -164,6 +173,7 @@ export class MetadataClientV1_0_13 {
|
|
|
164
173
|
deferred_credential_endpoint,
|
|
165
174
|
authorization_server: authorization_servers[0],
|
|
166
175
|
authorization_endpoint,
|
|
176
|
+
authorization_challenge_endpoint,
|
|
167
177
|
authorizationServerType,
|
|
168
178
|
credentialIssuerMetadata: credentialIssuerMetadata,
|
|
169
179
|
authorizationServerMetadata: authMetadata,
|
|
@@ -95,7 +95,7 @@ describe('MetadataClient with IdentiProof Issuer should', () => {
|
|
|
95
95
|
nock(IDENTIPROOF_AS_URL).get(WellKnownEndpoints.OPENID_CONFIGURATION).reply(404);
|
|
96
96
|
|
|
97
97
|
await expect(() => MetadataClient.retrieveAllMetadata(IDENTIPROOF_ISSUER_URL, { errorOnNotFound: true })).rejects.toThrowError(
|
|
98
|
-
'Authorization
|
|
98
|
+
'Authorization Server https://auth.research.identiproof.io did not provide a token_endpoint',
|
|
99
99
|
);
|
|
100
100
|
});
|
|
101
101
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/oid4vci-client",
|
|
3
|
-
"version": "0.16.1-feature.SPRIND.89.
|
|
3
|
+
"version": "0.16.1-feature.SPRIND.89.255+92430bc",
|
|
4
4
|
"description": "OpenID for Verifiable Credential Issuance (OpenID4VCI) client",
|
|
5
5
|
"source": "lib/index.ts",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
"build": "tsc"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.89.
|
|
19
|
-
"@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.
|
|
18
|
+
"@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.89.255+92430bc",
|
|
19
|
+
"@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.255+92430bc",
|
|
20
20
|
"@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
|
|
21
21
|
"cross-fetch": "^3.1.8",
|
|
22
22
|
"debug": "^4.3.5"
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"OIDC4VCI",
|
|
70
70
|
"OID4VCI"
|
|
71
71
|
],
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "92430bce71d1bf3f14d14bf3764ba21532350665"
|
|
73
73
|
}
|