@canton-network/wallet-gateway-remote 1.13.0 → 1.14.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 (129) hide show
  1. package/README.md +2 -2
  2. package/dist/auth/jwt-auth-service.d.ts.map +1 -1
  3. package/dist/auth/jwt-auth-service.js +16 -2
  4. package/dist/config/Config.d.ts +261 -2
  5. package/dist/config/Config.d.ts.map +1 -1
  6. package/dist/config/Config.js +26 -5
  7. package/dist/config/ConfigUtils.d.ts +16 -1
  8. package/dist/config/ConfigUtils.d.ts.map +1 -1
  9. package/dist/config/ConfigUtils.js +147 -59
  10. package/dist/dapp-api/controller.d.ts +13 -1
  11. package/dist/dapp-api/controller.d.ts.map +1 -1
  12. package/dist/dapp-api/controller.js +2 -1
  13. package/dist/dapp-api/rpc-gen/typings.d.ts +30 -0
  14. package/dist/dapp-api/rpc-gen/typings.d.ts.map +1 -1
  15. package/dist/dapp-api/server.d.ts +10 -5
  16. package/dist/dapp-api/server.d.ts.map +1 -1
  17. package/dist/dapp-api/server.js +10 -3
  18. package/dist/example-config.d.ts +58 -62
  19. package/dist/example-config.d.ts.map +1 -1
  20. package/dist/example-config.js +59 -61
  21. package/dist/index.js +7 -4
  22. package/dist/init.d.ts.map +1 -1
  23. package/dist/init.js +64 -19
  24. package/dist/ledger/wallet-sync-service.d.ts +11 -1
  25. package/dist/ledger/wallet-sync-service.d.ts.map +1 -1
  26. package/dist/ledger/wallet-sync-service.js +101 -48
  27. package/dist/middleware/rateLimit.d.ts.map +1 -1
  28. package/dist/middleware/rateLimit.js +3 -9
  29. package/dist/notices/server-notices.d.ts +24 -0
  30. package/dist/notices/server-notices.d.ts.map +1 -0
  31. package/dist/notices/server-notices.js +40 -0
  32. package/dist/notices/server-status-service.d.ts +11 -0
  33. package/dist/notices/server-status-service.d.ts.map +1 -0
  34. package/dist/notices/server-status-service.js +17 -0
  35. package/dist/signing/service-account-session.d.ts +16 -2
  36. package/dist/signing/service-account-session.d.ts.map +1 -1
  37. package/dist/signing/service-account-session.js +31 -0
  38. package/dist/signing-providers-registration.d.ts +2 -1
  39. package/dist/signing-providers-registration.d.ts.map +1 -1
  40. package/dist/signing-providers-registration.js +76 -16
  41. package/dist/user-api/controller.d.ts +20 -2
  42. package/dist/user-api/controller.d.ts.map +1 -1
  43. package/dist/user-api/controller.js +161 -302
  44. package/dist/user-api/rpc-gen/index.d.ts +12 -3
  45. package/dist/user-api/rpc-gen/index.d.ts.map +1 -1
  46. package/dist/user-api/rpc-gen/index.js +4 -1
  47. package/dist/user-api/rpc-gen/schemas.d.ts.map +1 -1
  48. package/dist/user-api/rpc-gen/schemas.js +46 -3
  49. package/dist/user-api/rpc-gen/typings.d.ts +113 -35
  50. package/dist/user-api/rpc-gen/typings.d.ts.map +1 -1
  51. package/dist/user-api/server.d.ts +7 -5
  52. package/dist/user-api/server.d.ts.map +1 -1
  53. package/dist/user-api/server.js +7 -2
  54. package/dist/web/frontend/404/index.html +3 -2
  55. package/dist/web/frontend/activities/index.html +4 -3
  56. package/dist/web/frontend/admin/index.html +16 -0
  57. package/dist/web/frontend/api-keys/add/index.html +3 -2
  58. package/dist/web/frontend/api-keys/index.html +3 -2
  59. package/dist/web/frontend/approve/index.html +4 -4
  60. package/dist/web/frontend/assets/404-N2p-H94F.js +5 -0
  61. package/dist/web/frontend/assets/activities-CIyMcvMq.js +71 -0
  62. package/dist/web/frontend/assets/addApiKey-DD_HxolC.js +92 -0
  63. package/dist/web/frontend/assets/addIdentityProvider-DNaST3bz.js +28 -0
  64. package/dist/web/frontend/assets/addNetwork-BwV-qK9L.js +38 -0
  65. package/dist/web/frontend/assets/addParty-DtBW1rpV.js +14 -0
  66. package/dist/web/frontend/assets/admin-CKAkdJym.js +53 -0
  67. package/dist/web/frontend/assets/apiKeys-CcnbBkNH.js +68 -0
  68. package/dist/web/frontend/assets/approve-33mo5eC8.js +27 -0
  69. package/dist/web/frontend/assets/callback-lKGXXz-1.js +7 -0
  70. package/dist/web/frontend/assets/common-DaUa4tUM.js +15 -0
  71. package/dist/web/frontend/assets/dist-BW5ACUmw.js +2 -0
  72. package/dist/web/frontend/assets/dist-CVv1nHd6.js +1 -0
  73. package/dist/web/frontend/assets/editParty-ZifjLzYx.js +15 -0
  74. package/dist/web/frontend/assets/frontend-Bs6UVmG1.js +4968 -0
  75. package/dist/web/frontend/assets/identityProviders-D5s7N-Ec.js +76 -0
  76. package/dist/web/frontend/assets/login-BAJsIB9G.js +11 -0
  77. package/dist/web/frontend/assets/networks-Do-zoG5E.js +78 -0
  78. package/dist/web/frontend/assets/parties-DFcN190b.js +51 -0
  79. package/dist/web/frontend/assets/reviewIdentityProvider-C2tsrpKc.js +43 -0
  80. package/dist/web/frontend/assets/reviewNetwork-BEGzls61.js +43 -0
  81. package/dist/web/frontend/assets/rolldown-runtime-pP25SEvz.js +1 -0
  82. package/dist/web/frontend/assets/selfIssuedLogin-a2KenO2P.js +112 -0
  83. package/dist/web/frontend/assets/signMessage-CQF0sCMe.js +23 -0
  84. package/dist/web/frontend/callback/index.html +3 -3
  85. package/dist/web/frontend/identity-providers/add/index.html +3 -2
  86. package/dist/web/frontend/identity-providers/index.html +3 -2
  87. package/dist/web/frontend/identity-providers/review/index.html +3 -2
  88. package/dist/web/frontend/index.html +2 -1
  89. package/dist/web/frontend/login/index.html +4 -12
  90. package/dist/web/frontend/networks/add/index.html +3 -2
  91. package/dist/web/frontend/networks/index.html +3 -2
  92. package/dist/web/frontend/networks/review/index.html +3 -2
  93. package/dist/web/frontend/parties/add/index.html +5 -5
  94. package/dist/web/frontend/parties/edit/index.html +5 -5
  95. package/dist/web/frontend/parties/index.html +4 -3
  96. package/dist/web/frontend/self-issued-login/index.html +5 -13
  97. package/dist/web/frontend/sign-message/index.html +3 -2
  98. package/dist/web/route-inputs.d.ts.map +1 -1
  99. package/dist/web/route-inputs.js +1 -0
  100. package/package.json +34 -30
  101. package/dist/ledger/self-issued-auth-service.d.ts +0 -50
  102. package/dist/ledger/self-issued-auth-service.d.ts.map +0 -1
  103. package/dist/ledger/self-issued-auth-service.js +0 -264
  104. package/dist/signing/signing-worker.d.ts +0 -86
  105. package/dist/signing/signing-worker.d.ts.map +0 -1
  106. package/dist/signing/signing-worker.js +0 -213
  107. package/dist/web/frontend/assets/404-D6hNG1H8.js +0 -5
  108. package/dist/web/frontend/assets/activities-CSaNJ4Bw.js +0 -61
  109. package/dist/web/frontend/assets/addApiKey-IKOYP6lC.js +0 -92
  110. package/dist/web/frontend/assets/addIdentityProvider-CnRS1C3U.js +0 -28
  111. package/dist/web/frontend/assets/addNetwork-Wq0K3t5Z.js +0 -38
  112. package/dist/web/frontend/assets/addParty-B0GaqKvG.js +0 -14
  113. package/dist/web/frontend/assets/apiKeys-BgJyxg5r.js +0 -68
  114. package/dist/web/frontend/assets/approve-kKlT_54l.js +0 -27
  115. package/dist/web/frontend/assets/callback-83Lr1QFW.js +0 -7
  116. package/dist/web/frontend/assets/common-BkYw_tO_.js +0 -31
  117. package/dist/web/frontend/assets/editParty-DU9eMclk.js +0 -15
  118. package/dist/web/frontend/assets/identityProviders-sWmbKlSu.js +0 -71
  119. package/dist/web/frontend/assets/index-AvzB2hln.js +0 -93
  120. package/dist/web/frontend/assets/index-BF3EIXoM.js +0 -2
  121. package/dist/web/frontend/assets/index-CGK8ht7_.js +0 -1
  122. package/dist/web/frontend/assets/index-DRQ0oWml.js +0 -4814
  123. package/dist/web/frontend/assets/index-NgSpx7q_.js +0 -3
  124. package/dist/web/frontend/assets/login-BqK1nbQm.js +0 -11
  125. package/dist/web/frontend/assets/networks-C62lWsP4.js +0 -73
  126. package/dist/web/frontend/assets/reviewIdentityProvider-pILqo6EV.js +0 -43
  127. package/dist/web/frontend/assets/reviewNetwork-DZOWqkuG.js +0 -43
  128. package/dist/web/frontend/assets/selfIssuedLogin-DarXIpvS.js +0 -81
  129. package/dist/web/frontend/assets/signMessage-k9b_lLxh.js +0 -23
