@canton-network/wallet-gateway-remote 1.11.3-backport.1 → 1.12.0

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 (202) hide show
  1. package/dist/auth/jwt-auth-service.d.ts +6 -4
  2. package/dist/auth/jwt-auth-service.d.ts.map +1 -1
  3. package/dist/auth/jwt-auth-service.js +121 -26
  4. package/dist/auth/jwt-auth-service.test.js +457 -58
  5. package/dist/config/Config.d.ts +58 -7
  6. package/dist/config/Config.d.ts.map +1 -1
  7. package/dist/config/Config.test.js +9 -2
  8. package/dist/config/ConfigUtils.d.ts +1 -1
  9. package/dist/config/ConfigUtils.d.ts.map +1 -1
  10. package/dist/config/ConfigUtils.js +43 -8
  11. package/dist/dapp-api/controller.d.ts +5 -7
  12. package/dist/dapp-api/controller.d.ts.map +1 -1
  13. package/dist/dapp-api/controller.js +31 -21
  14. package/dist/dapp-api/controller.test.js +12 -16
  15. package/dist/dapp-api/rpc-gen/index.d.ts.map +1 -1
  16. package/dist/dapp-api/rpc-gen/schemas.d.ts +3 -0
  17. package/dist/dapp-api/rpc-gen/schemas.d.ts.map +1 -0
  18. package/dist/dapp-api/rpc-gen/schemas.js +201 -0
  19. package/dist/dapp-api/rpc-gen/typings.d.ts +8 -1
  20. package/dist/dapp-api/rpc-gen/typings.d.ts.map +1 -1
  21. package/dist/dapp-api/server.d.ts +8 -9
  22. package/dist/dapp-api/server.d.ts.map +1 -1
  23. package/dist/dapp-api/server.js +7 -43
  24. package/dist/dapp-api/server.test.js +41 -2
  25. package/dist/dapp-api/sse-sink.d.ts +18 -0
  26. package/dist/dapp-api/sse-sink.d.ts.map +1 -0
  27. package/dist/dapp-api/sse-sink.js +27 -0
  28. package/dist/dapp-api/sse-sink.test.d.ts +2 -0
  29. package/dist/dapp-api/sse-sink.test.d.ts.map +1 -0
  30. package/dist/dapp-api/sse-sink.test.js +30 -0
  31. package/dist/env.d.ts +0 -1
  32. package/dist/env.d.ts.map +1 -1
  33. package/dist/init.d.ts +2 -2
  34. package/dist/init.d.ts.map +1 -1
  35. package/dist/init.js +13 -4
  36. package/dist/ledger/party-allocation-service.d.ts +3 -3
  37. package/dist/ledger/party-allocation-service.d.ts.map +1 -1
  38. package/dist/ledger/self-issued-auth-service.d.ts +50 -0
  39. package/dist/ledger/self-issued-auth-service.d.ts.map +1 -0
  40. package/dist/ledger/self-issued-auth-service.js +263 -0
  41. package/dist/ledger/self-issued-auth-service.test.d.ts +2 -0
  42. package/dist/ledger/self-issued-auth-service.test.d.ts.map +1 -0
  43. package/dist/ledger/self-issued-auth-service.test.js +454 -0
  44. package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.d.ts +7 -7
  45. package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.d.ts.map +1 -1
  46. package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.d.ts +7 -7
  47. package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.d.ts.map +1 -1
  48. package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.js +1 -1
  49. package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.d.ts +7 -7
  50. package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.d.ts.map +1 -1
  51. package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.js +1 -1
  52. package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.d.ts +7 -7
  53. package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.d.ts.map +1 -1
  54. package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.js +1 -1
  55. package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.d.ts +7 -7
  56. package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.d.ts.map +1 -1
  57. package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.js +1 -1
  58. package/dist/ledger/wallet-allocation/signing-providers/participant-wallet-allocator.d.ts +6 -6
  59. package/dist/ledger/wallet-allocation/signing-providers/participant-wallet-allocator.d.ts.map +1 -1
  60. package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts +7 -7
  61. package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts.map +1 -1
  62. package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.js +1 -1
  63. package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts +6 -6
  64. package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts.map +1 -1
  65. package/dist/ledger/wallet-sync-service.d.ts +12 -9
  66. package/dist/ledger/wallet-sync-service.d.ts.map +1 -1
  67. package/dist/ledger/wallet-sync-service.js +49 -15
  68. package/dist/ledger/wallet-sync-service.test.js +171 -11
  69. package/dist/middleware/apiKeyAuth.d.ts +3 -3
  70. package/dist/middleware/apiKeyAuth.d.ts.map +1 -1
  71. package/dist/middleware/apiKeyAuth.js +2 -2
  72. package/dist/middleware/errorHandler.d.ts +1 -1
  73. package/dist/middleware/errorHandler.d.ts.map +1 -1
  74. package/dist/middleware/errorHandler.js +23 -2
  75. package/dist/middleware/jsonRpcHandler.d.ts +6 -4
  76. package/dist/middleware/jsonRpcHandler.d.ts.map +1 -1
  77. package/dist/middleware/jsonRpcHandler.js +44 -6
  78. package/dist/middleware/jsonRpcHandler.test.js +101 -1
  79. package/dist/middleware/jwtAuth.d.ts +2 -2
  80. package/dist/middleware/jwtAuth.d.ts.map +1 -1
  81. package/dist/middleware/sessionHandler.d.ts +6 -4
  82. package/dist/middleware/sessionHandler.d.ts.map +1 -1
  83. package/dist/middleware/sessionHandler.js +25 -1
  84. package/dist/middleware/sessionHandler.test.js +61 -1
  85. package/dist/signing/service-account-session.d.ts +3 -3
  86. package/dist/signing/service-account-session.d.ts.map +1 -1
  87. package/dist/signing/service-account-session.js +2 -2
  88. package/dist/signing/service-account-session.test.js +1 -2
  89. package/dist/signing/signing-worker.d.ts +18 -16
  90. package/dist/signing/signing-worker.d.ts.map +1 -1
  91. package/dist/signing/signing-worker.js +18 -12
  92. package/dist/signing/signing-worker.test.js +10 -7
  93. package/dist/user-api/controller.d.ts +11 -7
  94. package/dist/user-api/controller.d.ts.map +1 -1
  95. package/dist/user-api/controller.js +258 -87
  96. package/dist/user-api/controller.test.js +173 -17
  97. package/dist/user-api/rpc-gen/index.d.ts +18 -0
  98. package/dist/user-api/rpc-gen/index.d.ts.map +1 -1
  99. package/dist/user-api/rpc-gen/index.js +6 -0
  100. package/dist/user-api/rpc-gen/schemas.d.ts +3 -0
  101. package/dist/user-api/rpc-gen/schemas.d.ts.map +1 -0
  102. package/dist/user-api/rpc-gen/schemas.js +1035 -0
  103. package/dist/user-api/rpc-gen/typings.d.ts +202 -28
  104. package/dist/user-api/rpc-gen/typings.d.ts.map +1 -1
  105. package/dist/user-api/server.d.ts +7 -8
  106. package/dist/user-api/server.d.ts.map +1 -1
  107. package/dist/user-api/server.js +2 -0
  108. package/dist/user-api/server.test.js +3 -2
  109. package/dist/user-api/token-network-matching.d.ts +2 -2
  110. package/dist/user-api/token-network-matching.d.ts.map +1 -1
  111. package/dist/user-api/token-network-matching.js +21 -5
  112. package/dist/user-api/token-network-matching.test.d.ts +2 -0
  113. package/dist/user-api/token-network-matching.test.d.ts.map +1 -0
  114. package/dist/user-api/token-network-matching.test.js +66 -0
  115. package/dist/utils.d.ts +0 -29
  116. package/dist/utils.d.ts.map +1 -1
  117. package/dist/utils.js +0 -57
  118. package/dist/version.d.ts.map +1 -1
  119. package/dist/version.js +2 -5
  120. package/dist/web/frontend/404/index.html +2 -2
  121. package/dist/web/frontend/activities/index.html +3 -3
  122. package/dist/web/frontend/api-keys/add/index.html +15 -0
  123. package/dist/web/frontend/{settings → api-keys}/index.html +4 -4
  124. package/dist/web/frontend/approve/index.html +3 -3
  125. package/dist/web/frontend/assets/404-B1XXXMXN.js +5 -0
  126. package/dist/web/frontend/assets/{activities-CVPKYW17.js → activities-HZnPjlMp.js} +2 -2
  127. package/dist/web/frontend/assets/addApiKey-BvkCtUF3.js +92 -0
  128. package/dist/web/frontend/assets/addIdentityProvider-Dvjma837.js +28 -0
  129. package/dist/web/frontend/assets/{addNetwork-BneU5JY2.js → addNetwork-Cahac0uo.js} +2 -2
  130. package/dist/web/frontend/assets/addParty-Cdoed_Yx.js +13 -0
  131. package/dist/web/frontend/assets/apiKeys-BwV6ylWL.js +68 -0
  132. package/dist/web/frontend/assets/approve-B0nIfe2y.js +26 -0
  133. package/dist/web/frontend/assets/callback-BieW5Ux2.js +7 -0
  134. package/dist/web/frontend/assets/common-Bv9twGrA.js +31 -0
  135. package/dist/web/frontend/assets/editParty-OOjTHFay.js +14 -0
  136. package/dist/web/frontend/assets/{identityProviders-DFmAVYxV.js → identityProviders-BxJAq1Ne.js} +2 -2
  137. package/dist/web/frontend/assets/index-Bo6MnlYI.js +2 -0
  138. package/dist/web/frontend/assets/index-CG_aFABR.js +1 -0
  139. package/dist/web/frontend/assets/index-D1Brmwbg.js +93 -0
  140. package/dist/web/frontend/assets/index-pMOoiNFq.js +4887 -0
  141. package/dist/web/frontend/assets/login-BHxgJEz_.js +11 -0
  142. package/dist/web/frontend/assets/{networks-Bh4iCMzi.js → networks-CBprjUF5.js} +3 -3
  143. package/dist/web/frontend/assets/onboarding-ChmWs-TC.js +84 -0
  144. package/dist/web/frontend/assets/{reviewIdentityProvider-Bd7IWXao.js → reviewIdentityProvider-CCmKgN8N.js} +3 -3
  145. package/dist/web/frontend/assets/{reviewNetwork-CPEZ1fzY.js → reviewNetwork-CX8Bmuf3.js} +5 -5
  146. package/dist/web/frontend/assets/signMessage-BN_6S5FV.js +79 -0
  147. package/dist/web/frontend/callback/index.html +2 -2
  148. package/dist/web/frontend/identity-providers/add/index.html +2 -2
  149. package/dist/web/frontend/identity-providers/index.html +2 -2
  150. package/dist/web/frontend/identity-providers/review/index.html +2 -2
  151. package/dist/web/frontend/index.html +1 -1
  152. package/dist/web/frontend/login/index.html +2 -2
  153. package/dist/web/frontend/networks/add/index.html +2 -2
  154. package/dist/web/frontend/networks/index.html +2 -2
  155. package/dist/web/frontend/networks/review/index.html +2 -2
  156. package/dist/web/frontend/onboarding/index.html +23 -0
  157. package/dist/web/frontend/parties/add/index.html +5 -4
  158. package/dist/web/frontend/parties/edit/index.html +5 -4
  159. package/dist/web/frontend/parties/index.html +3 -2
  160. package/dist/web/frontend/sign-message/index.html +16 -0
  161. package/dist/web/route-inputs.d.ts +3 -0
  162. package/dist/web/route-inputs.d.ts.map +1 -0
  163. package/dist/web/route-inputs.js +30 -0
  164. package/dist/web/route-inputs.test.d.ts +2 -0
  165. package/dist/web/route-inputs.test.d.ts.map +1 -0
  166. package/dist/web/route-inputs.test.js +30 -0
  167. package/dist/web/server.d.ts +1 -1
  168. package/dist/web/server.d.ts.map +1 -1
  169. package/package.json +36 -30
  170. package/dist/auth/jwt-unsafe-auth-service.d.ts +0 -11
  171. package/dist/auth/jwt-unsafe-auth-service.d.ts.map +0 -1
  172. package/dist/auth/jwt-unsafe-auth-service.js +0 -60
  173. package/dist/auth/jwt-unsafe-auth-service.test.d.ts +0 -2
  174. package/dist/auth/jwt-unsafe-auth-service.test.d.ts.map +0 -1
  175. package/dist/auth/jwt-unsafe-auth-service.test.js +0 -121
  176. package/dist/ledger/transaction-service.d.ts +0 -27
  177. package/dist/ledger/transaction-service.d.ts.map +0 -1
  178. package/dist/ledger/transaction-service.js +0 -297
  179. package/dist/ledger/transaction-service.test.d.ts +0 -2
  180. package/dist/ledger/transaction-service.test.d.ts.map +0 -1
  181. package/dist/ledger/transaction-service.test.js +0 -551
  182. package/dist/notification/NotificationService.d.ts +0 -18
  183. package/dist/notification/NotificationService.d.ts.map +0 -1
  184. package/dist/notification/NotificationService.js +0 -26
  185. package/dist/notification/NotificationService.test.d.ts +0 -2
  186. package/dist/notification/NotificationService.test.d.ts.map +0 -1
  187. package/dist/notification/NotificationService.test.js +0 -110
  188. package/dist/signing/signing-drivers.d.ts +0 -7
  189. package/dist/signing/signing-drivers.d.ts.map +0 -1
  190. package/dist/signing/signing-drivers.js +0 -3
  191. package/dist/web/frontend/assets/404-CPixqKLO.js +0 -5
  192. package/dist/web/frontend/assets/addIdentityProvider-nAJ-qcC5.js +0 -28
  193. package/dist/web/frontend/assets/addParty-GstM-rQp.js +0 -13
  194. package/dist/web/frontend/assets/approve-CWUpB-cM.js +0 -21
  195. package/dist/web/frontend/assets/callback-DX4EJbNv.js +0 -7
  196. package/dist/web/frontend/assets/common-JTjsyB1o.js +0 -31
  197. package/dist/web/frontend/assets/editParty-B-21AFFC.js +0 -14
  198. package/dist/web/frontend/assets/index-BAXYVraq.js +0 -4943
  199. package/dist/web/frontend/assets/index-Cvcr2Fng.js +0 -2
  200. package/dist/web/frontend/assets/index-Dp1svjp8.js +0 -93
  201. package/dist/web/frontend/assets/login-DuwXiFvJ.js +0 -11
  202. package/dist/web/frontend/assets/settings-BUUAYz6_.js +0 -37
