@sphereon/oid4vci-client 0.12.1-next.27 → 0.12.1-next.28

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.
Files changed (5) hide show
  1. package/dist/functions/AccessTokenUtil.d.ts.map +1 -1
  2. package/dist/functions/AccessTokenUtil.js +6 -2
  3. package/dist/functions/AccessTokenUtil.js.map +1 -1
  4. package/lib/functions/AccessTokenUtil.ts +6 -2
  5. package/package.json +3 -3
package/dist/functions/AccessTokenUtil.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AccessTokenUtil.d.ts","sourceRoot":"","sources":["../../lib/functions/AccessTokenUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAO,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK9G,eAAO,MAAM,8BAA8B,YAChC,QAAQ,kBAAkB,CAAC,QAC9B,sBAAsB,GAAG;IAC7B,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,KACA,QAAQ,IAAI,CAqCd,CAAC"}
1
+ {"version":3,"file":"AccessTokenUtil.d.ts","sourceRoot":"","sources":["../../lib/functions/AccessTokenUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAO,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK9G,eAAO,MAAM,8BAA8B,YAChC,QAAQ,kBAAkB,CAAC,QAC9B,sBAAsB,GAAG;IAC7B,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,KACA,QAAQ,IAAI,CAyCd,CAAC"}
package/dist/functions/AccessTokenUtil.js CHANGED
@@ -17,7 +17,8 @@ const createJwtBearerClientAssertion = (request, opts) => __awaiter(void 0, void
17
17
  var _a, _b;
18
18
  const { asOpts, credentialIssuer } = opts;
19
19
  if (((_a = asOpts === null || asOpts === void 0 ? void 0 : asOpts.clientOpts) === null || _a === void 0 ? void 0 : _a.clientAssertionType) === 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer') {
20
- const { kid, clientId = request.client_id, signCallbacks, alg } = asOpts.clientOpts;
20
+ const { clientId = request.client_id, signCallbacks, alg } = asOpts.clientOpts;
21
+ let { kid } = asOpts.clientOpts;
21
22
  if (!clientId) {
22
23
  return Promise.reject(Error(`Not client_id supplied, but client-assertion jwt-bearer requested.`));
23
24
  }
@@ -30,10 +31,13 @@ const createJwtBearerClientAssertion = (request, opts) => __awaiter(void 0, void
30
31
  else if (!credentialIssuer) {
31
32
  return Promise.reject(Error(`No credential issuer supplied, but client-assertion jwt-bearer requested.`));
32
33
  }
34
+ if (clientId.startsWith('http') && kid.includes('#')) {
35
+ kid = kid.split('#')[1];
36
+ }
33
37
  const jwt = {
34
38
  header: {
35
39
  typ: 'JWT',
36
- kid: kid,
40
+ kid,
37
41
  alg: alg !== null && alg !== void 0 ? alg : 'ES256',
38
42
  },
39
43
  payload: {
package/dist/functions/AccessTokenUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AccessTokenUtil.js","sourceRoot":"","sources":["../../lib/functions/AccessTokenUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA8G;AAC9G,+BAA0B;AAE1B,0EAAuE;AAEhE,MAAM,8BAA8B,GAAG,CAC5C,OAAoC,EACpC,IAEC,EACc,EAAE;;IACjB,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAC1C,IAAI,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,mBAAmB,MAAK,wDAAwD,EAAE,CAAC;QACzG,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QACpF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC,CAAC;QACrG,CAAC;aAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC,CAAC;QAC9F,CAAC;aAAM,IAAI,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,CAAA,KAAK,UAAU,EAAE,CAAC;YAC7D,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC,CAAC;QACxG,CAAC;aAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC,CAAC;QAC5G,CAAC;QACD,MAAM,GAAG,GAAQ;YACf,MAAM,EAAE;gBACN,GAAG,EAAE,KAAK;gBACV,GAAG,EAAE,GAAG;gBACR,GAAG,EAAE,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,OAAO;aACpB;YACD,OAAO,EAAE;gBACP,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,gBAAgB;gBACrB,GAAG,EAAE,IAAA,SAAE,GAAE;gBACT,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;gBAC3B,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;aAC5B;SACF,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,mDAAwB,CAAC,OAAO,CAAC;YACjD,GAAG;YACH,SAAS,EAAE,aAAa;YACxB,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,kCAAiB,CAAC,UAAU;YACrD,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,qBAAqB,GAAG,wDAAwD,CAAC;QACzF,OAAO,CAAC,gBAAgB,GAAG,GAAG,CAAC,GAAG,CAAC;IACrC,CAAC;AACH,CAAC,CAAA,CAAC;AA1CW,QAAA,8BAA8B,kCA0CzC"}
1
+ {"version":3,"file":"AccessTokenUtil.js","sourceRoot":"","sources":["../../lib/functions/AccessTokenUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA8G;AAC9G,+BAA0B;AAE1B,0EAAuE;AAEhE,MAAM,8BAA8B,GAAG,CAC5C,OAAoC,EACpC,IAEC,EACc,EAAE;;IACjB,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAC1C,IAAI,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,mBAAmB,MAAK,wDAAwD,EAAE,CAAC;QACzG,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QAC/E,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC,CAAC;QACrG,CAAC;aAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC,CAAC;QAC9F,CAAC;aAAM,IAAI,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,CAAA,KAAK,UAAU,EAAE,CAAC;YAC7D,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC,CAAC;QACxG,CAAC;aAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC,CAAC;QAC5G,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrD,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,GAAG,GAAQ;YACf,MAAM,EAAE;gBACN,GAAG,EAAE,KAAK;gBACV,GAAG;gBACH,GAAG,EAAE,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,OAAO;aACpB;YACD,OAAO,EAAE;gBACP,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,gBAAgB;gBACrB,GAAG,EAAE,IAAA,SAAE,GAAE;gBACT,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;gBAC3B,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;aAC5B;SACF,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,mDAAwB,CAAC,OAAO,CAAC;YACjD,GAAG;YACH,SAAS,EAAE,aAAa;YACxB,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,kCAAiB,CAAC,UAAU;YACrD,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,qBAAqB,GAAG,wDAAwD,CAAC;QACzF,OAAO,CAAC,gBAAgB,GAAG,GAAG,CAAC,GAAG,CAAC;IACrC,CAAC;AACH,CAAC,CAAA,CAAC;AA9CW,QAAA,8BAA8B,kCA8CzC"}
package/lib/functions/AccessTokenUtil.ts CHANGED
@@ -11,7 +11,8 @@ export const createJwtBearerClientAssertion = async (
11
11
  ): Promise<void> => {
12
12
  const { asOpts, credentialIssuer } = opts;
13
13
  if (asOpts?.clientOpts?.clientAssertionType === 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer') {
14
- const { kid, clientId = request.client_id, signCallbacks, alg } = asOpts.clientOpts;
14
+ const { clientId = request.client_id, signCallbacks, alg } = asOpts.clientOpts;
15
+ let { kid } = asOpts.clientOpts;
15
16
  if (!clientId) {
16
17
  return Promise.reject(Error(`Not client_id supplied, but client-assertion jwt-bearer requested.`));
17
18
  } else if (!kid) {
@@ -21,10 +22,13 @@ export const createJwtBearerClientAssertion = async (
21
22
  } else if (!credentialIssuer) {
22
23
  return Promise.reject(Error(`No credential issuer supplied, but client-assertion jwt-bearer requested.`));
23
24
  }
25
+ if (clientId.startsWith('http') && kid.includes('#')) {
26
+ kid = kid.split('#')[1];
27
+ }
24
28
  const jwt: Jwt = {
25
29
  header: {
26
30
  typ: 'JWT',
27
- kid: kid,
31
+ kid,
28
32
  alg: alg ?? 'ES256',
29
33
  },
30
34
  payload: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sphereon/oid4vci-client",
3
- "version": "0.12.1-next.27+b857c5c",
3
+ "version": "0.12.1-next.28+3cbe37a",
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.12.1-next.27+b857c5c",
18
+ "@sphereon/oid4vci-common": "0.12.1-next.28+3cbe37a",
19
19
  "@sphereon/ssi-types": "0.26.1-next.6",
20
20
  "cross-fetch": "^3.1.8",
21
21
  "debug": "^4.3.4"
@@ -69,5 +69,5 @@
69
69
  "OIDC4VCI",
70
70
  "OID4VCI"
71
71
  ],
72
- "gitHead": "b857c5cd419af2b8a6060701a3df80fd85e5fe52"
72
+ "gitHead": "3cbe37ac654fbbfa95405f98022a3b730b43a6e1"
73
73
  }