@canton-network/wallet-gateway-remote 1.9.0 → 1.11.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 (128) hide show
  1. package/dist/auth/jwt-auth-service.test.js +2 -1
  2. package/dist/auth/jwt-unsafe-auth-service.test.js +2 -1
  3. package/dist/config/Config.d.ts +54 -14
  4. package/dist/config/Config.d.ts.map +1 -1
  5. package/dist/config/Config.js +11 -0
  6. package/dist/config/ConfigUtils.d.ts.map +1 -1
  7. package/dist/config/ConfigUtils.js +23 -0
  8. package/dist/dapp-api/controller.d.ts +2 -1
  9. package/dist/dapp-api/controller.d.ts.map +1 -1
  10. package/dist/dapp-api/controller.js +5 -5
  11. package/dist/dapp-api/controller.test.js +5 -3
  12. package/dist/dapp-api/rpc-gen/index.d.ts +15 -15
  13. package/dist/dapp-api/rpc-gen/index.d.ts.map +1 -1
  14. package/dist/dapp-api/server.d.ts +2 -1
  15. package/dist/dapp-api/server.d.ts.map +1 -1
  16. package/dist/dapp-api/server.js +2 -2
  17. package/dist/dapp-api/server.test.js +3 -2
  18. package/dist/env.d.ts +5 -0
  19. package/dist/env.d.ts.map +1 -1
  20. package/dist/env.js +4 -0
  21. package/dist/example-config.d.ts +3 -0
  22. package/dist/example-config.d.ts.map +1 -1
  23. package/dist/example-config.js +3 -0
  24. package/dist/index.d.ts.map +1 -1
  25. package/dist/index.js +3 -0
  26. package/dist/init.d.ts.map +1 -1
  27. package/dist/init.js +19 -2
  28. package/dist/ledger/party-allocation-service.d.ts +1 -1
  29. package/dist/ledger/party-allocation-service.d.ts.map +1 -1
  30. package/dist/ledger/party-allocation-service.js +4 -0
  31. package/dist/ledger/transaction-service.d.ts +5 -8
  32. package/dist/ledger/transaction-service.d.ts.map +1 -1
  33. package/dist/ledger/transaction-service.js +55 -389
  34. package/dist/ledger/transaction-service.test.js +101 -19
  35. package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.d.ts +24 -0
  36. package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.d.ts.map +1 -0
  37. package/dist/ledger/wallet-allocation/signing-providers/bitgo-wallet-allocator.js +138 -0
  38. package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.d.ts +3 -2
  39. package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.d.ts.map +1 -1
  40. package/dist/ledger/wallet-allocation/signing-providers/blockdaemon-wallet-allocator.js +11 -9
  41. package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.d.ts +3 -2
  42. package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.d.ts.map +1 -1
  43. package/dist/ledger/wallet-allocation/signing-providers/dfns-wallet-allocator.js +12 -10
  44. package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.d.ts +5 -7
  45. package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.d.ts.map +1 -1
  46. package/dist/ledger/wallet-allocation/signing-providers/fireblocks-wallet-allocator.js +19 -23
  47. package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.d.ts +5 -4
  48. package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.d.ts.map +1 -1
  49. package/dist/ledger/wallet-allocation/signing-providers/kernel-wallet-allocator.js +13 -11
  50. package/dist/ledger/wallet-allocation/signing-providers/participant-wallet-allocator.d.ts +2 -1
  51. package/dist/ledger/wallet-allocation/signing-providers/participant-wallet-allocator.d.ts.map +1 -1
  52. package/dist/ledger/wallet-allocation/signing-providers/participant-wallet-allocator.js +4 -0
  53. package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts +3 -2
  54. package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts.map +1 -1
  55. package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.js +12 -10
  56. package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts +9 -10
  57. package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts.map +1 -1
  58. package/dist/ledger/wallet-allocation/wallet-allocation-service.js +49 -13
  59. package/dist/ledger/wallet-allocation/wallet-allocation-service.test.js +104 -20
  60. package/dist/ledger/wallet-sync-service.d.ts.map +1 -1
  61. package/dist/ledger/wallet-sync-service.js +3 -5
  62. package/dist/ledger/wallet-sync-service.test.js +3 -1
  63. package/dist/signing/signing-worker.d.ts +2 -0
  64. package/dist/signing/signing-worker.d.ts.map +1 -1
  65. package/dist/signing/signing-worker.js +1 -1
  66. package/dist/signing/signing-worker.test.js +1 -0
  67. package/dist/user-api/controller.d.ts +5 -2
  68. package/dist/user-api/controller.d.ts.map +1 -1
  69. package/dist/user-api/controller.js +64 -14
  70. package/dist/user-api/controller.test.js +60 -72
  71. package/dist/user-api/rpc-gen/index.d.ts +40 -34
  72. package/dist/user-api/rpc-gen/index.d.ts.map +1 -1
  73. package/dist/user-api/rpc-gen/index.js +3 -1
  74. package/dist/user-api/rpc-gen/typings.d.ts +48 -36
  75. package/dist/user-api/rpc-gen/typings.d.ts.map +1 -1
  76. package/dist/user-api/server.d.ts +2 -1
  77. package/dist/user-api/server.d.ts.map +1 -1
  78. package/dist/user-api/server.js +2 -2
  79. package/dist/user-api/server.test.js +29 -4
  80. package/dist/user-api/token-network-matching.d.ts.map +1 -1
  81. package/dist/user-api/token-network-matching.js +0 -28
  82. package/dist/utils.d.ts +2 -1
  83. package/dist/utils.d.ts.map +1 -1
  84. package/dist/utils.js +2 -2
  85. package/dist/web/frontend/404/index.html +2 -2
  86. package/dist/web/frontend/activities/index.html +3 -3
  87. package/dist/web/frontend/approve/index.html +3 -3
  88. package/dist/web/frontend/assets/404-DaA35RoG.js +5 -0
  89. package/dist/web/frontend/assets/{activities-WIV19RPr.js → activities-B5-XCCZC.js} +2 -2
  90. package/dist/web/frontend/assets/{addIdentityProvider-DA4ry8mX.js → addIdentityProvider-BYCAWtiZ.js} +2 -2
  91. package/dist/web/frontend/assets/addNetwork-DJM_nq3n.js +38 -0
  92. package/dist/web/frontend/assets/addParty-BQLGvzJS.js +13 -0
  93. package/dist/web/frontend/assets/approve-CyDHnjOG.js +21 -0
  94. package/dist/web/frontend/assets/callback-DCYIq514.js +7 -0
  95. package/dist/web/frontend/assets/common-Byz7o2Qs.js +31 -0
  96. package/dist/web/frontend/assets/editParty-Oe0m1yB6.js +14 -0
  97. package/dist/web/frontend/assets/{identityProviders-nRE_Y8vP.js → identityProviders-1ro-4zy9.js} +3 -3
  98. package/dist/web/frontend/assets/index-BhzcMGYw.js +4943 -0
  99. package/dist/web/frontend/assets/index-Cvcr2Fng.js +2 -0
  100. package/dist/web/frontend/assets/index-D-NXyb6u.js +93 -0
  101. package/dist/web/frontend/assets/login-VCs39tyk.js +11 -0
  102. package/dist/web/frontend/assets/{networks-pshe9KRL.js → networks-CRTkFNGb.js} +2 -2
  103. package/dist/web/frontend/assets/{reviewIdentityProvider-DtUWN0jT.js → reviewIdentityProvider-8F5_K-A5.js} +3 -3
  104. package/dist/web/frontend/assets/{reviewNetwork-3vKq0jr4.js → reviewNetwork-DL-oQDwd.js} +3 -3
  105. package/dist/web/frontend/assets/{settings-Bdp9lvU5.js → settings-DgRrnzuq.js} +2 -2
  106. package/dist/web/frontend/callback/index.html +2 -2
  107. package/dist/web/frontend/identity-providers/add/index.html +2 -2
  108. package/dist/web/frontend/identity-providers/index.html +2 -2
  109. package/dist/web/frontend/identity-providers/review/index.html +2 -2
  110. package/dist/web/frontend/index.html +1 -1
  111. package/dist/web/frontend/login/index.html +2 -2
  112. package/dist/web/frontend/networks/add/index.html +2 -2
  113. package/dist/web/frontend/networks/index.html +2 -2
  114. package/dist/web/frontend/networks/review/index.html +2 -2
  115. package/dist/web/frontend/parties/add/index.html +4 -3
  116. package/dist/web/frontend/parties/edit/index.html +17 -0
  117. package/dist/web/frontend/parties/index.html +2 -2
  118. package/dist/web/frontend/settings/index.html +2 -2
  119. package/package.json +29 -27
  120. package/dist/web/frontend/assets/404-G9ooRT6W.js +0 -5
  121. package/dist/web/frontend/assets/addNetwork-URqIQBpY.js +0 -38
  122. package/dist/web/frontend/assets/addParty-CYVpWBOW.js +0 -45
  123. package/dist/web/frontend/assets/approve-uxh5J3JI.js +0 -21
  124. package/dist/web/frontend/assets/callback-BSwKp4qp.js +0 -3
  125. package/dist/web/frontend/assets/index-Bbo4F8DN.js +0 -4810
  126. package/dist/web/frontend/assets/index-BjhQnXf1.js +0 -2
  127. package/dist/web/frontend/assets/index-kNaUhLVu.js +0 -91
  128. package/dist/web/frontend/assets/login-Dojx8YbO.js +0 -11