@@ -1,8 +1,10 @@
1
- import { AuthService } from '@canton-network/core-wallet-auth';
2
- import { Store } from '@canton-network/core-wallet-store';
3
- import { Logger } from 'pino';
1
+ import { type AuthService } from '@canton-network/core-wallet-auth';
2
+ import type { Store } from '@canton-network/core-wallet-store';
3
+ import type { Logger } from 'pino';
4
4
  /**
5
- * Creates an AuthService that verifies JWT tokens using a remote JWK set.
5
+ * Creates an AuthService that verifies JWT tokens, using a remote JWK set for
6
+ * oauth identity providers, the network's secret for self_signed ones, and the
7
+ * party's wallet public key for self-issued ones (iss === sub).
6
8
  * @param store - The Store instance to access network configurations.
7
9
  * @param logger - Logger instance for logging debug and warning messages.
8
10
  * @returns An AuthService implementation that verifies JWT tokens.
@@ -1 +1 @@
1
- {"version":3,"file":"jwt-auth-service.d.ts","sourceRoot":"","sources":["../../src/auth/jwt-auth-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAoB,MAAM,kCAAkC,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAEzD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAE7B;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,KAAG,WAiI5D,CAAA"}
1
+ {"version":3,"file":"jwt-auth-service.d.ts","sourceRoot":"","sources":["../../src/auth/jwt-auth-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,KAAK,WAAW,EAGnB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAU9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAqKlC;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,KAAG,WAiH5D,CAAA"}
@@ -1,21 +1,126 @@
1
1
  // Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
2
2
  // SPDX-License-Identifier: Apache-2.0
3
- import { resolveUserEmail } from '@canton-network/core-wallet-auth';
4
- import { createRemoteJWKSet, decodeJwt, jwtVerify } from 'jose';
3
+ import { resolveUserEmail, } from '@canton-network/core-wallet-auth';
4
+ import { createRemoteJWKSet, decodeJwt, decodeProtectedHeader, importJWK, jwtVerify, base64url, } from 'jose';
5
+ function getEmail(value) {
6
+ if (typeof value !== 'string' || value.length === 0) {
7
+ return undefined;
8
+ }
9
+ return value;
10
+ }
5
11
  /**
6
- * Creates an AuthService that verifies JWT tokens using a remote JWK set.
12
+ * Verifies a self-signed token against the secret of the network named by
13
+ * the `kid` header, and rejects it if that network belongs to another IDP.
14
+ */
15
+ async function verifySelfSignedToken(jwt, idp, store, logger) {
16
+ const { kid } = decodeProtectedHeader(jwt);
17
+ if (!kid) {
18
+ logger.warn('Self-signed JWT does not contain a kid header');
19
+ return undefined;
20
+ }
21
+ const network = await store.getNetworkForTokenVerification(kid);
22
+ if (!network || network.auth.method !== 'self_signed') {
23
+ logger.warn({ kid }, 'No self-signed network has this network id');
24
+ return undefined;
25
+ }
26
+ if (network.identityProviderId !== idp.id) {
27
+ logger.warn({ kid, networkId: network.id, idpId: idp.id }, 'JWT network id belongs to a different identity provider');
28
+ return undefined;
29
+ }
30
+ const auth = network.auth;
31
+ const { payload } = await jwtVerify(jwt, new TextEncoder().encode(auth.clientSecret), {
32
+ algorithms: ['HS256'],
33
+ issuer: idp.issuer,
34
+ audience: auth.audience,
35
+ });
36
+ if (!payload.sub) {
37
+ logger.warn('JWT does not contain a subject');
38
+ return undefined;
39
+ }
40
+ const email = getEmail(payload.email);
41
+ return {
42
+ userId: payload.sub,
43
+ accessToken: jwt,
44
+ ...(email ? { email } : {}),
45
+ };
46
+ }
47
+ function getSelfIssuedUserId(payload) {
48
+ const daml = payload['daml.com'];
49
+ if (daml === null || typeof daml !== 'object' || Array.isArray(daml)) {
50
+ return undefined;
51
+ }
52
+ const usr = daml.usr;
53
+ if (typeof usr !== 'string' || usr.length === 0) {
54
+ return undefined;
55
+ }
56
+ return usr;
57
+ }
58
+ function normalizeAudienceClaim(value) {
59
+ if (typeof value === 'string') {
60
+ return [value];
61
+ }
62
+ if (Array.isArray(value)) {
63
+ return value;
64
+ }
65
+ return [];
66
+ }
67
+ // wallet.publicKey is 32 raw Ed25519 bytes as standard base64. jwtVerify
68
+ // wants a JWK: OKP = octet key pair, crv names Ed25519, x is the same
69
+ // point in base64url (RFC 8037).
70
+ async function ed25519KeyFromWalletPublicKey(publicKey) {
71
+ const raw = Buffer.from(publicKey, 'base64');
72
+ if (raw.length !== 32) {
73
+ throw new Error(`Wallet public key must be 32 raw bytes, got ${raw.length}`);
74
+ }
75
+ return importJWK({
76
+ kty: 'OKP',
77
+ crv: 'Ed25519',
78
+ x: base64url.encode(raw),
79
+ }, 'EdDSA');
80
+ }
81
+ /**
82
+ * Verifies a self-issued token (iss === sub) against the party's wallet
83
+ * public key. The wallet is found via daml.com.usr, sub, and aud
84
+ * (exactly one self_issued network).
85
+ */
86
+ async function verifySelfIssuedToken(jwt, payload, store, logger) {
87
+ const partyId = payload.sub;
88
+ const userId = getSelfIssuedUserId(payload);
89
+ if (!partyId || !userId) {
90
+ logger.warn('Self-issued JWT is missing sub or daml.com.usr');
91
+ return undefined;
92
+ }
93
+ const wallet = await store.getWalletByJwt(userId, partyId, normalizeAudienceClaim(payload.aud));
94
+ if (!wallet) {
95
+ logger.warn({ userId, partyId }, 'No wallet found for self-issued token');
96
+ return undefined;
97
+ }
98
+ if (!wallet.isAuthParty) {
99
+ logger.warn({ userId, partyId }, 'Wallet is not an auth party for self-issued tokens');
100
+ return undefined;
101
+ }
102
+ const jwk = await ed25519KeyFromWalletPublicKey(wallet.publicKey);
103
+ await jwtVerify(jwt, jwk, {
104
+ algorithms: ['EdDSA'],
105
+ requiredClaims: ['exp'],
106
+ });
107
+ const email = getEmail(payload.email);
108
+ return {
109
+ userId: wallet.userId,
110
+ accessToken: jwt,
111
+ ...(email ? { email } : {}),
112
+ };
113
+ }
114
+ /**
115
+ * Creates an AuthService that verifies JWT tokens, using a remote JWK set for
116
+ * oauth identity providers, the network's secret for self_signed ones, and the
117
+ * party's wallet public key for self-issued ones (iss === sub).
7
118
  * @param store - The Store instance to access network configurations.
8
119
  * @param logger - Logger instance for logging debug and warning messages.
9
120
  * @returns An AuthService implementation that verifies JWT tokens.
10
121
  */