@@ -17,7 +17,7 @@ export default {
17
17
  requestSizeLimit: '5mb',
18
18
  requestRateLimit: 10000,
19
19
  trustProxy: false,
20
- admin: 'sub',
20
+ admin: 'operator',
21
21
  signingWorker: {
22
22
  pollInterval: 5000,
23
23
  },
@@ -70,70 +70,68 @@ export default {
70
70
  database: 'store.sqlite',
71
71
  },
72
72
  },
73
- bootstrap: {
74
- idps: [
75
- {
76
- id: 'idp-example-self-signed',
77
- type: 'self_signed',
78
- issuer: 'unsafe-auth',
73
+ idps: [
74
+ {
75
+ id: 'idp-example-self-signed',
76
+ type: 'self_signed',
77
+ issuer: 'unsafe-auth',
78
+ },
79
+ {
80
+ id: 'idp-example-oauth',
81
+ type: 'oauth',
82
+ issuer: 'https://oauth.example.com/',
83
+ configUrl: 'https://oauth.example.com/.well-known/openid-configuration',
84
+ },
85
+ ],
86
+ networks: [
87
+ {
88
+ id: 'canton:example-self-signed',
89
+ name: 'Canton Local (Self Signed)',
90
+ description: 'A network that connects to a Canton participant using self-signed tokens',
91
+ identityProviderId: 'idp-example-self-signed',
92
+ auth: {
93
+ method: 'self_signed',
94
+ issuer: 'self-signed',
95
+ audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
96
+ scope: 'openid email daml_ledger_api offline_access',
97
+ clientId: 'example_client_id',
98
+ clientSecretEnv: 'EXAMPLE_CLIENT_SECRET',
79
99
  },
80
- {
81
- id: 'idp-example-oauth',
82
- type: 'oauth',
83
- issuer: 'https://oauth.example.com/',
84
- configUrl: 'https://oauth.example.com/.well-known/openid-configuration',
100
+ adminAuth: {
101
+ method: 'self_signed',
102
+ issuer: 'self-signed',
103
+ scope: 'daml_ledger_api',
104
+ audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
105
+ clientId: 'example_admin_client_id',
106
+ clientSecretEnv: 'EXAMPLE_ADMIN_CLIENT_SECRET',
85
107
  },
86
- ],
87
- networks: [
88
- {
89
- id: 'canton:example-self-signed',
90
- name: 'Canton Local (Self Signed)',
91
- description: 'A network that connects to a Canton participant using self-signed tokens',
92
- identityProviderId: 'idp-example-self-signed',
93
- auth: {
94
- method: 'self_signed',
95
- issuer: 'self-signed',
96
- audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
97
- scope: 'openid email daml_ledger_api offline_access',
98
- clientId: 'example_client_id',
99
- clientSecret: 'unsafe',
100
- },
101
- adminAuth: {
102
- method: 'self_signed',
103
- issuer: 'self-signed',
104
- scope: 'daml_ledger_api',
105
- audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
106
- clientId: 'example_admin_client_id',
107
- clientSecret: 'unsafe',
108
- },
109
- ledgerApi: {
110
- baseUrl: 'http://127.0.0.1:2975',
111
- },
108
+ ledgerApi: {
109
+ baseUrl: 'http://127.0.0.1:2975',
112
110
  },
113
- {
114
- id: 'canton:example-oauth',
115
- name: 'Canton Local (OAuth IDP)',
116
- description: 'A network that connects to a Canton participant using an OAuth IDP',
117
- identityProviderId: 'idp-example-oauth',
118
- auth: {
119
- method: 'authorization_code',
120
- clientId: 'example_client_id',
121
- scope: 'openid email daml_ledger_api offline_access',
122
- audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
123
- },
124
- adminAuth: {
125
- method: 'client_credentials',
126
- scope: 'daml_ledger_api',
127
- audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
128
- clientId: 'example_admin_client_id',
129
- clientSecretEnv: 'MY_CLIENT_SECRET_ENV_VAR',
130
- },
131
- ledgerApi: {
132
- baseUrl: 'http://127.0.0.1:2975',
133
- },
111
+ },
112
+ {
113
+ id: 'canton:example-oauth',
114
+ name: 'Canton Local (OAuth IDP)',
115
+ description: 'A network that connects to a Canton participant using an OAuth IDP',
116
+ identityProviderId: 'idp-example-oauth',
117
+ auth: {
118
+ method: 'authorization_code',
119
+ clientId: 'example_client_id',
120
+ scope: 'openid email daml_ledger_api offline_access',
121
+ audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
134
122
  },
135
- ],
136
- },
123
+ adminAuth: {
124
+ method: 'client_credentials',
125
+ scope: 'daml_ledger_api',
126
+ audience: 'https://daml.com/jwt/aud/participant/participant1::1220d44fc1c3ba0b5bdf7b956ee71bc94ebe2d23258dc268fdf0824fbaeff2c61424',
127
+ clientId: 'example_admin_client_id',
128
+ clientSecretEnv: 'MY_CLIENT_SECRET_ENV_VAR',
129
+ },
130
+ ledgerApi: {
131
+ baseUrl: 'http://127.0.0.1:2975',
132
+ },
133
+ },
134
+ ],
137
135
  hashingScheme: {
138
136
  version: 'HASHING_SCHEME_VERSION_V3',
139
137
  },
package/dist/index.js CHANGED
@@ -108,7 +108,7 @@ const program = new Command()
108
108
  console.log(JSON.stringify(exampleConfig, null, 2));
109
109
  process.exit(0);
110
110
  }
111
- const config = ConfigUtils.loadConfigFile(opts.config);
111
+ const config = ConfigUtils.loadConfigFile(opts.config).config;
112
112
  const configLogging = config.logging ?? {};
113
113
  const logFormat = opts.logFormat ?? configLogging.format ?? 'pretty';
114
114
  const logLevel = opts.logLevel ?? configLogging.level ?? 'info';
@@ -129,13 +129,16 @@ let signingDb = new Command('signing-db')
129
129
  .allowUnknownOption(true);
130
130
  const hasDb = process.argv.slice(2).includes('db');
131
131
  if (hasDb) {
132
- const config = ConfigUtils.loadConfigFile(options.config);
132
+ const config = ConfigUtils.loadConfigFile(options.config).config;
133
133
  setupConsoleSink();
134
- db = createCLI(config.store, config.bootstrap);
134
+ db = createCLI(config.store, config.bootstrap, {
135
+ idps: config.idps,
136
+ networks: config.networks,
137
+ });
135
138
  }
136
139
  const hasSigningDb = process.argv.slice(2).includes('signing-db');
137
140
  if (hasSigningDb) {
138
- const config = ConfigUtils.loadConfigFile(options.config);
141
+ const config = ConfigUtils.loadConfigFile(options.config).config;
139
142
  if (config.signingStore) {
140
143
  setupConsoleSink();
141
144
  signingDb = createSigningCLI(config.signingStore);
@@ -1 +1 @@
1
- {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAgBlC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AA8M5C,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAuKhE"}
1
+ {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAiBlC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAkO5C,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBA+KhE"}
package/dist/init.js CHANGED
@@ -3,24 +3,26 @@
3
3
  import { dapp } from './dapp-api/server.js';
4
4
  import { user } from './user-api/server.js';
5
5
  import { web } from './web/server.js';
6
- import { StoreSql, bootstrap, connection, migrator, } from '@canton-network/core-wallet-store-sql';
6
+ import { StoreSql, bootstrap, upsertIdpsAndNetworks, connection, migrator, } from '@canton-network/core-wallet-store-sql';
7
7
  import { StoreSql as SigningStoreSql, bootstrap as signingBootstrap, connection as signingConnection, migrator as signingMigrator, } from '@canton-network/core-signing-store-sql';
8
8
  import { ConfigUtils } from './config/ConfigUtils.js';
9
9
  import { jwtAuthService } from './auth/jwt-auth-service.js';
10
10
  import express from 'express';
11
11
  import { jwtAuth } from './middleware/jwtAuth.js';
12
12
  import { authenticatedRateLimiter, preAuthIpRateLimiter, rateLimiter, } from './middleware/rateLimit.js';
13
- import { deriveUrls } from './config/ConfigUtils.js';
13
+ import { configManagedIds, deriveUrls } from './config/ConfigUtils.js';
14
14
  import { existsSync } from 'fs';
15
15
  import { GATEWAY_VERSION } from './version.js';
16
16
  import { sessionHandler } from './middleware/sessionHandler.js';
17
17
  import { sql } from 'kysely';
18
- import { SigningWorker } from './signing/signing-worker.js';
18
+ import { createServiceAccountRunContextResolver } from './signing/service-account-session.js';
19
19
  import { apiKeyAuth } from './middleware/apiKeyAuth.js';
20
20
  import { securityHeaders } from './middleware/securityHeaders.js';
21
- import { NotificationService, } from '@canton-network/core-wallet-services';
21
+ import { NotificationService, SigningWorker, } from '@canton-network/core-wallet-services';
22
22
  import { errorHandler } from './middleware/errorHandler.js';
23
23
  import { registerSigningProviders } from './signing-providers-registration.js';
24
+ import { ServerNotices } from './notices/server-notices.js';
25
+ import { ServerStatusService } from './notices/server-status-service.js';
24
26
  let isReady = false;
25
27
  let signingWorker;
26
28
  async function initializeDatabase(config, logger) {
@@ -72,10 +74,12 @@ async function initializeDatabase(config, logger) {
72
74
  networksHasRows =
73
75
  Number(networksCount.rows[0]?.rowCount ?? 0) > 0;
74
76
  }
77
+ // Like the db bootstrap command, only bootstrap if both are
78
+ // empty. Bootstrap fails for existing rows, and the admin may
79
+ // have removed all networks at runtime.
75
80
  if (!idpsExists ||
76
81
  !networksExists ||
77
- !idpsHasRows ||
78
- !networksHasRows) {
82
+ (!idpsHasRows && !networksHasRows)) {
79
83
  logger.warn('Database exists but required tables are missing or empty. Attempting to bootstrap...');
80
84
  exists = false;
81
85
  }
@@ -102,6 +106,17 @@ async function initializeDatabase(config, logger) {
102
106
  logger.info('Bootstrapping database from config...');
103
107
  await bootstrap(db, config.bootstrap);
104
108
  }
109
+ // idps and networks managed by the config file are applied on every start
110
+ if (config.idps.length > 0 || config.networks.length > 0) {
111
+ logger.info({
112
+ idps: config.idps.map((idp) => idp.id),
113
+ networks: config.networks.map((network) => network.id),
114
+ }, 'Applying identity providers and networks from config...');
115
+ await upsertIdpsAndNetworks(db, {
116
+ idps: config.idps,
117
+ networks: config.networks,
118
+ });
119
+ }
105
120
  return new StoreSql(db);
106
121
  }
107
122
  async function initializeSigningDatabase(signingStoreConfig, logger) {
@@ -151,7 +166,9 @@ async function initializeSigningDatabase(signingStoreConfig, logger) {
151
166
  return new SigningStoreSql(db);
152
167
  }
153
168
  export async function initialize(opts, logger) {
154
- const config = ConfigUtils.loadConfigFile(opts.config);
169
+ const serverNotices = new ServerNotices(logger.child({ component: 'server-notices' }));
170
+ const { config, warnings } = ConfigUtils.loadConfigFile(opts.config);
171
+ warnings.forEach((warning) => serverNotices.report(warning));
155
172
  // Use CLI port override or config port
156
173
  const port = opts.port ? Number(opts.port) : config.server.port;
157
174
  const { serviceUrl, publicUrl, dappApiUrl, userApiUrl } = deriveUrls(config, port);
@@ -174,13 +191,14 @@ export async function initialize(opts, logger) {
174
191
  res.status(503).send('UNAVAILABLE');
175
192
  }
176
193
  });
177
- const notificationService = new NotificationService(logger);
194
+ const notificationService = new NotificationService();
195
+ const serverStatusService = new ServerStatusService(serverNotices);
178
196
  const store = await initializeDatabase(config, logger);
179
197
  const signingStore = config.signingStore
180
198
  ? await initializeSigningDatabase(config.signingStore, logger)
181
199
  : undefined;
182
200
  const authService = jwtAuthService(store, logger);
183
- const drivers = registerSigningProviders(config.signingProviders, signingStore, logger);
201
+ const drivers = registerSigningProviders(config.signingProviders, signingStore, logger, serverNotices);
184
202
  const allowedPaths = {
185
203
  [config.server.dappPath]: ['*'],
186
204
  [config.server.userPath]: [
@@ -190,14 +208,17 @@ export async function initialize(opts, logger) {
190
208
  'getUser',
191
209
  'selfSignedAccessToken',
192
210
  'startSelfIssuedLoginSession',
211
+ 'listSigningProviders',
193
212
  ],
194
213
  };
195
214
  const selfIssuedLoginPaths = {
196
215
  [config.server.userPath]: [
197
216
  'getSelfIssuedLoginMode',
217
+ 'listSelfIssuedSigningProviderKeys',
198
218
  'createSelfIssuedWallet',
199
219
  'allocateSelfIssuedWallet',
200
- 'completeSelfIssuedLogin',
220
+ 'signSelfIssuedAccessToken',
221
+ 'getSignSelfIssuedAccessTokenStatus',
201
222
  'removeSelfIssuedLoginSession',
202
223
  ],
203
224
  };
@@ -212,25 +233,49 @@ export async function initialize(opts, logger) {
212
233
  app.use(config.server.dappPath, ...apiMiddleware);
213
234
  logger.info({ ...config.server, port }, 'Server configuration');
214
235
  const kernelInfo = config.kernel;
215
- const signingWorkerLogger = logger.child({
216
- component: 'SigningWorker',
217
- });
218
236
  const hashingSchemeVersion = config.hashingScheme?.version ?? 'HASHING_SCHEME_VERSION_V3';
219
237
  signingWorker = new SigningWorker({
220
238
  intervalMs: config.server.signingWorker.pollInterval,
221
239
  signingDrivers: drivers,
222
240
  store,
223
- notificationService,
224
- logger: signingWorkerLogger,
241
+ resolveRunContext: createServiceAccountRunContextResolver({
242
+ store,
243
+ notificationService,
244
+ logger: logger.child({ component: 'SigningWorker' }),
245
+ }),
225
246
  hashingSchemeVersion,
226
247
  });
227
248
  signingWorker.start();
228
249
  // register dapp API handlers
229
- dapp(config.server.dappPath, app, logger, server, kernelInfo, dappApiUrl, publicUrl, config.server, notificationService, store, {
230
- signingDrivers: drivers,
231
- }, hashingSchemeVersion);
250
+ dapp({
251
+ route: config.server.dappPath,
252
+ app,
253
+ logger,
254
+ server,
255
+ kernelInfo,
256
+ dappUrl: dappApiUrl,
257
+ userUrl: publicUrl,
258
+ serverConfig: config.server,
259
+ notificationService,
260
+ store,
261
+ deps: { signingDrivers: drivers },
262
+ hashingSchemeVersion,
263
+ });
232
264
  // register user API handlers
233
- user(config.server.userPath, app, logger, kernelInfo, publicUrl, notificationService, drivers, store, hashingSchemeVersion, config.server.admin);
265
+ user({
266
+ route: config.server.userPath,
267
+ app,
268
+ logger,
269
+ kernelInfo,
270
+ userUrl: publicUrl,
271
+ notificationService,
272
+ drivers,
273
+ store,
274
+ hashingSchemeVersion,
275
+ adminUserId: config.server.admin,
276
+ serverStatus: serverStatusService,
277
+ configManaged: configManagedIds(config),
278
+ });
234
279
  const { userPath, dappPath } = config.server;
235
280
  const isApiPath = (path) => path === userPath ||
236
281
  path === dappPath ||
@@ -5,6 +5,13 @@ import { type SigningDriverInterface, SigningProvider } from '@canton-network/co
5
5
  import type { Logger } from 'pino';
6
6
  import type { PartyAllocationService } from './party-allocation-service.js';
7
7
  import type { SyncWalletsResult } from '../user-api/rpc-gen/typings.js';
8
+ type ProviderKey = {
9
+ id: string;
10
+ publicKey: string;
11
+ fingerprint: string;
12
+ };
13
+ /** Maps provider IDs to their corresponding provider keys */
14
+ type ProviderKeyCache = Map<string, Promise<ProviderKey[]>>;
8
15
  export declare class WalletSyncService {
9
16
  private store;
10
17
  private ledgerClient;
@@ -17,7 +24,8 @@ export declare class WalletSyncService {
17
24
  private sameRights;
18
25
  run(timeoutMs: number): Promise<void>;
19
26
  private getParticipantNamespace;
20
- protected resolveSigningProvider(partyNamespace: string, participantNamespace: string): Promise<{
27
+ private loadProviderKeys;
28
+ protected resolveSigningProvider(partyNamespace: string, participantNamespace: string, keyCache?: ProviderKeyCache): Promise<{
21
29
  signingProviderId: SigningProvider.PARTICIPANT;
22
30
  matched: boolean;
23
31
  } | {
@@ -29,6 +37,7 @@ export declare class WalletSyncService {
29
37
  private getUserAuthParty;
30
38
  isWalletSyncNeeded(): Promise<boolean>;
31
39
  private handleWalletsWithoutParty;
40
+ private handleUnmatchedWallets;
32
41
  private handlePartiesWithoutWallet;
33
42
  private handleRightsUpdates;
34
43
  private requirePartyAllocator;
@@ -38,4 +47,5 @@ export declare class WalletSyncService {
38
47
  private generateSyncReport;
39
48
  syncWallets(): Promise<SyncWalletsResult>;
40
49
  }
50
+ export {};
41
51
  //# sourceMappingURL=wallet-sync-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"wallet-sync-service.d.ts","sourceRoot":"","sources":["../../src/ledger/wallet-sync-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,KAAK,YAAY,EAGpB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EACH,KAAK,KAAK,EACV,KAAK,MAAM,EAGd,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACH,KAAK,sBAAsB,EAC3B,eAAe,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAQvE,qBAAa,iBAAiB;IAEtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,cAAc,CAAC;IAR3B,YACY,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,GAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAC7C,EACE,cAAc,CAAC,EAAE,sBAAsB,YAAA,EAC/C;IAEJ,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,UAAU;IAUZ,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ1C;YAEa,uBAAuB;IAgBrC,UAAgB,sBAAsB,CAClC,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM,GAC7B,OAAO,CACJ;QACI,iBAAiB,EAAE,eAAe,CAAC,WAAW,CAAA;QAC9C,OAAO,EAAE,OAAO,CAAA;KACnB,GACD;QACI,iBAAiB,EAAE,OAAO,CACtB,eAAe,EACf,eAAe,CAAC,WAAW,CAC9B,CAAA;QACD,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,OAAO,CAAA;KACnB,CACN,CAwGA;YAEa,iBAAiB;YA2DjB,gBAAgB;IAwBxB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAoE3C;YAIa,yBAAyB;YA2EzB,0BAA0B;YAsD1B,mBAAmB;IA0BjC,OAAO,CAAC,qBAAqB;YASf,WAAW;IAiBnB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsEhE;IAEK,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAepC;IAED,OAAO,CAAC,kBAAkB;IA+DpB,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAgG9C;CACJ"}
1
+ {"version":3,"file":"wallet-sync-service.d.ts","sourceRoot":"","sources":["../../src/ledger/wallet-sync-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,KAAK,YAAY,EAGpB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EACH,KAAK,KAAK,EACV,KAAK,MAAM,EAGd,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACH,KAAK,sBAAsB,EAC3B,eAAe,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGvE,KAAK,WAAW,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AACzE,6DAA6D;AAC7D,KAAK,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;AAO3D,qBAAa,iBAAiB;IAEtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,cAAc,CAAC;IAR3B,YACY,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,GAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAC7C,EACE,cAAc,CAAC,EAAE,sBAAsB,YAAA,EAC/C;IAEJ,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,UAAU;IAUZ,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ1C;YAEa,uBAAuB;YAgBvB,gBAAgB;IAiD9B,UAAgB,sBAAsB,CAClC,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM,EAC5B,QAAQ,GAAE,gBAA4B,GACvC,OAAO,CACJ;QACI,iBAAiB,EAAE,eAAe,CAAC,WAAW,CAAA;QAC9C,OAAO,EAAE,OAAO,CAAA;KACnB,GACD;QACI,iBAAiB,EAAE,OAAO,CACtB,eAAe,EACf,eAAe,CAAC,WAAW,CAC9B,CAAA;QACD,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,OAAO,CAAA;KACnB,CACN,CAsEA;YAEa,iBAAiB;YA2DjB,gBAAgB;IAwBxB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAoE3C;YAIa,yBAAyB;YA4EzB,sBAAsB;YAsCtB,0BAA0B;YAwD1B,mBAAmB;IA0BjC,OAAO,CAAC,qBAAqB;YASf,WAAW;IAiBnB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsEhE;IAEK,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAepC;IAED,OAAO,CAAC,kBAAkB;IAwEpB,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAoH9C;CACJ"}
@@ -3,7 +3,7 @@
3
3
  import { defaultRetryableOptions, isJsCantonError, } from '@canton-network/core-ledger-client';
4
4
  import { PartyLevelRight, UserLevelRight, } from '@canton-network/core-wallet-store';
5
5
  import { SigningProvider, } from '@canton-network/core-signing-lib';
6
- import { canUserUseSelfIssuedAuth } from './self-issued-auth-service.js';
6
+ import { canUserUseSelfIssuedAuth } from '@canton-network/core-wallet-services';
7
7
  import { WALLET_DISABLED_REASON } from '@canton-network/core-types';
8
8
  export class WalletSyncService {
9
9
  constructor(store, ledgerClient, authContext, logger, signingDrivers = {}, partyAllocator) {
@@ -38,9 +38,43 @@ export class WalletSyncService {
38
38
  throw new Error(`Invalid participantId format: expected "hint::namespace", got "${participantId}"`);
39
39
  return extractedNamespace;
40
40
  }
41
- // Protected for tests
42
- async resolveSigningProvider(partyNamespace, participantNamespace) {
41
+ // Fetches a provider's keys and their fingerprints. Errors are logged and yield no keys.
42
+ async loadProviderKeys(providerId, driver) {
43
43
  const partyAllocator = this.requirePartyAllocator();
44
+ try {
45
+ const result = await driver
46
+ .controller(this.authContext?.userId)
47
+ .getKeys();
48
+ // In case of error getKeys resolve Promise but with error object
49
+ if ('error' in result) {
50
+ this.logger.warn({
51
+ providerId,
52
+ error: result.error,
53
+ error_description: result.error_description,
54
+ }, 'Failed to get keys from signing provider');
55
+ return [];
56
+ }
57
+ return (result.keys ?? [])
58
+ .map((key) => {
59
+ const normalizedKey = partyAllocator.normalizePublicKeyToBase64(key.publicKey);
60
+ if (!normalizedKey)
61
+ return undefined;
62
+ return {
63
+ id: key.id,
64
+ publicKey: key.publicKey,
65
+ fingerprint: partyAllocator.createFingerprintFromKey(normalizedKey),
66
+ };
67
+ })
68
+ .filter((key) => key !== undefined);
69
+ }
70
+ catch (err) {
71
+ this.logger.error({ err, providerId }, 'Error getting keys from signing provider');
72
+ return [];
73
+ }
74
+ }
75
+ // Protected for tests
76
+ // Pass the same keyCache for every party in a sync, so each provider is asked for its keys once.
77
+ async resolveSigningProvider(partyNamespace, participantNamespace, keyCache = new Map()) {
44
78
  try {
45
79
  if (participantNamespace &&
46
80
  partyNamespace === participantNamespace) {
@@ -50,7 +84,6 @@ export class WalletSyncService {
50
84
  };
51
85
  }
52
86
  // Get keys from signing providers try to match
53
- const userId = this.authContext?.userId;
54
87
  for (const [providerId, driver] of Object.entries(this.signingDrivers)) {
55
88
  if (!driver)
56
89
  continue;
@@ -58,44 +91,23 @@ export class WalletSyncService {
58
91
  if (providerId === SigningProvider.PARTICIPANT) {
59
92
  continue;
60
93
  }
61
- try {
62
- const controller = driver.controller(userId);
63
- const result = await controller.getKeys();
64
- // In case of error getKeys resolve Promise but with error object
65
- if ('error' in result) {
66
- this.logger.warn({
67
- providerId,
68
- error: result.error,
69
- error_description: result.error_description,
70
- }, 'Failed to get keys from signing provider');
71
- continue;
72
- }
73
- // Try to match namespace with public keys
74
- if (result.keys) {
75
- for (const key of result.keys) {
76
- const normalizedKey = partyAllocator.normalizePublicKeyToBase64(key.publicKey);
77
- if (!normalizedKey)
78
- continue;
79
- const keyNamespace = partyAllocator.createFingerprintFromKey(normalizedKey);
80
- if (keyNamespace === partyNamespace) {
81
- this.logger.info({
82
- namespace: partyNamespace,
83
- providerId,
84
- keyId: key.id,
85
- publicKey: key.publicKey,
86
- }, 'Matched namespace with signing provider');
87
- return {
88
- signingProviderId: providerId,
89
- publicKey: key.publicKey,
90
- matched: true,
91
- };
92
- }
93
- }
94
- }
95
- }
96
- catch (err) {
97
- this.logger.error({ err, providerId }, 'Error getting keys from signing provider');
98
- // Continue to next signing provider
94
+ const cachedKeys = keyCache.get(providerId) ??
95
+ this.loadProviderKeys(providerId, driver);
96
+ keyCache.set(providerId, cachedKeys);
97
+ const keys = await cachedKeys;
98
+ const key = keys.find((key) => key.fingerprint === partyNamespace);
99
+ if (key) {
100
+ this.logger.info({
101
+ namespace: partyNamespace,
102
+ providerId,
103
+ keyId: key.id,
104
+ publicKey: key.publicKey,
105
+ }, 'Matched namespace with signing provider');
106
+ return {
107
+ signingProviderId: providerId,
108
+ publicKey: key.publicKey,
109
+ matched: true,
110
+ };
99
111
  }
100
112
  }
101
113
  // No match found - use participant as default provider
@@ -292,12 +304,38 @@ export class WalletSyncService {
292
304
  updatedToDisabled,
293
305
  };
294
306
  }
307
+ // Retries provider resolution for wallets disabled with NO_SIGNING_PROVIDER_MATCHED,
308
+ // enabling them in place once a signing provider has their key.
309
+ async handleUnmatchedWallets(unmatchedWallets, participantNamespace, keyCache) {
310
+ const reenabledWallets = [];
311
+ for (const wallet of unmatchedWallets) {
312
+ const resolved = await this.resolveSigningProvider(wallet.namespace, participantNamespace, keyCache);
313
+ if (!resolved.matched)
314
+ continue;
315
+ const update = {
316
+ signingProviderId: resolved.signingProviderId,
317
+ publicKey: 'publicKey' in resolved
318
+ ? resolved.publicKey
319
+ : wallet.namespace,
320
+ disabled: false,
321
+ reason: '',
322
+ };
323
+ this.logger.info({ wallet: { ...wallet, ...update } }, 'Wallet sync result, enabling unmatched wallet');
324
+ await this.store.updateWallet({
325
+ partyId: wallet.partyId,
326
+ networkId: wallet.networkId,
327
+ ...update,
328
+ });
329
+ reenabledWallets.push({ ...wallet, ...update });
330
+ }
331
+ return reenabledWallets;
332
+ }
295
333
  // Creates wallets for parties user has rights to
296
- async handlePartiesWithoutWallet(newParties, networkId, rightsByParty, participantNamespace) {
334
+ async handlePartiesWithoutWallet(newParties, networkId, rightsByParty, participantNamespace, keyCache) {
297
335
  this.requirePartyAllocator();
298
336
  return await Promise.all(newParties.map(async (partyId) => {
299
337
  const [hint, namespace] = partyId.split('::');
300
- const resolvedSigningProvider = await this.resolveSigningProvider(namespace, participantNamespace);
338
+ const resolvedSigningProvider = await this.resolveSigningProvider(namespace, participantNamespace, keyCache);
301
339
  const isMatched = resolvedSigningProvider.matched;
302
340
  const walletPublicKey = resolvedSigningProvider.signingProviderId ===
303
341
  SigningProvider.PARTICIPANT
@@ -427,7 +465,7 @@ export class WalletSyncService {
427
465
  throw err;
428
466
  }
429
467
  }
430
- generateSyncReport({ newWallets, updatedToInitialized, updatedToDisabled, rightsUpdatedWallets, existingWallets, walletsAfterAuthParty, }) {
468
+ generateSyncReport({ newWallets, updatedToInitialized, updatedToDisabled, updatedToEnabled, rightsUpdatedWallets, existingWallets, walletsAfterAuthParty, }) {
431
469
  const added = new Set();
432
470
  const updated = new Set();
433
471
  const disabled = new Set();
@@ -444,8 +482,13 @@ export class WalletSyncService {
444
482
  if (!disabled.has(wallet.partyId))
445
483
  updated.add(wallet.partyId);
446
484
  }
485
+ for (const wallet of updatedToEnabled) {
486
+ updated.add(wallet.partyId);
487
+ }
447
488
  for (const wallet of rightsUpdatedWallets) {
448
- if (added.has(wallet.partyId) || disabled.has(wallet.partyId)) {
489
+ if (added.has(wallet.partyId) ||
490
+ disabled.has(wallet.partyId) ||
491
+ updated.has(wallet.partyId)) {
449
492
  continue;
450
493
  }
451
494
  if (wallet.disabled)
@@ -498,7 +541,16 @@ export class WalletSyncService {
498
541
  updatedToInitialized: updatedToInitialized.map((w) => w.partyId),
499
542
  updatedToDisabled: updatedToDisabled.map((w) => w.partyId),
500
543
  }, 'Wallets without parties');
501
- const newParticipantWallets = await this.handlePartiesWithoutWallet(newParties, network.id, rightsByParty, participantNamespace);
544
+ // Shared across both resolution passes, so each provider is asked for its keys once per sync
545
+ const keyCache = new Map();
546
+ // Wallets no signing provider matched yet are retried every sync, so they
547
+ // are enabled once a provider (e.g. Blockdaemon) learns about their key
548
+ const unmatchedWallets = existingAllocatedWallets.filter((w) => w.disabled &&
549
+ w.reason ===
550
+ WALLET_DISABLED_REASON.NO_SIGNING_PROVIDER_MATCHED &&
551
+ rightsByParty.has(w.partyId));
552
+ const updatedToEnabled = await this.handleUnmatchedWallets(unmatchedWallets, participantNamespace, keyCache);
553
+ const newWallets = await this.handlePartiesWithoutWallet(newParties, network.id, rightsByParty, participantNamespace, keyCache);
502
554
  // Set primary wallet if none exists, or if primary is on an initialized wallet
503
555
  const networkWallets = await this.store.getWallets();
504
556
  const primaryWallet = networkWallets.find((w) => w.primary);
@@ -517,9 +569,10 @@ export class WalletSyncService {
517
569
  walletsAfterAuthParty = await this.store.getWallets();
518
570
  }
519
571
  const report = this.generateSyncReport({
520
- newWallets: newParticipantWallets,
572
+ newWallets,
521
573
  updatedToInitialized,
522
574
  updatedToDisabled,
575
+ updatedToEnabled,
523
576
  rightsUpdatedWallets,
524
577
  existingWallets,
525
578
  walletsAfterAuthParty,
@@ -1 +1 @@
1
- {"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/middleware/rateLimit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAWtC,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE5D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAO1D;AAED,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,wDAQnD;AAED,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,wDAU5D;AAED,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,MAAM,wDAUhE"}
1
+ {"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/middleware/rateLimit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE5D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAO1D;AAED,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,wDAQnD;AAED,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,wDAW5D;AAED,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,MAAM,wDAUhE"}
@@ -1,13 +1,6 @@
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
3
  import rateLimit, { ipKeyGenerator } from 'express-rate-limit';
4
- function hasBearerToken(req) {
5
- const authHeader = req.headers.authorization;
6
- if (typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
7
- return true;
8
- }
9
- return typeof req.query.token === 'string' && req.query.token.length > 0;
10
- }
11
4
  export function ipRateLimitKeyGenerator(req) {
12
5
  return `ip:${ipKeyGenerator(req.ip || req.socket.remoteAddress || 'unknown')}`;
13
6
  }
@@ -32,8 +25,9 @@ export function preAuthIpRateLimiter(requestRateLimit) {
32
25
  windowMs: 1 * 60 * 1000,
33
26
  max: requestRateLimit,
34
27
  keyGenerator: ipRateLimitKeyGenerator,
35
- // Only protect unauthenticated traffic before JWT verification.
36
- skip: hasBearerToken,
28
+ // Apply only if JWT middleware has not attached an authenticated context at end of request.
29
+ skipSuccessfulRequests: true,
30
+ requestWasSuccessful: (req) => req.authContext?.userId !== undefined,
37
31
  standardHeaders: true,
38
32
  legacyHeaders: false,
39
33
  });