@canton-network/wallet-gateway-remote 1.6.0 → 1.8.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.
- package/README.md +27 -2
- package/dist/dapp-api/controller.d.ts.map +1 -1
- package/dist/dapp-api/controller.js +27 -12
- package/dist/dapp-api/controller.test.js +23 -6
- package/dist/dapp-api/server.d.ts.map +1 -1
- package/dist/dapp-api/server.js +24 -12
- package/dist/env.d.ts +9 -0
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +9 -0
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +33 -1
- package/dist/ledger/transaction-service.d.ts +1 -12
- package/dist/ledger/transaction-service.d.ts.map +1 -1
- package/dist/ledger/transaction-service.js +114 -43
- package/dist/ledger/transaction-service.test.js +105 -26
- package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts +18 -0
- package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.d.ts.map +1 -0
- package/dist/ledger/wallet-allocation/signing-providers/securosys-wallet-allocator.js +130 -0
- package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts +1 -0
- package/dist/ledger/wallet-allocation/wallet-allocation-service.d.ts.map +1 -1
- package/dist/ledger/wallet-allocation/wallet-allocation-service.js +15 -0
- package/dist/ledger/wallet-allocation/wallet-allocation-service.test.js +88 -0
- package/dist/ledger/wallet-sync-service.test.js +2 -1
- package/dist/middleware/apiKeyAuth.d.ts.map +1 -1
- package/dist/middleware/apiKeyAuth.js +12 -3
- package/dist/middleware/securityHeaders.d.ts +3 -0
- package/dist/middleware/securityHeaders.d.ts.map +1 -0
- package/dist/middleware/securityHeaders.js +10 -0
- package/dist/middleware/securityHeaders.test.d.ts +2 -0
- package/dist/middleware/securityHeaders.test.d.ts.map +1 -0
- package/dist/middleware/securityHeaders.test.js +18 -0
- package/dist/middleware/sessionHandler.d.ts.map +1 -1
- package/dist/middleware/sessionHandler.js +3 -1
- package/dist/signing/signing-worker.d.ts +1 -2
- package/dist/signing/signing-worker.d.ts.map +1 -1
- package/dist/signing/signing-worker.js +7 -3
- package/dist/signing/signing-worker.test.js +2 -0
- package/dist/user-api/controller.d.ts.map +1 -1
- package/dist/user-api/controller.js +109 -50
- package/dist/user-api/controller.test.js +227 -19
- package/dist/user-api/rpc-gen/typings.d.ts +47 -8
- package/dist/user-api/rpc-gen/typings.d.ts.map +1 -1
- package/dist/user-api/token-network-matching.d.ts +4 -0
- package/dist/user-api/token-network-matching.d.ts.map +1 -0
- package/dist/user-api/token-network-matching.js +56 -0
- package/dist/web/frontend/404/index.html +2 -2
- package/dist/web/frontend/activities/index.html +3 -4
- package/dist/web/frontend/approve/index.html +3 -5
- package/dist/web/frontend/assets/404-DAyFyvuw.js +5 -0
- package/dist/web/frontend/assets/activities-BQSNQCP2.js +61 -0
- package/dist/web/frontend/assets/addIdentityProvider-Djya4QfT.js +28 -0
- package/dist/web/frontend/assets/addNetwork-83_QwE58.js +38 -0
- package/dist/web/frontend/assets/addParty-CdxWCt0U.js +45 -0
- package/dist/web/frontend/assets/approve-NcV61aZJ.js +21 -0
- package/dist/web/frontend/assets/callback-U_3ypVos.js +3 -0
- package/dist/web/frontend/assets/identityProviders-CIk5SJX_.js +71 -0
- package/dist/web/frontend/assets/index-BjhQnXf1.js +2 -0
- package/dist/web/frontend/assets/index-jHlzHNRR.js +91 -0
- package/dist/web/frontend/assets/{index-CFnOucPK.js → index-uxv_f8PV.js} +631 -572
- package/dist/web/frontend/assets/login-C_JAX4Df.js +10 -0
- package/dist/web/frontend/assets/networks-C1kpJNtZ.js +73 -0
- package/dist/web/frontend/assets/reviewIdentityProvider-BZv-CbZZ.js +43 -0
- package/dist/web/frontend/assets/reviewNetwork-CnoSJz4N.js +43 -0
- package/dist/web/frontend/assets/settings-Dt0_RW30.js +37 -0
- package/dist/web/frontend/callback/index.html +2 -2
- package/dist/web/frontend/identity-providers/add/index.html +2 -3
- package/dist/web/frontend/identity-providers/index.html +2 -3
- package/dist/web/frontend/identity-providers/review/index.html +2 -3
- package/dist/web/frontend/index.html +1 -1
- package/dist/web/frontend/login/index.html +2 -3
- package/dist/web/frontend/networks/add/index.html +2 -3
- package/dist/web/frontend/networks/index.html +2 -3
- package/dist/web/frontend/networks/review/index.html +2 -3
- package/dist/web/frontend/parties/add/index.html +3 -5
- package/dist/web/frontend/parties/index.html +2 -4
- package/dist/web/frontend/settings/index.html +2 -3
- package/dist/web/server.d.ts +1 -1
- package/dist/web/server.d.ts.map +1 -1
- package/dist/web/server.js +3 -3
- package/package.json +30 -29
- package/dist/web/frontend/assets/404-C4hCL2o8.js +0 -5
- package/dist/web/frontend/assets/activities-Bq7yMMQY.js +0 -61
- package/dist/web/frontend/assets/addIdentityProvider-DRJWLhHF.js +0 -28
- package/dist/web/frontend/assets/addNetwork-CJUaKP1q.js +0 -38
- package/dist/web/frontend/assets/addParty-2ObTLGIL.js +0 -45
- package/dist/web/frontend/assets/approve-BuA5DGC2.js +0 -21
- package/dist/web/frontend/assets/callback-C5vJWFLq.js +0 -1
- package/dist/web/frontend/assets/identityProviders-78FbpzYL.js +0 -71
- package/dist/web/frontend/assets/index-BTH_md6b.js +0 -91
- package/dist/web/frontend/assets/index-CiMGhYb1.js +0 -2
- package/dist/web/frontend/assets/login-Dyn1o6fW.js +0 -10
- package/dist/web/frontend/assets/networks-_el10AWP.js +0 -73
- package/dist/web/frontend/assets/reviewIdentityProvider-DodUZ2mY.js +0 -43
- package/dist/web/frontend/assets/reviewNetwork-BFMtmKEL.js +0 -43
- package/dist/web/frontend/assets/settings-BBmkIfYm.js +0 -37
- package/dist/web/frontend/assets/state-DkxLvywv.js +0 -1
- package/dist/web/frontend/assets/utils-DvJKIYxT.js +0 -1
|
@@ -100,6 +100,30 @@ function createDfnsDriver(options) {
|
|
|
100
100
|
}),
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
|
+
function createSecurosysDriver(options) {
|
|
104
|
+
const createKeyResult = options.createKeyResult ?? {
|
|
105
|
+
id: 'key-1',
|
|
106
|
+
publicKey: 'securosys-pk',
|
|
107
|
+
};
|
|
108
|
+
const signTransactionResult = options.signTransactionResult ?? {
|
|
109
|
+
status: 'pending',
|
|
110
|
+
txId: 'tx-1',
|
|
111
|
+
};
|
|
112
|
+
const getTransactionResult = options.getTransactionResult ?? signTransactionResult;
|
|
113
|
+
return {
|
|
114
|
+
controller: vi.fn().mockReturnValue({
|
|
115
|
+
createKey: vi
|
|
116
|
+
.fn()
|
|
117
|
+
.mockResolvedValue(createKeyResult),
|
|
118
|
+
signTransaction: vi
|
|
119
|
+
.fn()
|
|
120
|
+
.mockResolvedValue(signTransactionResult),
|
|
121
|
+
getTransaction: vi
|
|
122
|
+
.fn()
|
|
123
|
+
.mockResolvedValue(getTransactionResult),
|
|
124
|
+
}),
|
|
125
|
+
};
|
|
126
|
+
}
|
|
103
127
|
describe('WalletAllocationService', () => {
|
|
104
128
|
let mockLogger;
|
|
105
129
|
let mockStore;
|
|
@@ -830,4 +854,68 @@ describe('WalletAllocationService', () => {
|
|
|
830
854
|
});
|
|
831
855
|
});
|
|
832
856
|
});
|
|
857
|
+
describe('Securosys', () => {
|
|
858
|
+
it('throws when Securosys signing driver not available', async () => {
|
|
859
|
+
const serviceWithoutSecurosys = createService({});
|
|
860
|
+
await expect(serviceWithoutSecurosys.createWallet(authContext, 'alice', false, SigningProvider.SECUROSYS)).rejects.toThrow('Securosys signing driver not available');
|
|
861
|
+
});
|
|
862
|
+
it('createWallet returns initialized when signTransaction returns pending', async () => {
|
|
863
|
+
const driver = createSecurosysDriver({
|
|
864
|
+
createKeyResult: {
|
|
865
|
+
id: 'alice-key',
|
|
866
|
+
publicKey: 'securosys-pk',
|
|
867
|
+
},
|
|
868
|
+
signTransactionResult: {
|
|
869
|
+
status: 'pending',
|
|
870
|
+
txId: 'tsb-request-1',
|
|
871
|
+
},
|
|
872
|
+
});
|
|
873
|
+
const serviceWithSecurosys = createService({
|
|
874
|
+
[SigningProvider.SECUROSYS]: driver,
|
|
875
|
+
});
|
|
876
|
+
const result = await serviceWithSecurosys.createWallet(authContext, 'alice', false, SigningProvider.SECUROSYS);
|
|
877
|
+
const controller = vi.mocked(driver.controller).mock.results[0]
|
|
878
|
+
?.value;
|
|
879
|
+
expect(controller.createKey).toHaveBeenCalledWith({
|
|
880
|
+
name: 'alice',
|
|
881
|
+
});
|
|
882
|
+
expect(controller.signTransaction).toHaveBeenCalledWith(expect.objectContaining({
|
|
883
|
+
txHash: 'hash',
|
|
884
|
+
keyIdentifier: {
|
|
885
|
+
id: 'alice-key',
|
|
886
|
+
publicKey: 'securosys-pk',
|
|
887
|
+
},
|
|
888
|
+
}));
|
|
889
|
+
expect(result.status).toBe('initialized');
|
|
890
|
+
expect(result.reason).toBe(WALLET_DISABLED_REASON.TOPOLOGY_TRANSACTION_PENDING);
|
|
891
|
+
expect(result.signingProviderId).toBe(SigningProvider.SECUROSYS);
|
|
892
|
+
expect(result.externalTxId).toBe('tsb-request-1');
|
|
893
|
+
expect(mockStore.addWallet).toHaveBeenCalled();
|
|
894
|
+
});
|
|
895
|
+
it('allocateParty updates wallet to allocated when transaction is signed', async () => {
|
|
896
|
+
const serviceWithSecurosys = createService({
|
|
897
|
+
[SigningProvider.SECUROSYS]: createSecurosysDriver({
|
|
898
|
+
getTransactionResult: {
|
|
899
|
+
txId: 'tsb-request-1',
|
|
900
|
+
status: 'signed',
|
|
901
|
+
signature: 'sig-base64',
|
|
902
|
+
},
|
|
903
|
+
}),
|
|
904
|
+
});
|
|
905
|
+
mockPartyAllocator.allocatePartyWithExistingWallet.mockResolvedValue('alice::namespace');
|
|
906
|
+
await serviceWithSecurosys.allocateParty(authContext, createWallet('alice::fingerprint', {
|
|
907
|
+
signingProviderId: SigningProvider.SECUROSYS,
|
|
908
|
+
namespace: 'fingerprint',
|
|
909
|
+
topologyTransactions: 'tx1',
|
|
910
|
+
externalTxId: 'tsb-request-1',
|
|
911
|
+
}), SigningProvider.SECUROSYS);
|
|
912
|
+
expect(mockPartyAllocator.allocatePartyWithExistingWallet).toHaveBeenCalledWith('fingerprint', ['tx1'], 'sig-base64', authContext.userId);
|
|
913
|
+
expect(mockStore.updateWallet).toHaveBeenCalledWith({
|
|
914
|
+
networkId: 'network1',
|
|
915
|
+
partyId: 'alice::namespace',
|
|
916
|
+
status: 'allocated',
|
|
917
|
+
reason: '',
|
|
918
|
+
});
|
|
919
|
+
});
|
|
920
|
+
});
|
|
833
921
|
});
|
|
@@ -203,8 +203,9 @@ describe('WalletSyncService - multi-network features', () => {
|
|
|
203
203
|
const setSession = async (networkId) => {
|
|
204
204
|
await store.setSession({
|
|
205
205
|
id: `sess-${networkId}`,
|
|
206
|
+
origin: 'dapp-1',
|
|
206
207
|
network: networkId,
|
|
207
|
-
accessToken: 'token',
|
|
208
|
+
accessToken: 'test-access-token',
|
|
208
209
|
});
|
|
209
210
|
};
|
|
210
211
|
beforeEach(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiKeyAuth.d.ts","sourceRoot":"","sources":["../../src/middleware/apiKeyAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EACH,SAAS,EAGZ,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAMzD,wBAAgB,UAAU,CACtB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,IAEA,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"apiKeyAuth.d.ts","sourceRoot":"","sources":["../../src/middleware/apiKeyAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EACH,SAAS,EAGZ,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAMzD,wBAAgB,UAAU,CACtB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,IAEA,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,wDA2IhE"}
|
|
@@ -37,13 +37,15 @@ export function apiKeyAuth(store, dappApiPath, logger) {
|
|
|
37
37
|
// temporary auth context to access the store with the API key user
|
|
38
38
|
const authStore = store.withAuthContext({
|
|
39
39
|
userId: matchingKey.userId,
|
|
40
|
-
accessToken:
|
|
40
|
+
accessToken: hashedApiKey,
|
|
41
41
|
});
|
|
42
42
|
// automatically initiate a session for the API key user
|
|
43
|
+
const sessionId = v4();
|
|
43
44
|
await authStore.setSession({
|
|
44
|
-
id:
|
|
45
|
+
id: sessionId,
|
|
46
|
+
origin: `apikey:${matchingKey.id}`,
|
|
45
47
|
network: matchingKey.networkId,
|
|
46
|
-
accessToken:
|
|
48
|
+
accessToken: hashedApiKey,
|
|
47
49
|
});
|
|
48
50
|
const network = await authStore.getNetwork(matchingKey.networkId);
|
|
49
51
|
const idp = await authStore.getIdp(network.identityProviderId);
|
|
@@ -74,6 +76,13 @@ export function apiKeyAuth(store, dappApiPath, logger) {
|
|
|
74
76
|
accessToken: serviceAccountCtx.accessToken,
|
|
75
77
|
email: matchingKey.email || undefined,
|
|
76
78
|
};
|
|
79
|
+
// we need to override the session now, so that the accessToken matches what the controller expects (accessToken == serviceAccount token)
|
|
80
|
+
await authStore.setSession({
|
|
81
|
+
id: sessionId,
|
|
82
|
+
origin: `apikey:${matchingKey.id}`,
|
|
83
|
+
network: matchingKey.networkId,
|
|
84
|
+
accessToken: serviceAccountCtx.accessToken,
|
|
85
|
+
});
|
|
77
86
|
req.authContext = context;
|
|
78
87
|
return next();
|
|
79
88
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"securityHeaders.d.ts","sourceRoot":"","sources":["../../src/middleware/securityHeaders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE9D,wBAAgB,eAAe,KACnB,MAAM,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UAM3D"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
// Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
|
|
2
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
3
|
+
export function securityHeaders() {
|
|
4
|
+
return (_req, res, next) => {
|
|
5
|
+
res.setHeader('X-Frame-Options', 'DENY');
|
|
6
|
+
res.setHeader('Content-Security-Policy', "frame-ancestors 'none';");
|
|
7
|
+
res.setHeader('X-Content-Type-Options', 'nosniff');
|
|
8
|
+
next();
|
|
9
|
+
};
|
|
10
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"securityHeaders.test.d.ts","sourceRoot":"","sources":["../../src/middleware/securityHeaders.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
// Copyright (c) 2025-2026 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
|
|
2
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
3
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
4
|
+
import { securityHeaders } from './securityHeaders.js';
|
|
5
|
+
describe('securityHeaders', () => {
|
|
6
|
+
it('sets the expected security response headers', () => {
|
|
7
|
+
const setHeader = vi.fn();
|
|
8
|
+
const next = vi.fn();
|
|
9
|
+
const middleware = securityHeaders();
|
|
10
|
+
const req = {};
|
|
11
|
+
const res = { setHeader };
|
|
12
|
+
middleware(req, res, next);
|
|
13
|
+
expect(setHeader).toHaveBeenCalledWith('X-Frame-Options', 'DENY');
|
|
14
|
+
expect(setHeader).toHaveBeenCalledWith('Content-Security-Policy', "frame-ancestors 'none';");
|
|
15
|
+
expect(setHeader).toHaveBeenCalledWith('X-Content-Type-Options', 'nosniff');
|
|
16
|
+
expect(next).toHaveBeenCalledOnce();
|
|
17
|
+
});
|
|
18
|
+
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/sessionHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAEzD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,EAAE,MAAM,IAEA,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"sessionHandler.d.ts","sourceRoot":"","sources":["../../src/middleware/sessionHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAEzD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC1B,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,EAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,EAAE,MAAM,IAEA,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,mBA+BhE"}
|
|
@@ -23,7 +23,9 @@ export function sessionHandler(store, allowedPaths, logger) {
|
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
25
|
logger.debug('Checking for active session for ' + context?.userId);
|
|
26
|
-
const session = await store
|
|
26
|
+
const session = await store
|
|
27
|
+
.withAuthContext(context)
|
|
28
|
+
.getSession(context?.accessToken || '');
|
|
27
29
|
if (!session) {
|
|
28
30
|
logger.debug('No active session found for ' + context?.userId);
|
|
29
31
|
res.status(401).json({ error: 'No active session found' });
|
|
@@ -47,8 +47,7 @@ export interface SigningWorkerOptions {
|
|
|
47
47
|
*
|
|
48
48
|
* - returns early while the provider still reports `pending` (worker logs and
|
|
49
49
|
* waits for the next tick), or
|
|
50
|
-
* - calls `execute()` once signing is `signed
|
|
51
|
-
* at sign-time, so execute only reconciles local state).
|
|
50
|
+
* - calls `execute()` once signing is `signed`.
|
|
52
51
|
*
|
|
53
52
|
* A transaction is re-read before processing so a concurrent DApp call or an
|
|
54
53
|
* earlier tick that already completed it is skipped.
|
|
@@ -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
|
|
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"}
|
|
@@ -36,8 +36,7 @@ import { resolveAutomationRunContext } from './service-account-session.js';
|
|
|
36
36
|
*
|
|
37
37
|
* - returns early while the provider still reports `pending` (worker logs and
|
|
38
38
|
* waits for the next tick), or
|
|
39
|
-
* - calls `execute()` once signing is `signed
|
|
40
|
-
* at sign-time, so execute only reconciles local state).
|
|
39
|
+
* - calls `execute()` once signing is `signed`.
|
|
41
40
|
*
|
|
42
41
|
* A transaction is re-read before processing so a concurrent DApp call or an
|
|
43
42
|
* earlier tick that already completed it is skipped.
|
|
@@ -130,7 +129,12 @@ export class SigningWorker {
|
|
|
130
129
|
logger.debug({ refreshedTx }, 'Skipping signing worker tick: transaction no longer pending');
|
|
131
130
|
return;
|
|
132
131
|
}
|
|
133
|
-
const
|
|
132
|
+
const session = await store.getSession(runContext.authContext.accessToken);
|
|
133
|
+
if (!session) {
|
|
134
|
+
logger.error({ userId, networkId, transactionId: transaction.id }, 'Signing worker tick failed: session not found');
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
const notifier = this.options.notificationService.getNotifier(session.id);
|
|
134
138
|
const transactionLogger = this.options.logger.child({
|
|
135
139
|
component: 'TransactionService',
|
|
136
140
|
});
|
|
@@ -90,6 +90,7 @@ const pendingTransaction = {
|
|
|
90
90
|
function createWorker(storeOverrides = {}) {
|
|
91
91
|
const scopedStore = {
|
|
92
92
|
setSession: vi.fn().mockResolvedValue(undefined),
|
|
93
|
+
getSession: vi.fn().mockResolvedValue({ id: 'session-1' }),
|
|
93
94
|
getPrimaryWallet: vi.fn().mockResolvedValue(wallet),
|
|
94
95
|
getAllWallets: vi.fn().mockResolvedValue([wallet, aliceWallet]),
|
|
95
96
|
getTransaction: vi.fn().mockResolvedValue(pendingTransaction),
|
|
@@ -100,6 +101,7 @@ function createWorker(storeOverrides = {}) {
|
|
|
100
101
|
.mockResolvedValue([pendingTransaction]),
|
|
101
102
|
getIdp: vi.fn().mockResolvedValue(idp),
|
|
102
103
|
getNetwork: vi.fn().mockResolvedValue(m2mNetwork),
|
|
104
|
+
getSession: vi.fn().mockResolvedValue({ id: 'session-1' }),
|
|
103
105
|
withAuthContext: vi.fn().mockReturnValue(scopedStore),
|
|
104
106
|
...storeOverrides,
|
|
105
107
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/user-api/controller.ts"],"names":[],"mappings":"
|
|
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;AAanE,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4mCvB,CAAA"}
|
|
@@ -14,6 +14,7 @@ import { v4 } from 'uuid';
|
|
|
14
14
|
import { TransactionService } from '../ledger/transaction-service.js';
|
|
15
15
|
import { rpcErrors } from '@canton-network/core-rpc-errors';
|
|
16
16
|
import crypto from 'crypto';
|
|
17
|
+
import { assertTokenClaimsMatchNetwork } from './token-network-matching.js';
|
|
17
18
|
export const userController = (kernelInfo, userUrl, store, notificationService, authContext, drivers, _logger, adminUserId) => {
|
|
18
19
|
const logger = _logger.child({ component: 'user-controller' });
|
|
19
20
|
const provider = {
|
|
@@ -22,18 +23,34 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
22
23
|
providerType: kernelInfo.clientType,
|
|
23
24
|
userUrl: `${userUrl}/login/`,
|
|
24
25
|
};
|
|
26
|
+
function isAdmin() {
|
|
27
|
+
const userId = authContext?.userId;
|
|
28
|
+
return !!adminUserId && !!userId && userId === adminUserId;
|
|
29
|
+
}
|
|
25
30
|
function assertAdmin() {
|
|
26
31
|
const userId = assertConnected(authContext).userId;
|
|
27
32
|
if (!adminUserId || userId !== adminUserId) {
|
|
28
33
|
throw new Error('Unauthorized: only the admin user can perform this operation');
|
|
29
34
|
}
|
|
30
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Session responses always include user auth for the UI.
|
|
38
|
+
* Privileged credentials are included only for the admin user.
|
|
39
|
+
*/
|
|
40
|
+
function toSessionNetwork(network) {
|
|
41
|
+
const dto = toNetworkDto(network);
|
|
42
|
+
if (isAdmin()) {
|
|
43
|
+
return dto;
|
|
44
|
+
}
|
|
45
|
+
const { adminAuth: _adminAuth, serviceAccountAuth: _sa, ...rest } = dto;
|
|
46
|
+
return rest;
|
|
47
|
+
}
|
|
31
48
|
return buildController({
|
|
32
49
|
getUser: async () => {
|
|
33
50
|
const userId = assertConnected(authContext).userId;
|
|
34
51
|
return {
|
|
35
52
|
userId,
|
|
36
|
-
isAdmin:
|
|
53
|
+
isAdmin: isAdmin(),
|
|
37
54
|
};
|
|
38
55
|
},
|
|
39
56
|
addNetwork: async (params) => {
|
|
@@ -149,7 +166,6 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
149
166
|
if (!network.adminAuth) {
|
|
150
167
|
throw new Error('No admin auth configured');
|
|
151
168
|
}
|
|
152
|
-
const notifier = notificationService.getNotifier(connectedContext.userId);
|
|
153
169
|
const adminTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.adminAuth, logger);
|
|
154
170
|
const partyAllocator = new PartyAllocationService({
|
|
155
171
|
synchronizerId: network.synchronizerId,
|
|
@@ -172,12 +188,13 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
172
188
|
await service.syncWallets();
|
|
173
189
|
// Notify about the change and return the new wallet
|
|
174
190
|
const wallets = await store.getWallets();
|
|
175
|
-
|
|
191
|
+
notificationService
|
|
192
|
+
.getNotifier(connectedContext.userId)
|
|
193
|
+
.emit('accountsChanged', wallets);
|
|
176
194
|
return { wallet };
|
|
177
195
|
},
|
|
178
196
|
allocatePartyForWallet: async (params) => {
|
|
179
197
|
const connectedContext = assertConnected(authContext);
|
|
180
|
-
const userId = connectedContext.userId;
|
|
181
198
|
const network = await store.getCurrentNetwork();
|
|
182
199
|
if (!network) {
|
|
183
200
|
throw new Error('No network session found');
|
|
@@ -216,17 +233,17 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
216
233
|
const wallets = await store.getWallets();
|
|
217
234
|
const wallet = wallets.find((w) => w.partyId === existingWallet.partyId &&
|
|
218
235
|
w.networkId === network.id);
|
|
219
|
-
|
|
220
|
-
|
|
236
|
+
notificationService
|
|
237
|
+
.getNotifier(connectedContext.userId)
|
|
238
|
+
.emit('accountsChanged', wallets);
|
|
221
239
|
return { wallet };
|
|
222
240
|
},
|
|
223
241
|
setPrimaryWallet: async (params) => {
|
|
224
242
|
await store.setPrimaryWallet(params.partyId);
|
|
225
|
-
const notifier = authContext?.userId
|
|
226
|
-
? notificationService.getNotifier(authContext.userId)
|
|
227
|
-
: undefined;
|
|
228
243
|
const wallets = await store.getWallets();
|
|
229
|
-
|
|
244
|
+
notificationService
|
|
245
|
+
.getNotifier(authContext.userId)
|
|
246
|
+
.emit('accountsChanged', wallets);
|
|
230
247
|
return null;
|
|
231
248
|
},
|
|
232
249
|
removeWallet: async (params) => {
|
|
@@ -246,8 +263,11 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
246
263
|
throw new Error('No primary wallet found');
|
|
247
264
|
}
|
|
248
265
|
const connectedContext = assertConnected(authContext);
|
|
249
|
-
const
|
|
250
|
-
|
|
266
|
+
const session = await store.getSession(connectedContext.accessToken);
|
|
267
|
+
if (!session) {
|
|
268
|
+
throw new Error('No active session found');
|
|
269
|
+
}
|
|
270
|
+
const notifier = notificationService.getNotifier(session.id);
|
|
251
271
|
const transactionService = new TransactionService(store, logger, drivers, notifier);
|
|
252
272
|
logDynamically(logger, 'signing transaction with params', {
|
|
253
273
|
info: { transactionId: signParams.transactionId },
|
|
@@ -272,7 +292,11 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
272
292
|
if (pending.userId !== userId) {
|
|
273
293
|
throw new Error(`Message signing request ${pending.id} is not owned by user ${userId}`);
|
|
274
294
|
}
|
|
275
|
-
const
|
|
295
|
+
const session = await store.getSession(assertConnected(authContext).accessToken);
|
|
296
|
+
if (!session) {
|
|
297
|
+
throw new Error('No active session found');
|
|
298
|
+
}
|
|
299
|
+
const notifier = notificationService.getNotifier(session.id);
|
|
276
300
|
const emitFailedAndPersist = async (details) => {
|
|
277
301
|
// Best-effort: make sure listeners see a terminal state.
|
|
278
302
|
try {
|
|
@@ -411,7 +435,11 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
411
435
|
if (network === undefined) {
|
|
412
436
|
throw new Error('No network session found');
|
|
413
437
|
}
|
|
414
|
-
const
|
|
438
|
+
const session = await store.getSession(connectedContext.accessToken);
|
|
439
|
+
if (!session) {
|
|
440
|
+
throw new Error('No active session found');
|
|
441
|
+
}
|
|
442
|
+
const notifier = notificationService.getNotifier(session.id);
|
|
415
443
|
const ledgerClient = new LedgerClient({
|
|
416
444
|
baseUrl: new URL(network.ledgerApi.baseUrl),
|
|
417
445
|
logger,
|
|
@@ -436,18 +464,20 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
436
464
|
},
|
|
437
465
|
addSession: async function (params) {
|
|
438
466
|
try {
|
|
467
|
+
const connectedContext = assertConnected(authContext);
|
|
468
|
+
const { userId, accessToken } = connectedContext;
|
|
439
469
|
const newSessionId = v4();
|
|
440
470
|
logger.info(`Adding session with ID ${newSessionId} for network ${params.networkId}`);
|
|
441
471
|
const network = await store.getNetwork(params.networkId);
|
|
472
|
+
const idp = await store.getIdp(network.identityProviderId);
|
|
473
|
+
assertTokenClaimsMatchNetwork(accessToken, network, idp);
|
|
442
474
|
await store.setSession({
|
|
443
475
|
id: newSessionId,
|
|
476
|
+
origin: params.origin,
|
|
444
477
|
network: params.networkId,
|
|
445
|
-
accessToken:
|
|
478
|
+
accessToken: connectedContext.accessToken || '',
|
|
446
479
|
});
|
|
447
|
-
const
|
|
448
|
-
// Assumption: `setSession` calls `assertConnected`, so its safe to declare that the authContext is defined.
|
|
449
|
-
const { userId, accessToken } = authContext;
|
|
450
|
-
const notifier = notificationService.getNotifier(userId);
|
|
480
|
+
const notifier = notificationService.getNotifier(newSessionId);
|
|
451
481
|
const ledgerClient = new LedgerClient({
|
|
452
482
|
baseUrl: new URL(network.ledgerApi.baseUrl),
|
|
453
483
|
logger,
|
|
@@ -474,30 +504,42 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
474
504
|
};
|
|
475
505
|
notifier.emit('statusChanged', statusEvent);
|
|
476
506
|
notifier.emit('connected', statusEvent);
|
|
477
|
-
//
|
|
507
|
+
// Only bootstrap wallets the first time a session is created.
|
|
508
|
+
// Session creation must remain successful when the ledger or
|
|
509
|
+
// wallet synchronization is unavailable.
|
|
478
510
|
const wallets = await store.getWallets();
|
|
479
|
-
if (wallets.length
|
|
480
|
-
if (!
|
|
481
|
-
|
|
511
|
+
if (wallets.length === 0) {
|
|
512
|
+
if (!status.isConnected) {
|
|
513
|
+
logger.warn({
|
|
514
|
+
networkId: network.id,
|
|
515
|
+
reason: status.reason,
|
|
516
|
+
}, 'Skipping initial wallet sync because the ledger is unavailable');
|
|
517
|
+
}
|
|
518
|
+
else {
|
|
519
|
+
try {
|
|
520
|
+
if (!network.adminAuth) {
|
|
521
|
+
throw new Error('No admin auth configured');
|
|
522
|
+
}
|
|
523
|
+
const adminAccessTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.adminAuth, logger);
|
|
524
|
+
const partyAllocator = new PartyAllocationService({
|
|
525
|
+
synchronizerId: network.synchronizerId,
|
|
526
|
+
accessTokenProvider: adminAccessTokenProvider,
|
|
527
|
+
httpLedgerUrl: network.ledgerApi.baseUrl,
|
|
528
|
+
logger,
|
|
529
|
+
});
|
|
530
|
+
const service = new WalletSyncService(store, ledgerClient, connectedContext, logger, drivers, partyAllocator);
|
|
531
|
+
await service.syncWallets();
|
|
532
|
+
}
|
|
533
|
+
catch (error) {
|
|
534
|
+
logger.warn({ err: error, networkId: network.id }, 'Initial wallet sync failed; keeping session active');
|
|
535
|
+
}
|
|
482
536
|
}
|
|
483
|
-
const adminAccessTokenProvider = AuthTokenProvider.fromGatewayConfig(idp, network.adminAuth, logger);
|
|
484
|
-
const partyAllocator = new PartyAllocationService({
|
|
485
|
-
synchronizerId: network.synchronizerId,
|
|
486
|
-
accessTokenProvider: adminAccessTokenProvider,
|
|
487
|
-
httpLedgerUrl: network.ledgerApi.baseUrl,
|
|
488
|
-
logger,
|
|
489
|
-
});
|
|
490
|
-
const service = new WalletSyncService(store, ledgerClient, authContext, logger, drivers, partyAllocator);
|
|
491
|
-
await service.syncWallets();
|
|
492
537
|
}
|
|
493
538
|
const rights = await store.getUserRights(network.id);
|
|
494
539
|
return {
|
|
495
540
|
id: newSessionId,
|
|
496
541
|
accessToken,
|
|
497
|
-
network:
|
|
498
|
-
...network,
|
|
499
|
-
ledgerApi: network.ledgerApi.baseUrl,
|
|
500
|
-
},
|
|
542
|
+
network: toSessionNetwork(network),
|
|
501
543
|
idp,
|
|
502
544
|
status: status.isConnected ? 'connected' : 'disconnected',
|
|
503
545
|
reason: status.reason ? status.reason : 'OK',
|
|
@@ -505,7 +547,7 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
505
547
|
};
|
|
506
548
|
}
|
|
507
549
|
catch (error) {
|
|
508
|
-
logger.error(
|
|
550
|
+
logger.error(error, 'Failed to add session');
|
|
509
551
|
throw new Error(`Failed to add session`, {
|
|
510
552
|
cause: error,
|
|
511
553
|
});
|
|
@@ -513,9 +555,13 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
513
555
|
},
|
|
514
556
|
removeSession: async () => {
|
|
515
557
|
logger.info({ authContext }, 'Removing session');
|
|
516
|
-
const
|
|
517
|
-
const
|
|
518
|
-
|
|
558
|
+
const { accessToken } = assertConnected(authContext);
|
|
559
|
+
const session = await store.getSession(accessToken);
|
|
560
|
+
if (!session) {
|
|
561
|
+
return null;
|
|
562
|
+
}
|
|
563
|
+
const notifier = notificationService.getNotifier(session.id);
|
|
564
|
+
await store.removeSession(accessToken);
|
|
519
565
|
notifier.emit('statusChanged', {
|
|
520
566
|
provider: provider,
|
|
521
567
|
connection: {
|
|
@@ -528,10 +574,13 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
528
574
|
session: undefined,
|
|
529
575
|
userUrl: `${userUrl}/login/`,
|
|
530
576
|
});
|
|
577
|
+
notifier.emit('logout');
|
|
531
578
|
return null;
|
|
532
579
|
},
|
|
580
|
+
// TODO: follow up with store.listSessions to display all sessions in the UI
|
|
533
581
|
listSessions: async () => {
|
|
534
|
-
const
|
|
582
|
+
const token = authContext.accessToken;
|
|
583
|
+
const session = await store.getSession(token);
|
|
535
584
|
if (!session) {
|
|
536
585
|
return { sessions: [] };
|
|
537
586
|
}
|
|
@@ -548,10 +597,8 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
548
597
|
sessions: [
|
|
549
598
|
{
|
|
550
599
|
id: session.id,
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
ledgerApi: network.ledgerApi.baseUrl,
|
|
554
|
-
},
|
|
600
|
+
origin: session.origin,
|
|
601
|
+
network: toSessionNetwork(network),
|
|
555
602
|
idp: idp,
|
|
556
603
|
accessToken: authContext.accessToken,
|
|
557
604
|
status: status.isConnected
|
|
@@ -589,9 +636,10 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
589
636
|
result.disabled.length === 0) {
|
|
590
637
|
return result;
|
|
591
638
|
}
|
|
592
|
-
const notifier = notificationService.getNotifier(userId);
|
|
593
639
|
const wallets = await store.getWallets();
|
|
594
|
-
|
|
640
|
+
notificationService
|
|
641
|
+
.getNotifier(userId)
|
|
642
|
+
.emit('accountsChanged', wallets);
|
|
595
643
|
return result;
|
|
596
644
|
},
|
|
597
645
|
isWalletSyncNeeded: async () => {
|
|
@@ -646,8 +694,10 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
646
694
|
}),
|
|
647
695
|
};
|
|
648
696
|
},
|
|
649
|
-
listTransactions: async function () {
|
|
650
|
-
const
|
|
697
|
+
listTransactions: async function (params) {
|
|
698
|
+
const txCount = await store.transactionsCount();
|
|
699
|
+
const page = await store.listTransactions(params);
|
|
700
|
+
const transactions = page.transactions;
|
|
651
701
|
const txs = transactions.map((transaction) => ({
|
|
652
702
|
id: transaction.id,
|
|
653
703
|
commandId: transaction.commandId,
|
|
@@ -670,7 +720,16 @@ export const userController = (kernelInfo, userUrl, store, notificationService,
|
|
|
670
720
|
externalTxId: transaction.externalTxId,
|
|
671
721
|
}),
|
|
672
722
|
}));
|
|
673
|
-
|
|
723
|
+
if (page.nextCursor === null) {
|
|
724
|
+
return { transactions: txs, count: txCount };
|
|
725
|
+
}
|
|
726
|
+
else {
|
|
727
|
+
return {
|
|
728
|
+
transactions: txs,
|
|
729
|
+
nextCursor: page.nextCursor,
|
|
730
|
+
count: txCount,
|
|
731
|
+
};
|
|
732
|
+
}
|
|
674
733
|
},
|
|
675
734
|
deleteTransaction: async (params) => {
|
|
676
735
|
const transaction = await store.getTransaction(params.transactionId);
|