11
122
  export const jwtAuthService = (store, logger) => ({
12
123
  verifyToken: async (accessToken) => {
13
- const getEmail = (value) => {
14
- if (typeof value !== 'string' || value.length === 0) {
15
- return undefined;
16
- }
17
- return value;
18
- };
19
124
  if (!accessToken || !accessToken.startsWith('Bearer ')) {
20
125
  return undefined;
21
126
  }
@@ -28,8 +133,11 @@ export const jwtAuthService = (store, logger) => ({
28
133
  logger.warn('JWT does not contain an issuer');
29
134
  return undefined;
30
135
  }
136
+ if (iss === decoded.sub) {
137
+ return await verifySelfIssuedToken(jwt, decoded, store, logger);
138
+ }
31
139
  const idps = await store.listIdps();
32
- const idp = idps.find((i) => i.issuer === iss);
140
+ const idp = idps.find((i) => i.type !== 'self_issued' && i.issuer === iss);
33
141
  if (!idp) {
34
142
  logger.warn(`No identity provider found for issuer: ${iss}`);
35
143
  return undefined;
@@ -39,17 +147,7 @@ export const jwtAuthService = (store, logger) => ({
39
147
  return undefined;
40
148
  }
41
149
  if (idp.type == 'self_signed') {
42
- const sub = decoded.sub;
43
- if (!sub) {
44
- logger.warn('JWT does not contain a subject');
45
- return undefined;
46
- }
47
- const email = getEmail(decoded.email);
48
- return {
49
- userId: sub,
50
- accessToken: jwt,
51
- ...(email ? { email } : {}),
52
- };
150
+ return await verifySelfSignedToken(jwt, idp, store, logger);
53
151
  }
54
152
  logger.debug({ idp }, 'Using IDP');
55
153
  const response = await fetch(idp.configUrl);
@@ -70,14 +168,11 @@ export const jwtAuthService = (store, logger) => ({
70
168
  logger.warn(`No networks configured for IDP ${idp.id}, cannot validate audience`);
71
169
  return undefined;
72
170
  }
73
- const tokenAudience = payload.aud;
74
- if (!tokenAudience) {
171
+ const tokenAudiences = normalizeAudienceClaim(payload.aud);
172
+ if (tokenAudiences.length === 0) {
75
173
  logger.warn('JWT does not contain an audience claim');
76
174
  return undefined;
77
175
  }
78
- const tokenAudiences = Array.isArray(tokenAudience)
79
- ? tokenAudience
80
- : [tokenAudience];
81
176
  const audMatch = tokenAudiences.some((aud) => expectedAudiences.includes(aud));
82
177
  if (!audMatch) {
83
178
  logger.warn({