@@ -15,6 +15,7 @@ const createWallet = (partyId, overrides = {}) => ({
15
15
  publicKey: 'test-public-key',
16
16
  namespace: 'namespace',
17
17
  networkId: 'network1',
18
+ userId: 'user-1',
18
19
  disabled: false,
19
20
  rights: [],
20
21
  ...overrides,
@@ -382,11 +383,11 @@ describe('WalletAllocationService', () => {
382
383
  });
383
384
  await expect(serviceWithFireblocks.createWallet(authContext, 'alice', false, SigningProvider.FIREBLOCKS, FIREBLOCKS_VAULT_NAME)).rejects.toThrow('Error from signing driver: Keys unavailable');
384
385
  });
385
- it('throws when vaultName is missing for Fireblocks', async () => {
386
+ it('throws when keyName is missing for Fireblocks', async () => {
386
387
  const serviceWithFireblocks = createService({
387
388
  [SigningProvider.FIREBLOCKS]: createFireblocksDriver({}),
388
389
  });
389
- await expect(serviceWithFireblocks.createWallet(authContext, 'alice', false, SigningProvider.FIREBLOCKS)).rejects.toThrow('vaultName is required for creating a wallet with Fireblocks');
390
+ await expect(serviceWithFireblocks.createWallet(authContext, 'alice', false, SigningProvider.FIREBLOCKS)).rejects.toThrow('keyName is required for creating a wallet with Fireblocks');
390
391
  });
391
392
  it('throws when the selected Fireblocks vault is missing', async () => {
392
393
  const serviceWithFireblocks = createService({
@@ -396,33 +397,34 @@ describe('WalletAllocationService', () => {
396
397
  });
397
398
  await expect(serviceWithFireblocks.createWallet(authContext, 'alice', false, SigningProvider.FIREBLOCKS, 'missing-vault')).rejects.toThrow('Fireblocks key not found');
398
399
  });
399
- it('getVaults returns vault names for Fireblocks', async () => {
400
+ it('getKeys returns key names for Fireblocks', async () => {
401
+ const keys = [
402
+ {
403
+ id: 'key-1',
404
+ name: 'Vault A',
405
+ publicKey: 'fb-pk-a',
406
+ },
407
+ {
408
+ id: 'key-2',
409
+ name: 'Vault B',
410
+ publicKey: 'fb-pk-b',
411
+ },
412
+ ];
400
413
  const serviceWithFireblocks = createService({
401
414
  [SigningProvider.FIREBLOCKS]: createFireblocksDriver({
402
415
  getKeysResult: {
403
- keys: [
404
- {
405
- id: 'key-1',
406
- name: 'Vault A',
407
- publicKey: 'fb-pk-a',
408
- },
409
- {
410
- id: 'key-2',
411
- name: 'Vault B',
412
- publicKey: 'fb-pk-b',
413
- },
414
- ],
416
+ keys,
415
417
  },
416
418
  }),
417
419
  });
418
- const result = await serviceWithFireblocks.getVaults(authContext, SigningProvider.FIREBLOCKS);
419
- expect(result).toEqual({ vaults: ['Vault A', 'Vault B'] });
420
+ const result = await serviceWithFireblocks.getKeys(authContext, SigningProvider.FIREBLOCKS);
421
+ expect(result).toEqual({ keys });
420
422
  });
421
- it('throws when listing vaults for an unsupported signing provider', async () => {
423
+ it('throws error when listing vaults for an unsupported signing provider', async () => {
422
424
  const serviceWithFireblocks = createService({
423
425
  [SigningProvider.FIREBLOCKS]: createFireblocksDriver({}),
424
426
  });
425
- await expect(serviceWithFireblocks.getVaults(authContext, SigningProvider.PARTICIPANT)).rejects.toThrow('Signing provider participant does not support listing vaults');
427
+ await expect(serviceWithFireblocks.getKeys(authContext, SigningProvider.PARTICIPANT)).rejects.toThrow();
426
428
  });
427
429
  it('throws when a signed createWallet has no signature in getTransaction', async () => {
428
430
  const serviceWithFireblocks = createService({
@@ -471,7 +473,7 @@ describe('WalletAllocationService', () => {
471
473
  getTransactionResult: {
472
474
  txId: 'tx-1',
473
475
  status: 'signed',
474
- signature: hexSignature,
476
+ signature: Buffer.from(hexSignature, 'hex').toString('base64'),
475
477
  },
476
478
  }),
477
479
  });
@@ -918,4 +920,86 @@ describe('WalletAllocationService', () => {
918
920
  });
919
921
  });
920
922
  });
923
+ describe('BitGo', () => {
924
+ it('throws when BitGo signing driver not available', async () => {
925
+ const serviceWithoutBitGo = createService({});
926
+ await expect(serviceWithoutBitGo.createWallet(authContext, 'alice', false, SigningProvider.BITGO)).rejects.toThrow('BitGo signing driver not available');
927
+ });
928
+ it('createWallet returns initialized when signTransaction returns pending', async () => {
929
+ const serviceWithBitGo = createService({
930
+ [SigningProvider.BITGO]: createDfnsDriver({
931
+ signTransactionResult: { status: 'pending', txId: 'tx-1' },
932
+ getTransactionResult: { status: 'pending', txId: 'tx-1' },
933
+ }),
934
+ });
935
+ const result = await serviceWithBitGo.createWallet(authContext, 'alice', false, SigningProvider.BITGO);
936
+ expect(result.status).toBe('initialized');
937
+ expect(result.reason).toBe(WALLET_DISABLED_REASON.TOPOLOGY_TRANSACTION_PENDING);
938
+ expect(result.externalTxId).toBe('tx-1');
939
+ expect(result.partyId).toBe('alice::fingerprint');
940
+ expect(mockStore.addWallet).toHaveBeenCalled();
941
+ });
942
+ it('createWallet returns allocated when signTransaction returns signed', async () => {
943
+ const serviceWithBitGo = createService({
944
+ [SigningProvider.BITGO]: createDfnsDriver({
945
+ createKeyResult: { id: 'key-1', publicKey: 'bitgo-pk' },
946
+ signTransactionResult: { status: 'signed', txId: 'tx-1' },
947
+ getTransactionResult: {
948
+ txId: 'tx-1',
949
+ status: 'signed',
950
+ signature: 'sig-base64',
951
+ },
952
+ }),
953
+ });
954
+ mockPartyAllocator.allocatePartyWithExistingWallet.mockResolvedValue('alice::namespace');
955
+ const result = await serviceWithBitGo.createWallet(authContext, 'alice', false, SigningProvider.BITGO);
956
+ expect(result.status).toBe('allocated');
957
+ expect(result.partyId).toBe('alice::namespace');
958
+ expect(mockPartyAllocator.allocatePartyWithExistingWallet).toHaveBeenCalled();
959
+ expect(mockStore.addWallet).toHaveBeenCalled();
960
+ });
961
+ it('allocateParty updates wallet to allocated when transaction is signed', async () => {
962
+ const serviceWithBitGo = createService({
963
+ [SigningProvider.BITGO]: createDfnsDriver({
964
+ getTransactionResult: {
965
+ txId: 'tx-1',
966
+ status: 'signed',
967
+ signature: 'sig-base64',
968
+ },
969
+ }),
970
+ });
971
+ mockPartyAllocator.allocatePartyWithExistingWallet.mockResolvedValue('alice::namespace');
972
+ await serviceWithBitGo.allocateParty(authContext, createWallet('alice::fingerprint', {
973
+ signingProviderId: SigningProvider.BITGO,
974
+ namespace: 'fingerprint',
975
+ topologyTransactions: 'tx1',
976
+ externalTxId: 'tx-1',
977
+ }), SigningProvider.BITGO);
978
+ expect(mockPartyAllocator.allocatePartyWithExistingWallet).toHaveBeenCalledWith('fingerprint', ['tx1'], 'sig-base64', authContext.userId);
979
+ expect(mockStore.updateWallet).toHaveBeenCalledWith({
980
+ networkId: 'network1',
981
+ partyId: 'alice::namespace',
982
+ status: 'allocated',
983
+ reason: '',
984
+ });
985
+ });
986
+ it('allocateParty updates wallet to initialized when transaction is pending', async () => {
987
+ const serviceWithBitGo = createService({
988
+ [SigningProvider.BITGO]: createDfnsDriver({
989
+ getTransactionResult: { txId: 'tx-1', status: 'pending' },
990
+ }),
991
+ });
992
+ await serviceWithBitGo.allocateParty(authContext, createWallet('alice::fingerprint', {
993
+ signingProviderId: SigningProvider.BITGO,
994
+ topologyTransactions: 'tx1',
995
+ externalTxId: 'tx-1',
996
+ }), SigningProvider.BITGO);
997
+ expect(mockStore.updateWallet).toHaveBeenCalledWith({
998
+ partyId: 'alice::fingerprint',
999
+ networkId: 'network1',
1000
+ status: 'initialized',
1001
+ reason: WALLET_DISABLED_REASON.TOPOLOGY_TRANSACTION_PENDING,
1002
+ });
1003
+ });
1004
+ });
921
1005
  });
@@ -1 +1 @@
1
- {"version":3,"file":"wallet-sync-service.d.ts","sourceRoot":"","sources":["../../src/ledger/wallet-sync-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,YAAY,EAEf,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACH,KAAK,EAIR,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACH,sBAAsB,EACtB,eAAe,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGlE,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;gBAPd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAClD,YAAK,EACE,cAAc,EAAE,sBAAsB;IAGlD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,UAAU;IAUZ,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAU7B,uBAAuB;cAkBrB,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;YAwGa,iBAAiB;IA8DzB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;YA8D9B,yBAAyB;YA2EzB,0BAA0B;YAoD1B,mBAAmB;IAsB3B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAgHlD"}
1
+ {"version":3,"file":"wallet-sync-service.d.ts","sourceRoot":"","sources":["../../src/ledger/wallet-sync-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,YAAY,EAEf,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACH,KAAK,EAIR,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACH,sBAAsB,EACtB,eAAe,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGlE,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;gBAPd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAClD,YAAK,EACE,cAAc,EAAE,sBAAsB;IAGlD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,UAAU;IAUZ,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAU7B,uBAAuB;cAgBrB,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;YAyGa,iBAAiB;IA8DzB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;YA8D9B,yBAAyB;YA2EzB,0BAA0B;YAqD1B,mBAAmB;IAsB3B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAgHlD"}
@@ -33,12 +33,9 @@ export class WalletSyncService {
33
33
  // Extract the namespace part from participantId
34
34
  // Format is hint::namespace
35
35
  const [, extractedNamespace] = participantId.split('::');
36
- if (extractedNamespace) {
37
- return extractedNamespace;
38
- }
39
- else {
36
+ if (!extractedNamespace)
40
37
  throw new Error(`Invalid participantId format: expected "hint::namespace", got "${participantId}"`);
41
- }
38
+ return extractedNamespace;
42
39
  }
43
40
  // Protected for tests
44
41
  async resolveSigningProvider(partyNamespace, participantNamespace) {
@@ -291,6 +288,7 @@ export class WalletSyncService {
291
288
  networkId,
292
289
  signingProviderId: resolvedSigningProvider.signingProviderId,
293
290
  disabled: !isMatched,
291
+ userId: this.authContext.userId,
294
292
  rights: rightsByParty.get(partyId) ??
295
293
  WalletSyncService.EMPTY_RIGHTS,
296
294
  ...(!isMatched && {
@@ -12,6 +12,7 @@ import { StoreInternal } from '@canton-network/core-wallet-store-inmemory';
12
12
  import { WALLET_DISABLED_REASON } from '@canton-network/core-types';
13
13
  import { WalletSyncService } from './wallet-sync-service.js';
14
14
  import { PartyAllocationService } from './party-allocation-service.js';
15
+ import { getLogger } from '@logtape/logtape';
15
16
  const { mockLedgerGet } = vi.hoisted(() => ({
16
17
  mockLedgerGet: vi.fn(),
17
18
  }));
@@ -197,6 +198,7 @@ describe('WalletSyncService - multi-network features', () => {
197
198
  publicKey: 'publicKey',
198
199
  namespace: 'namespace',
199
200
  networkId,
201
+ userId: 'user-1',
200
202
  disabled,
201
203
  rights: [PartyLevelRight.CanActAs],
202
204
  });
@@ -213,7 +215,7 @@ describe('WalletSyncService - multi-network features', () => {
213
215
  store = new StoreInternal({
214
216
  idps: [],
215
217
  networks: [],
216
- }, mockLogger, authContext);
218
+ }, getLogger('mock'), authContext);
217
219
  // Add a default IdP that tests can use (use updateIdp to avoid errors if it already exists)
218
220
  try {
219
221
  await store.addIdp({
@@ -3,6 +3,7 @@ import { AuthAware } from '@canton-network/core-wallet-auth';
3
3
  import { Store } from '@canton-network/core-wallet-store';
4
4
  import { NotificationService } from '../notification/NotificationService.js';
5
5
  import type { SigningDrivers } from './signing-drivers.js';
6
+ import { HASHING_SCHEME_VERSION } from '../env.js';
6
7
  export type { AccessTokenProviderFactory } from './service-account-session.js';
7
8
  /** Configuration for {@link SigningWorker}. */
8
9
  export interface SigningWorkerOptions {
@@ -12,6 +13,7 @@ export interface SigningWorkerOptions {
12
13
  store: Store & AuthAware<Store>;
13
14
  notificationService: NotificationService;
14
15
  logger: Logger;
16
+ hashingSchemeVersion: HASHING_SCHEME_VERSION;
15
17
  }
16
18
  /**
17
19
  * Background poller that completes service-account transactions stuck in external
@@ -1 +1 @@
1
- {"version":3,"file":"signing-worker.d.ts","sourceRoot":"","sources":["../../src/signing/signing-worker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,KAAK,EAAuB,MAAM,mCAAmC,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAE5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,YAAY,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAE9E,+CAA+C;AAC/C,MAAM,WAAW,oBAAoB;IACjC,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,cAAc,CAAA;IAC9B,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;IAC/B,mBAAmB,EAAE,mBAAmB,CAAA;IACxC,MAAM,EAAE,MAAM,CAAA;CACjB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,qBAAa,aAAa;IAIV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,OAAO,CAAQ;gBAEM,OAAO,EAAE,oBAAoB;IAE1D,gEAAgE;IAChE,KAAK,IAAI,IAAI;IAcb,iCAAiC;IACjC,IAAI,IAAI,IAAI;IAOZ;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B;;;;OAIG;YACW,cAAc;CAoI/B"}
1
+ {"version":3,"file":"signing-worker.d.ts","sourceRoot":"","sources":["../../src/signing/signing-worker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,KAAK,EAAuB,MAAM,mCAAmC,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAE5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,YAAY,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAE9E,+CAA+C;AAC/C,MAAM,WAAW,oBAAoB;IACjC,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,cAAc,CAAA;IAC9B,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;IAC/B,mBAAmB,EAAE,mBAAmB,CAAA;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB,EAAE,sBAAsB,CAAA;CAC/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,qBAAa,aAAa;IAIV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,OAAO,CAAQ;gBAEM,OAAO,EAAE,oBAAoB;IAE1D,gEAAgE;IAChE,KAAK,IAAI,IAAI;IAcb,iCAAiC;IACjC,IAAI,IAAI,IAAI;IAOZ;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B;;;;OAIG;YACW,cAAc;CAqI/B"}
@@ -138,7 +138,7 @@ export class SigningWorker {
138
138
  const transactionLogger = this.options.logger.child({
139
139
  component: 'TransactionService',
140
140
  });
141
- const transactionService = new TransactionService(store, transactionLogger, this.options.signingDrivers, notifier);
141
+ const transactionService = new TransactionService(store, transactionLogger, this.options.signingDrivers, notifier, this.options.hashingSchemeVersion);
142
142
  try {
143
143
  const result = await transactionService.signAndExecute(runContext.authContext, runContext.network, wallet, refreshedTx);
144
144
  if ('status' in result && result.status === 'pending') {
@@ -115,6 +115,7 @@ function createWorker(storeOverrides = {}) {
115
115
  getNotifier: vi.fn(() => ({ emit: vi.fn() })),
116
116
  },
117
117
  logger,
118
+ hashingSchemeVersion: 'HASHING_SCHEME_VERSION_V3',
118
119
  }),
119
120
  store,
120
121
  scopedStore,
@@ -4,7 +4,8 @@ import { NotificationService } from '../notification/NotificationService.js';
4
4
  import { AuthContext } from '@canton-network/core-wallet-auth';
5
5
  import { KernelInfo } from '../config/Config.js';
6
6
  import type { SigningDrivers } from '../signing/signing-drivers.js';
7
- export declare const userController: (kernelInfo: KernelInfo, userUrl: string, store: Store, notificationService: NotificationService, authContext: AuthContext | undefined, drivers: SigningDrivers, _logger: Logger, adminUserId?: string) => {
7
+ import { HASHING_SCHEME_VERSION } from '../env.js';
8
+ export declare const userController: (kernelInfo: KernelInfo, userUrl: string, store: Store, notificationService: NotificationService, authContext: AuthContext | undefined, drivers: SigningDrivers, _logger: Logger, hashingSchemeVersion: HASHING_SCHEME_VERSION, adminUserId?: string) => {
8
9
  addNetwork: import("./rpc-gen/typings.js").AddNetwork;
9
10
  removeNetwork: import("./rpc-gen/typings.js").RemoveNetwork;
10
11
  listNetworks: import("./rpc-gen/typings.js").ListNetworks;
@@ -36,6 +37,8 @@ export declare const userController: (kernelInfo: KernelInfo, userUrl: string, s
36
37
  generateApiKey: import("./rpc-gen/typings.js").GenerateApiKey;
37
38
  listApiKeys: import("./rpc-gen/typings.js").ListApiKeys;
38
39
  removeApiKey: import("./rpc-gen/typings.js").RemoveApiKey;
39
- listSigningProviderVaults: import("./rpc-gen/typings.js").ListSigningProviderVaults;
40
+ listSigningProviderKeys: import("./rpc-gen/typings.js").ListSigningProviderKeys;
41
+ getWallet: import("./rpc-gen/typings.js").GetWallet;
42
+ changeSigningProvider: import("./rpc-gen/typings.js").ChangeSigningProvider;
40
43
  };
41
44
  //# sourceMappingURL=controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/user-api/controller.ts"],"names":[],"mappings":"AAgDA,OAAO,EAAE,KAAK,EAAW,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAEH,WAAW,EAKd,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAgBnE,eAAO,MAAM,cAAc,GACvB,YAAY,UAAU,EACtB,SAAS,MAAM,EACf,OAAO,KAAK,EACZ,qBAAqB,mBAAmB,EACxC,aAAa,WAAW,GAAG,SAAS,EACpC,SAAS,cAAc,EACvB,SAAS,MAAM,EACf,cAAc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAunCvB,CAAA"}
1
+ {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/user-api/controller.ts"],"names":[],"mappings":"AAmDA,OAAO,EAAE,KAAK,EAAW,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAEH,WAAW,EAKd,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAenE,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,cAAc,GACvB,YAAY,UAAU,EACtB,SAAS,MAAM,EACf,OAAO,KAAK,EACZ,qBAAqB,mBAAmB,EACxC,aAAa,WAAW,GAAG,SAAS,EACpC,SAAS,cAAc,EACvB,SAAS,MAAM,EACf,sBAAsB,sBAAsB,EAC5C,cAAc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+rCvB,CAAA"}
@@ -12,10 +12,10 @@ import { WalletSyncService } from '../ledger/wallet-sync-service.js';
12
12
  import { logDynamically, networkStatus } from '../utils.js';
13
13
  import { v4 } from 'uuid';
14
14
  import { TransactionService } from '../ledger/transaction-service.js';
15
- import { rpcErrors } from '@canton-network/core-rpc-errors';
15
+ import { providerErrors, rpcErrors } from '@canton-network/core-rpc-errors';
16
16
  import crypto from 'crypto';
17
17
  import { assertTokenClaimsMatchNetwork } from './token-network-matching.js';
18
- export const userController = (kernelInfo, userUrl, store, notificationService, authContext, drivers, _logger, adminUserId) => {
18
+ export const userController = (kernelInfo, userUrl, store, notificationService, authContext, drivers, _logger, hashingSchemeVersion, adminUserId) => {
19
19
  const logger = _logger.child({ component: 'user-controller' });
20
20
  const provider = {
21
21
  id: kernelInfo.id,
@@ -45,6 +45,27 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
45
45
  const { adminAuth: _adminAuth, serviceAccountAuth: _sa, ...rest } = dto;
46
46
  return rest;
47
47
  }
48
+ const getSigningProviderKeys = async (params) => {
49
+ const network = await store.getCurrentNetwork();
50
+ const idp = await store.getIdp(network.identityProviderId);
51
+ if (!network.adminAuth) {
52
+ throw new Error('No admin auth configured');
53
+ }
54
+ const adminAccessTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.adminAuth, logger);
55
+ const partyAllocator = new PartyAllocationService({
56
+ synchronizerId: network.synchronizerId,
57
+ accessTokenProvider: adminAccessTokenProvider,
58
+ httpLedgerUrl: network.ledgerApi.baseUrl,
59
+ logger,
60
+ });
61
+ const walletAllocationService = new WalletAllocationService(store, logger, partyAllocator, drivers);
62
+ if (!drivers[params.signingProviderId])
63
+ throw new Error(`Signing provider ${params.signingProviderId} not supported`);
64
+ const keys = await walletAllocationService.getKeys(assertConnected(authContext), params.signingProviderId);
65
+ if (!keys)
66
+ throw new Error(`No keys ofr ${params.signingProviderId} found`);
67
+ return keys;
68
+ };
48
69
  return buildController({
49
70
  getUser: async () => {
50
71
  const userId = assertConnected(authContext).userId;
@@ -114,6 +135,11 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
114
135
  if (auth.method !== 'self_signed') {
115
136
  throw new Error('Network does not use self_signed authentication');
116
137
  }
138
+ if (params.clientSecret !== auth.clientSecret) {
139
+ throw providerErrors.unauthorized({
140
+ message: 'Invalid client secret',
141
+ });
142
+ }
117
143
  const idp = (await store.listIdps()).find((idp) => idp.id === network.identityProviderId);
118
144
  if (!idp) {
119
145
  throw new Error(`Identity provider "${network.identityProviderId}" not found`);
@@ -177,7 +203,7 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
177
203
  if (!drivers[signingProviderId]) {
178
204
  throw new Error(`Signing provider ${signingProviderId} not supported`);
179
205
  }
180
- const wallet = await walletAllocationService.createWallet(connectedContext, partyHint, primary ?? false, signingProviderId, params.vaultName);
206
+ const wallet = await walletAllocationService.createWallet(connectedContext, partyHint, primary ?? false, signingProviderId, params.keyName);
181
207
  // Sync wallets (TODO: separate rights sync from wallet sync as we only need rights sync here)
182
208
  const ledgerClient = new LedgerClient({
183
209
  baseUrl: new URL(network.ledgerApi.baseUrl),
@@ -268,7 +294,7 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
268
294
  throw new Error('No active session found');
269
295
  }
270
296
  const notifier = notificationService.getNotifier(session.id);
271
- const transactionService = new TransactionService(store, logger, drivers, notifier);
297
+ const transactionService = new TransactionService(store, logger, drivers, notifier, hashingSchemeVersion);
272
298
  logDynamically(logger, 'signing transaction with params', {
273
299
  info: { transactionId: signParams.transactionId },
274
300
  debug: { signParams, wallet, connectedContext },
@@ -445,7 +471,7 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
445
471
  logger,
446
472
  accessTokenProvider,
447
473
  });
448
- const transactionService = new TransactionService(store, logger, drivers, notifier);
474
+ const transactionService = new TransactionService(store, logger, drivers, notifier, hashingSchemeVersion);
449
475
  logDynamically(logger, 'executing transaction with params', {
450
476
  info: { transactionId: executeParams.transactionId },
451
477
  debug: {
@@ -795,24 +821,48 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
795
821
  await store.removeApiKey(params.id);
796
822
  return null;
797
823
  },
798
- listSigningProviderVaults: async (params) => {
824
+ listSigningProviderKeys: async (params) => {
825
+ return await getSigningProviderKeys(params);
826
+ },
827
+ changeSigningProvider: async (params) => {
828
+ const { signingProviderId, partyId, publicKey } = params;
829
+ const signingProviderKeys = await getSigningProviderKeys(params);
830
+ if (!signingProviderKeys.keys
831
+ .map((key) => key.publicKey)
832
+ .includes(publicKey))
833
+ throw new Error(`provided publicKey does not belong to ${signingProviderId}`);
799
834
  const network = await store.getCurrentNetwork();
800
- const idp = await store.getIdp(network.identityProviderId);
835
+ if (network === undefined) {
836
+ throw new Error('No network session found');
837
+ }
801
838
  if (!network.adminAuth) {
802
839
  throw new Error('No admin auth configured');
803
840
  }
804
- const adminAccessTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.adminAuth, logger);
841
+ const idp = await store.getIdp(network.identityProviderId);
842
+ const adminTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.adminAuth, logger);
805
843
  const partyAllocator = new PartyAllocationService({
806
844
  synchronizerId: network.synchronizerId,
807
- accessTokenProvider: adminAccessTokenProvider,
845
+ accessTokenProvider: adminTokenProvider,
808
846
  httpLedgerUrl: network.ledgerApi.baseUrl,
809
847
  logger,
810
848
  });
811
- const walletAllocationService = new WalletAllocationService(store, logger, partyAllocator, drivers);
812
- if (!drivers[params.signingProviderId]) {
813
- throw new Error(`Signing provider ${params.signingProviderId} not supported`);
814
- }
815
- return walletAllocationService.getVaults(assertConnected(authContext), params.signingProviderId);
849
+ const normalizedKey = partyAllocator.normalizePublicKeyToBase64(publicKey);
850
+ if (!normalizedKey) {
851
+ throw new Error('provided key cannot be converted to Base64 format');
852
+ }
853
+ const namespace = partyAllocator.createFingerprintFromKey(normalizedKey);
854
+ await store.updateWallet({
855
+ partyId,
856
+ signingProviderId,
857
+ publicKey,
858
+ namespace,
859
+ reason: '',
860
+ disabled: false,
861
+ });
862
+ return null;
863
+ },
864
+ getWallet: async (params) => {
865
+ return await store.getWallet(params.partyId);
816
866
  },
817
867
  });
818
868
  };
@@ -8,6 +8,7 @@ import { StoreInternal } from '@canton-network/core-wallet-store-inmemory';
8
8
  import { SigningProvider } from '@canton-network/core-signing-lib';
9
9
  import { NotificationService } from '../notification/NotificationService.js';
10
10
  import { userController } from './controller.js';
11
+ import { getLogger } from '@logtape/logtape';
11
12
  const ledgerMocks = vi.hoisted(() => ({
12
13
  getWithRetry: vi.fn(),
13
14
  postWithRetry: vi.fn(),
@@ -100,7 +101,7 @@ const storeNetwork = {
100
101
  auth: {
101
102
  method: 'authorization_code',
102
103
  clientId: 'cid',
103
- scope: 'scope',
104
+ scope: 'scope1 scope2',
104
105
  audience: 'aud',
105
106
  },
106
107
  adminAuth: {
@@ -143,6 +144,7 @@ const primaryWallet = {
143
144
  publicKey: 'wallet-public-key',
144
145
  namespace: 'namespace',
145
146
  networkId: 'network1',
147
+ userId: 'user-1',
146
148
  rights: [PartyLevelRight.CanActAs],
147
149
  };
148
150
  const participantWallet = {
@@ -152,7 +154,7 @@ const participantWallet = {
152
154
  };
153
155
  async function createStore(logger, context, options = {}) {
154
156
  const { withSession = true, withWallet = true } = options;
155
- const store = new StoreInternal({ idps: [idp], networks: [storeNetwork] }, logger, context);
157
+ const store = new StoreInternal({ idps: [idp], networks: [storeNetwork] }, getLogger('mock'), context);
156
158
  if (context && withSession) {
157
159
  await store.setSession(session);
158
160
  }
@@ -162,7 +164,7 @@ async function createStore(logger, context, options = {}) {
162
164
  return store;
163
165
  }
164
166
  function createController(store, notificationService, logger, context, drivers = {}, adminId) {
165
- return userController(kernelInfo, userUrl, store, notificationService, context, drivers, logger, adminId);
167
+ return userController(kernelInfo, userUrl, store, notificationService, context, drivers, logger, 'HASHING_SCHEME_VERSION_V3', adminId);
166
168
  }
167
169
  describe('userController', () => {
168
170
  let logger;
@@ -295,6 +297,49 @@ describe('userController', () => {
295
297
  });
296
298
  });
297
299
  });
300
+ describe('selfSignedAccessToken', () => {
301
+ const selfSignedIdp = {
302
+ id: 'idp-self-signed',
303
+ type: 'self_signed',
304
+ issuer: 'unsafe-auth',
305
+ };
306
+ const selfSignedNetwork = {
307
+ id: 'network-self-signed',
308
+ name: 'Self Signed',
309
+ description: 'Test',
310
+ identityProviderId: 'idp-self-signed',
311
+ ledgerApi: { baseUrl: 'http://ledger.test' },
312
+ auth: {
313
+ method: 'self_signed',
314
+ issuer: 'self-signed',
315
+ audience: 'aud',
316
+ scope: 'scope',
317
+ clientId: 'operator',
318
+ clientSecret: 'network-secret',
319
+ },
320
+ };
321
+ it('mints a token when the client secret matches the network', async () => {
322
+ const store = new StoreInternal({ idps: [selfSignedIdp], networks: [selfSignedNetwork] }, getLogger('mock'));
323
+ const controller = createController(store, notificationService, logger, undefined);
324
+ const result = await controller.selfSignedAccessToken({
325
+ networkId: 'network-self-signed',
326
+ clientId: 'test-user',
327
+ clientSecret: 'network-secret',
328
+ });
329
+ expect(typeof result.accessToken).toBe('string');
330
+ const payload = JSON.parse(Buffer.from(result.accessToken.split('.')[1], 'base64url').toString());
331
+ expect(payload.sub).toBe('test-user');
332
+ });
333
+ it('rejects when the client secret does not match', async () => {
334
+ const store = new StoreInternal({ idps: [selfSignedIdp], networks: [selfSignedNetwork] }, getLogger('mock'));
335
+ const controller = createController(store, notificationService, logger, undefined);
336
+ await expect(controller.selfSignedAccessToken({
337
+ networkId: 'network-self-signed',
338
+ clientId: 'test-user',
339
+ clientSecret: 'wrong-secret',
340
+ })).rejects.toThrow('Invalid client secret');
341
+ });
342
+ });
298
343
  describe('idps', () => {
299
344
  it('adds and removes an idp for the admin user', async () => {
300
345
  const store = await createStore(logger, adminAuth);
@@ -602,9 +647,9 @@ describe('userController', () => {
602
647
  const validAddSessionClaims = {
603
648
  iss: idp.issuer,
604
649
  aud: storeNetwork.auth.audience,
605
- sub: storeNetwork.auth.clientId,
606
- scope: 'scope',
607
- scp: ['scope'],
650
+ sub: 'sub',
651
+ scope: 'scope1 scope2',
652
+ scp: ['scope1', 'scope2'],
608
653
  exp: 1_900_000_000,
609
654
  iat: 1_800_000_000,
610
655
  };
@@ -750,77 +795,20 @@ describe('userController', () => {
750
795
  network: 'network1',
751
796
  });
752
797
  });
753
- it('addSession rejects token when both scope and scp are missing', async () => {
754
- const authWithoutScopeClaims = {
755
- ...auth,
756
- accessToken: createJwt({
757
- iss: idp.issuer,
758
- aud: storeNetwork.auth.audience,
759
- sub: storeNetwork.auth.clientId,
760
- exp: 1_900_000_000,
761
- iat: 1_800_000_000,
762
- }),
763
- };
764
- const store = await createStore(logger, authWithoutScopeClaims, {
765
- withWallet: false,
766
- });
767
- const controller = createController(store, notificationService, logger, authWithoutScopeClaims);
768
- await expect(controller.addSession({
769
- origin: 'dapp-1',
770
- networkId: 'network1',
771
- })).rejects.toThrow('Failed to add session');
772
- });
773
- it('addSession passes when only scope is present and matches', async () => {
774
- const authWithScopeOnly = createAuthWithAddSessionClaims({
775
- scp: undefined,
776
- });
777
- const store = await createStore(logger, authWithScopeOnly, {
778
- withWallet: false,
779
- });
780
- const controller = createController(store, notificationService, logger, authWithScopeOnly);
781
- const result = await controller.addSession({
782
- origin: 'dapp-1',
783
- networkId: 'network1',
784
- });
785
- expect(result).toMatchObject({
786
- network: expect.objectContaining({
787
- id: 'network1',
788
- auth: expect.objectContaining({
789
- method: 'authorization_code',
790
- }),
791
- }),
792
- status: 'connected',
793
- });
794
- expect(result.network).not.toHaveProperty('adminAuth');
795
- expect(result.network).not.toHaveProperty('serviceAccountAuth');
796
- });
797
- it('addSession rejects when only scope is present and mismatches', async () => {
798
- const authWithInvalidScope = createAuthWithAddSessionClaims({
798
+ it('addSession does not validate scope or scp against network.auth.scope', async () => {
799
+ const authWithUnrelatedScopes = createAuthWithAddSessionClaims({
799
800
  scope: 'openid email',
800
- scp: undefined,
801
+ scp: ['profile'],
801
802
  });
802
- const store = await createStore(logger, authWithInvalidScope, {
803
+ const store = await createStore(logger, authWithUnrelatedScopes, {
803
804
  withWallet: false,
804
805
  });
805
- const controller = createController(store, notificationService, logger, authWithInvalidScope);
806
- await expect(controller.addSession({
806
+ const controller = createController(store, notificationService, logger, authWithUnrelatedScopes);
807
+ const result = await controller.addSession({
807
808
  origin: 'dapp-1',
808
809
  networkId: 'network1',
809
- })).rejects.toThrow('Failed to add session');
810
- });
811
- it('addSession rejects when both scope and scp are present but one mismatches', async () => {
812
- const authWithMismatchedScp = createAuthWithAddSessionClaims({
813
- scope: 'scope',
814
- scp: ['scope openid'],
815
- });
816
- const store = await createStore(logger, authWithMismatchedScp, {
817
- withWallet: false,
818
810
  });
819
- const controller = createController(store, notificationService, logger, authWithMismatchedScp);
820
- await expect(controller.addSession({
821
- origin: 'dapp-1',
822
- networkId: 'network1',
823
- })).rejects.toThrow('Failed to add session');
811
+ expect(result.status).toBe('connected');
824
812
  });
825
813
  it('addSession rejects token with issuer mismatch', async () => {
826
814
  const authWithInvalidIssuer = createAuthWithAddSessionClaims({
@@ -1016,7 +1004,7 @@ describe('userController', () => {
1016
1004
  ...storeNetwork,
1017
1005
  adminAuth: undefined,
1018
1006
  };
1019
- const store = new StoreInternal({ idps: [idp], networks: [networkWithoutAdmin] }, logger, auth);
1007
+ const store = new StoreInternal({ idps: [idp], networks: [networkWithoutAdmin] }, getLogger('mock'), auth);
1020
1008
  await store.setSession(session);
1021
1009
  const controller = createController(store, notificationService, logger, auth);
1022
1010
  await expect(controller.syncWallets()).rejects.toThrow('No admin auth configured');
@@ -1092,7 +1080,7 @@ describe('userController', () => {
1092
1080
  ...storeNetwork,
1093
1081
  adminAuth: undefined,
1094
1082
  };
1095
- const store = new StoreInternal({ idps: [idp], networks: [networkWithoutAdmin] }, logger, auth);
1083
+ const store = new StoreInternal({ idps: [idp], networks: [networkWithoutAdmin] }, getLogger('mock'), auth);
1096
1084
  await store.setSession(session);
1097
1085
  const controller = createController(store, notificationService, logger, auth);
1098
1086
  await expect(controller.isWalletSyncNeeded()).rejects.toThrow('No admin auth configured');