@dxos/echo-db 2.33.2 → 2.33.3-dev.0cff904f
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/dist/src/echo.js +2 -2
- package/dist/src/echo.js.map +1 -1
- package/dist/src/echo.test.js +10 -10
- package/dist/src/echo.test.js.map +1 -1
- package/dist/src/halo/halo.d.ts +1 -0
- package/dist/src/halo/halo.d.ts.map +1 -1
- package/dist/src/halo/halo.js +10 -1
- package/dist/src/halo/halo.js.map +1 -1
- package/dist/src/halo/identity-manager.d.ts +0 -1
- package/dist/src/halo/identity-manager.d.ts.map +1 -1
- package/dist/src/halo/identity-manager.js +11 -11
- package/dist/src/halo/identity-manager.js.map +1 -1
- package/dist/src/halo/identity.d.ts +18 -13
- package/dist/src/halo/identity.d.ts.map +1 -1
- package/dist/src/halo/identity.js +24 -27
- package/dist/src/halo/identity.js.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.d.ts +2 -2
- package/dist/src/invitations/offline-invitation-claimer.d.ts.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.js +2 -4
- package/dist/src/invitations/offline-invitation-claimer.js.map +1 -1
- package/dist/src/parties/party-factory.d.ts +2 -2
- package/dist/src/parties/party-factory.d.ts.map +1 -1
- package/dist/src/parties/party-factory.js +11 -20
- package/dist/src/parties/party-factory.js.map +1 -1
- package/dist/src/parties/party-manager.d.ts +2 -2
- package/dist/src/parties/party-manager.d.ts.map +1 -1
- package/dist/src/parties/party-manager.js +2 -1
- package/dist/src/parties/party-manager.js.map +1 -1
- package/dist/src/parties/party-manager.test.js +7 -22
- package/dist/src/parties/party-manager.test.js.map +1 -1
- package/dist/src/protocol/credentials-signer.d.ts +4 -4
- package/dist/src/protocol/credentials-signer.d.ts.map +1 -1
- package/dist/src/protocol/credentials-signer.js +8 -8
- package/dist/src/protocol/credentials-signer.js.map +1 -1
- package/dist/src/protocol/identity-credentials.d.ts +21 -0
- package/dist/src/protocol/identity-credentials.d.ts.map +1 -0
- package/dist/src/protocol/identity-credentials.js +35 -0
- package/dist/src/protocol/identity-credentials.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -17
- package/src/echo.test.ts +10 -10
- package/src/echo.ts +1 -1
- package/src/halo/halo.ts +8 -1
- package/src/halo/identity-manager.ts +13 -14
- package/src/halo/identity.ts +39 -41
- package/src/invitations/offline-invitation-claimer.ts +6 -7
- package/src/parties/party-factory.ts +13 -20
- package/src/parties/party-manager.test.ts +8 -42
- package/src/parties/party-manager.ts +4 -3
- package/src/protocol/credentials-signer.ts +9 -9
- package/src/protocol/identity-credentials.ts +56 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/halo/identity.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/halo/identity.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,mDAAyG;AACzG,uCAA4C;AAE5C,uEAAmE;AAMnE,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,uBAAuB,CAAC,CAAC;AAE3C;;;;GAIG;AACH,MAAa,QAAQ;IAKnB;;OAEG;IACH,YACmB,QAAiB,EACjB,KAAgB;;QADhB,aAAQ,GAAR,QAAQ,CAAS;QACjB,UAAK,GAAL,KAAK,CAAW;QAEjC,IAAI,CAAC,YAAY,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,mCAAI,IAAA,qBAAa,GAAE,CAAC;QACnI,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAO,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,MAAM,EAAE,CAAC,CAAC,mCAAI,IAAA,qBAAa,GAAE,CAAC;QAC5G,IAAI,CAAC,eAAe,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7E,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAI,WAAW;;QACb,OAAO,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IACvD,CAAC;IAED;;;OAGG;IACH,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IACjC,CAAC;IAED,IAAI,eAAe;;QACjB,OAAO,MAAA,IAAI,CAAC,KAAK,CAAC,eAAe,mCAAI,IAAA,qBAAa,GAAE,CAAC;IACvD,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAChC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,uBAAuB;QACrB,OAAO,IAAI,sCAAiB,CAC1B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;CACF;AA7ED,4BA6EC;AAID,SAAS,yBAAyB,CAAE,IAAe,EAAE,SAAoB;IACvE,IAAI;QACF,OAAO,qBAAO,CAAC,aAAa,CAC1B,SAAS,CAAC,SAAS,EACnB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,QAAQ,CACd,CAAC;KACH;IAAC,OAAO,GAAQ,EAAE;QACjB,GAAG,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,GAAG,CAAC;KACX;AACH,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ClaimResponse, GreetingCommandPlugin, SecretProvider } from '@dxos/credentials';
|
|
3
3
|
import { NetworkManager } from '@dxos/network-manager';
|
|
4
|
-
import {
|
|
4
|
+
import { CredentialsSigner } from '../protocol';
|
|
5
5
|
import { GreetingState } from './greeting-responder';
|
|
6
6
|
import { InvitationDescriptor } from './invitation-descriptor';
|
|
7
7
|
import { InvitationFactory } from './invitation-factory';
|
|
@@ -36,6 +36,6 @@ export declare class OfflineInvitationClaimer {
|
|
|
36
36
|
* @param {InvitationFactory} invitationManager
|
|
37
37
|
*/
|
|
38
38
|
static createOfflineInvitationClaimHandler(invitationManager: InvitationFactory): (message: any, remotePeerId: Buffer, peerId: Buffer) => Promise<import("@dxos/credentials").WithTypeUrl<ClaimResponse>>;
|
|
39
|
-
static createSecretProvider(
|
|
39
|
+
static createSecretProvider(credentials: CredentialsSigner): SecretProvider;
|
|
40
40
|
}
|
|
41
41
|
//# sourceMappingURL=offline-invitation-claimer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline-invitation-claimer.d.ts","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,aAAa,EAGb,qBAAqB,EAKrB,cAAc,EAIf,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"offline-invitation-claimer.d.ts","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,aAAa,EAGb,qBAAqB,EAKrB,cAAc,EAIf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAMzD;;;GAGG;AACH,qBAAa,wBAAwB;IAKjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IALxC,cAAc,CAAC,EAAE,qBAAqB,CAAC;IACvC,MAAM,gBAA6B;gBAGhB,eAAe,EAAE,cAAc,EAC/B,qBAAqB,EAAE,oBAAoB;IAK9D,IAAI,KAAK,kBAER;IAED;;;OAGG;IACG,OAAO,CAAE,OAAO,SAAkB;IA6BxC;;;;;OAKG;IACG,KAAK;IAuBL,UAAU;IAMV,OAAO;IAOb;;;;OAIG;IACH,MAAM,CAAC,mCAAmC,CAAE,iBAAiB,EAAE,iBAAiB;IAoChF,MAAM,CAAC,oBAAoB,CAAE,WAAW,EAAE,iBAAiB,GAAG,cAAc;CAgB7E"}
|
|
@@ -12,7 +12,6 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
15
|
-
const debug_2 = require("@dxos/debug");
|
|
16
15
|
const network_manager_1 = require("@dxos/network-manager");
|
|
17
16
|
const errors_1 = require("../errors");
|
|
18
17
|
const greeting_protocol_provider_1 = require("./greeting-protocol-provider");
|
|
@@ -124,14 +123,13 @@ class OfflineInvitationClaimer {
|
|
|
124
123
|
return claimHandler.createMessageHandler();
|
|
125
124
|
}
|
|
126
125
|
// The secretProvider should provide an `Auth` message signed directly by the Identity key.
|
|
127
|
-
static createSecretProvider(
|
|
126
|
+
static createSecretProvider(credentials) {
|
|
128
127
|
return async (info) => {
|
|
129
|
-
var _a, _b;
|
|
130
128
|
return Buffer.from(credentials_1.codec.encode(
|
|
131
129
|
/* The signed portion of the Auth message includes the ID and authNonce provided
|
|
132
130
|
* by the `info` object. These values will be validated on the other end.
|
|
133
131
|
*/
|
|
134
|
-
(0, credentials_1.createAuthMessage)(
|
|
132
|
+
(0, credentials_1.createAuthMessage)(credentials.signer, info.id.value, credentials.getIdentityKey(), credentials.getDeviceSigningKeys(), undefined, info.authNonce.value)));
|
|
135
133
|
};
|
|
136
134
|
}
|
|
137
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline-invitation-claimer.js","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAA2C;AAC3C,mDAa2B;AAC3B,yCAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"offline-invitation-claimer.js","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { PublicKey } from '@dxos/crypto';
|
|
|
3
3
|
import { PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
|
|
4
4
|
import { ModelFactory } from '@dxos/model-factory';
|
|
5
5
|
import { NetworkManager } from '@dxos/network-manager';
|
|
6
|
-
import { IdentityProvider } from '../halo';
|
|
7
6
|
import { InvitationDescriptor } from '../invitations';
|
|
8
7
|
import { PartyFeedProvider, PartyOptions } from '../pipeline';
|
|
8
|
+
import { IdentityCredentialsProvider } from '../protocol/identity-credentials';
|
|
9
9
|
import { SnapshotStore } from '../snapshots';
|
|
10
10
|
import { DataParty } from './data-party';
|
|
11
11
|
/**
|
|
@@ -18,7 +18,7 @@ export declare class PartyFactory {
|
|
|
18
18
|
private readonly _snapshotStore;
|
|
19
19
|
private readonly _feedProviderFactory;
|
|
20
20
|
private readonly _options;
|
|
21
|
-
constructor(_identityProvider:
|
|
21
|
+
constructor(_identityProvider: IdentityCredentialsProvider, _networkManager: NetworkManager, _modelFactory: ModelFactory, _snapshotStore: SnapshotStore, _feedProviderFactory: (partyKey: PublicKey) => PartyFeedProvider, _options?: PartyOptions);
|
|
22
22
|
/**
|
|
23
23
|
* Create a new party with a new feed for it. Writes a party genensis message to this feed.
|
|
24
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-factory.d.ts","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,OAAO,EAEP,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAyB,SAAS,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAiC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,
|
|
1
|
+
{"version":3,"file":"party-factory.d.ts","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,OAAO,EAEP,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAyB,SAAS,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAiC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,EAEc,oBAAoB,EACxC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AAI1D;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBALR,iBAAiB,EAAE,2BAA2B,EAC9C,eAAe,EAAE,cAAc,EAC/B,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,aAAa,EAC7B,oBAAoB,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,iBAAiB,EAChE,QAAQ,GAAE,YAAiB;IAG9C;;OAEG;IAEG,WAAW,IAAK,OAAO,CAAC,SAAS,CAAC;IAuDxC;;;;OAIG;IACG,QAAQ,CAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,GAAE,OAAO,EAAO;IAuCzD;;;;OAIG;IACG,cAAc,CAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,GAAE,OAAO,EAAO,EAAE,gBAAgB,CAAC,EAAE,SAAS;IAyBvF,0BAA0B,CAAE,QAAQ,EAAE,aAAa;IASnD,SAAS,CAAE,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IA+C1G,UAAU,CAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;CAsF/D"}
|
|
@@ -42,8 +42,6 @@ class PartyFactory {
|
|
|
42
42
|
async createParty() {
|
|
43
43
|
var _a;
|
|
44
44
|
const identity = (_a = this._identityProvider()) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new errors_1.IdentityNotInitializedError());
|
|
45
|
-
(0, assert_1.default)(identity.identityGenesis, 'HALO not initialized.');
|
|
46
|
-
(0, assert_1.default)(identity.deviceKeyChain, 'Device KeyChain not initialized.');
|
|
47
45
|
(0, assert_1.default)(!this._options.readOnly, 'PartyFactory is read-only.');
|
|
48
46
|
const partyKey = await identity.keyring.createKeyRecord({ type: credentials_1.KeyType.PARTY });
|
|
49
47
|
const party = await this.constructParty(partyKey.publicKey);
|
|
@@ -51,14 +49,14 @@ class PartyFactory {
|
|
|
51
49
|
await party.open();
|
|
52
50
|
const writableFeed = await party.feedProvider.createOrOpenWritableFeed();
|
|
53
51
|
// PartyGenesis (self-signed by Party).
|
|
54
|
-
await party.processor.writeHaloMessage((0, credentials_1.createPartyGenesisMessage)(identity.
|
|
52
|
+
await party.processor.writeHaloMessage((0, credentials_1.createPartyGenesisMessage)(identity.keyring, partyKey, writableFeed.key, partyKey));
|
|
55
53
|
// KeyAdmit (IdentityGenesis in an Envelope signed by Party).
|
|
56
|
-
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.
|
|
54
|
+
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.keyring, partyKey.publicKey, (0, credentials_1.wrapMessage)(identity.identityGenesis), [partyKey]));
|
|
57
55
|
// FeedAdmit (signed by the Device KeyChain).
|
|
58
|
-
await party.processor.writeHaloMessage((0, credentials_1.createFeedAdmitMessage)(identity.
|
|
56
|
+
await party.processor.writeHaloMessage((0, credentials_1.createFeedAdmitMessage)(identity.keyring, partyKey.publicKey, writableFeed.key, [identity.deviceKeyChain]));
|
|
59
57
|
// IdentityInfo in an Envelope signed by the Device KeyChain.
|
|
60
58
|
if (identity.identityInfo) {
|
|
61
|
-
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.
|
|
59
|
+
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.keyring, partyKey.publicKey, (0, credentials_1.wrapMessage)(identity.identityInfo), [identity.deviceKeyChain]));
|
|
62
60
|
}
|
|
63
61
|
// Create special properties item.
|
|
64
62
|
await party.database.createItem({ model: object_model_1.ObjectModel, type: data_party_1.PARTY_ITEM_TYPE });
|
|
@@ -84,12 +82,11 @@ class PartyFactory {
|
|
|
84
82
|
(0, assert_1.default)(feedKeyPair, 'Keypair for writable feed not found.');
|
|
85
83
|
const party = new data_party_1.DataParty(partyKey, this._modelFactory, this._snapshotStore, feedProvider, identity.createCredentialsSigner(), identity.preferences, this._networkManager, hints, undefined, this._options);
|
|
86
84
|
await party.open();
|
|
87
|
-
(0, assert_1.default)(identity.identityKey, 'No identity key.');
|
|
88
85
|
const isHalo = identity.identityKey.publicKey.equals(partyKey);
|
|
89
86
|
const signingKey = isHalo ? identity.deviceKey : identity.deviceKeyChain;
|
|
90
87
|
(0, assert_1.default)(signingKey, 'No device key or keychain.');
|
|
91
88
|
// Write the Feed genesis message.
|
|
92
|
-
await party.processor.writeHaloMessage((0, credentials_1.createFeedAdmitMessage)(identity.
|
|
89
|
+
await party.processor.writeHaloMessage((0, credentials_1.createFeedAdmitMessage)(identity.keyring, partyKey, feedKeyPair.publicKey, [signingKey]));
|
|
93
90
|
return party;
|
|
94
91
|
}
|
|
95
92
|
/**
|
|
@@ -129,20 +126,16 @@ class PartyFactory {
|
|
|
129
126
|
await invitationClaimer.destroy();
|
|
130
127
|
}
|
|
131
128
|
// TODO(burdon): Factor out.
|
|
132
|
-
const initiator = new invitations_1.GreetingInitiator(this._networkManager, invitationDescriptor, async (partyKey, nonce) =>
|
|
133
|
-
var _a;
|
|
134
|
-
return [(0, invitations_1.createDataPartyAdmissionMessages)(identity.createCredentialsSigner(), partyKey, (_a = identity.identityGenesis) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new errors_1.IdentityNotInitializedError()), nonce)];
|
|
135
|
-
});
|
|
129
|
+
const initiator = new invitations_1.GreetingInitiator(this._networkManager, invitationDescriptor, async (partyKey, nonce) => [(0, invitations_1.createDataPartyAdmissionMessages)(identity.createCredentialsSigner(), partyKey, identity.identityGenesis, nonce)]);
|
|
136
130
|
await initiator.connect();
|
|
137
131
|
const { partyKey, hints } = await initiator.redeemInvitation(secretProvider);
|
|
138
132
|
const party = await this.addParty(partyKey, hints);
|
|
139
133
|
await initiator.destroy();
|
|
140
134
|
if (!haloInvitation) {
|
|
141
|
-
(0, assert_1.default)(identity.deviceKeyChain);
|
|
142
135
|
// Copy our signed IdentityInfo into the new Party.
|
|
143
136
|
const infoMessage = identity.identityInfo;
|
|
144
137
|
if (infoMessage) {
|
|
145
|
-
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.
|
|
138
|
+
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.keyring, partyKey, (0, credentials_1.wrapMessage)(infoMessage), [identity.deviceKeyChain]));
|
|
146
139
|
}
|
|
147
140
|
}
|
|
148
141
|
return party;
|
|
@@ -151,22 +144,20 @@ class PartyFactory {
|
|
|
151
144
|
var _a, _b, _c;
|
|
152
145
|
const identity = (_a = this._identityProvider()) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new errors_1.IdentityNotInitializedError());
|
|
153
146
|
(0, assert_1.default)(!this._options.readOnly, 'PartyFactory is read-only');
|
|
154
|
-
(0, assert_1.default)(identity.identityGenesis, 'IdentityGenesis must exist');
|
|
155
|
-
(0, assert_1.default)(identity.deviceKeyChain, 'Device KeyChain must exist');
|
|
156
147
|
const partyKey = await identity.keyring.createKeyRecord({ type: credentials_1.KeyType.PARTY });
|
|
157
148
|
const party = await this.constructParty(partyKey.publicKey);
|
|
158
149
|
// Connect the pipeline.
|
|
159
150
|
await party.open();
|
|
160
151
|
const writableFeed = await party.feedProvider.createOrOpenWritableFeed();
|
|
161
152
|
// PartyGenesis (self-signed by Party).
|
|
162
|
-
await party.processor.writeHaloMessage((0, credentials_1.createPartyGenesisMessage)(identity.
|
|
153
|
+
await party.processor.writeHaloMessage((0, credentials_1.createPartyGenesisMessage)(identity.keyring, partyKey, writableFeed.key, partyKey));
|
|
163
154
|
// KeyAdmit (IdentityGenesis in an Envelope signed by Party).
|
|
164
|
-
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.
|
|
155
|
+
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.keyring, partyKey.publicKey, (0, credentials_1.wrapMessage)(identity.identityGenesis), [partyKey]));
|
|
165
156
|
// FeedAdmit (signed by the Device KeyChain).
|
|
166
|
-
await party.processor.writeHaloMessage((0, credentials_1.createFeedAdmitMessage)(identity.
|
|
157
|
+
await party.processor.writeHaloMessage((0, credentials_1.createFeedAdmitMessage)(identity.keyring, partyKey.publicKey, writableFeed.key, [identity.deviceKeyChain]));
|
|
167
158
|
// IdentityInfo in an Envelope signed by the Device KeyChain.
|
|
168
159
|
if (identity.identityInfo) {
|
|
169
|
-
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.
|
|
160
|
+
await party.processor.writeHaloMessage((0, credentials_1.createEnvelopeMessage)(identity.keyring, partyKey.publicKey, (0, credentials_1.wrapMessage)(identity.identityInfo), [identity.deviceKeyChain]));
|
|
170
161
|
}
|
|
171
162
|
// const keyAdmitMessage = snapshot.halo?.messages?.[1];
|
|
172
163
|
// assert(keyAdmitMessage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-factory.js","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,mDAQ2B;AAC3B,yCAAgE;AAChE,uCAA0D;AAC1D,uDAAwG;AAGxG,qDAAiD;AAEjD,sCAAwD;
|
|
1
|
+
{"version":3,"file":"party-factory.js","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { KeyHint, SecretProvider } from '@dxos/credentials';
|
|
3
3
|
import { PartyKey, PartySnapshot } from '@dxos/echo-protocol';
|
|
4
|
-
import { IdentityProvider } from '../halo';
|
|
5
4
|
import { InvitationDescriptor } from '../invitations';
|
|
6
5
|
import { MetadataStore } from '../pipeline';
|
|
6
|
+
import { IdentityCredentialsProvider } from '../protocol/identity-credentials';
|
|
7
7
|
import { SnapshotStore } from '../snapshots';
|
|
8
8
|
import { DataParty } from './data-party';
|
|
9
9
|
import { PartyFactory } from './party-factory';
|
|
@@ -27,7 +27,7 @@ export declare class PartyManager {
|
|
|
27
27
|
private readonly _parties;
|
|
28
28
|
private readonly _onCloseHandlers;
|
|
29
29
|
private _open;
|
|
30
|
-
constructor(_metadataStore: MetadataStore, _snapshotStore: SnapshotStore, _identityProvider:
|
|
30
|
+
constructor(_metadataStore: MetadataStore, _snapshotStore: SnapshotStore, _identityProvider: IdentityCredentialsProvider, _partyFactory: PartyFactory);
|
|
31
31
|
get isOpen(): boolean;
|
|
32
32
|
get parties(): DataParty[];
|
|
33
33
|
open(onProgressCallback?: (progress: OpenProgress) => void): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-manager.d.ts","sourceRoot":"","sources":["../../../src/parties/party-manager.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,EAAW,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"party-manager.d.ts","sourceRoot":"","sources":["../../../src/parties/party-manager.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,EAAW,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAyC,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAI7C,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;GAIG;AACH,qBAAa,YAAY;IAcrB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAfhC,QAAQ,CAAC,MAAM,mBAA0B;IAGzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4D;IAIrF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsB;IAEvD,OAAO,CAAC,KAAK,CAAS;gBAGH,cAAc,EAAE,aAAa,EAC7B,cAAc,EAAE,aAAa,EAC7B,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,YAAY;IAG9C,IAAI,MAAM,YAET;IAED,IAAI,OAAO,IAAK,SAAS,EAAE,CAE1B;IAKK,IAAI,CAAE,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI;IAiD3D,KAAK;IAuBX;;OAEG;IAEG,WAAW,IAAK,OAAO,CAAC,SAAS,CAAC;IAaxC;;;;OAIG;IAEG,QAAQ,CAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,GAAE,OAAO,EAAO;IAqBnD,SAAS,CAAE,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,cAAc;IAsBrF,UAAU,CAAE,QAAQ,EAAE,aAAa;IAqBzC,OAAO,CAAC,SAAS;YAkCH,iBAAiB;YAejB,kBAAkB;YAyClB,mBAAmB;CAkBlC"}
|
|
@@ -58,9 +58,10 @@ class PartyManager {
|
|
|
58
58
|
}
|
|
59
59
|
this._open = true;
|
|
60
60
|
let partyKeys = this._metadataStore.parties.map(party => party.key).filter(util_1.boolGuard);
|
|
61
|
+
// Identity may be undefined, for example, on the first start.
|
|
61
62
|
const identity = this._identityProvider();
|
|
62
63
|
// TODO(telackey): Does it make any sense to load other parties if we don't have an HALO?
|
|
63
|
-
if (identity
|
|
64
|
+
if (identity) {
|
|
64
65
|
partyKeys = partyKeys.filter(partyKey => !partyKey.equals(identity.identityKey.publicKey));
|
|
65
66
|
}
|
|
66
67
|
// TODO(burdon): Does this make sense?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-manager.js","sourceRoot":"","sources":["../../../src/parties/party-manager.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAC1B,wEAAyC;AAEzC,uCAAkD;AAClD,mDAAqE;AACrE,yCAAyC;AACzC,uCAAoC;AAEpC,qCAAmD;AAMnD,6CAAgF;AAGnE,QAAA,yBAAyB,GAAG,GAAG,CAAC;AAE7C,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAC;AAQhD;;;;GAIG;AACH,MAAa,YAAY;IAavB,YACmB,cAA6B,EAC7B,cAA6B,EAC7B,
|
|
1
|
+
{"version":3,"file":"party-manager.js","sourceRoot":"","sources":["../../../src/parties/party-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,9 +22,9 @@ const network_manager_1 = require("@dxos/network-manager");
|
|
|
22
22
|
const object_model_1 = require("@dxos/object-model");
|
|
23
23
|
const random_access_multi_storage_1 = require("@dxos/random-access-multi-storage");
|
|
24
24
|
const testutils_1 = require("@dxos/testutils");
|
|
25
|
-
const halo_1 = require("../halo");
|
|
26
25
|
const invitations_1 = require("../invitations");
|
|
27
26
|
const pipeline_1 = require("../pipeline");
|
|
27
|
+
const identity_credentials_1 = require("../protocol/identity-credentials");
|
|
28
28
|
const snapshots_1 = require("../snapshots");
|
|
29
29
|
const testing_1 = require("../testing");
|
|
30
30
|
const util_1 = require("../util");
|
|
@@ -43,21 +43,11 @@ const setup = async () => {
|
|
|
43
43
|
const keyring = new credentials_1.Keyring();
|
|
44
44
|
const metadataStore = new pipeline_1.MetadataStore((0, util_1.createRamStorage)());
|
|
45
45
|
const feedStore = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM), { valueEncoding: echo_protocol_1.codec });
|
|
46
|
-
const identityKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.IDENTITY });
|
|
47
|
-
(0, assert_1.default)(keyring.keys.length === 1);
|
|
48
46
|
const snapshotStore = new snapshots_1.SnapshotStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM));
|
|
49
47
|
const modelFactory = new model_factory_1.ModelFactory().registerModel(object_model_1.ObjectModel);
|
|
50
48
|
const networkManager = new network_manager_1.NetworkManager();
|
|
51
49
|
const feedProviderFactory = (partyKey) => new pipeline_1.PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
|
|
52
|
-
const
|
|
53
|
-
writeLogger: (0, testing_1.messageLogger)('<<<'),
|
|
54
|
-
readLogger: (0, testing_1.messageLogger)('>>>')
|
|
55
|
-
});
|
|
56
|
-
const haloParty = await haloFactory.createHalo({
|
|
57
|
-
identityDisplayName: identityKey.publicKey.humanize()
|
|
58
|
-
});
|
|
59
|
-
(0, testutils_1.afterTest)(() => haloParty.close());
|
|
60
|
-
const identity = new halo_1.Identity(keyring, haloParty);
|
|
50
|
+
const identity = await (0, identity_credentials_1.createTestIdentityCredentials)(keyring);
|
|
61
51
|
const partyFactory = new party_factory_1.PartyFactory(() => identity, networkManager, modelFactory, snapshotStore, feedProviderFactory, {
|
|
62
52
|
writeLogger: (0, testing_1.messageLogger)('<<<'),
|
|
63
53
|
readLogger: (0, testing_1.messageLogger)('>>>')
|
|
@@ -124,16 +114,13 @@ describe('Party manager', () => {
|
|
|
124
114
|
const feedStore = new feed_store_1.FeedStore(storage, { valueEncoding: echo_protocol_1.codec });
|
|
125
115
|
const keyring = new credentials_1.Keyring();
|
|
126
116
|
const metadataStore = new pipeline_1.MetadataStore((0, util_1.createRamStorage)());
|
|
127
|
-
const identityKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.IDENTITY });
|
|
128
|
-
await keyring.createKeyRecord({ type: credentials_1.KeyType.DEVICE });
|
|
129
117
|
const modelFactory = new model_factory_1.ModelFactory().registerModel(object_model_1.ObjectModel);
|
|
130
118
|
const snapshotStore = new snapshots_1.SnapshotStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM));
|
|
131
119
|
const networkManager = new network_manager_1.NetworkManager();
|
|
132
120
|
const feedProviderFactory = (partyKey) => new pipeline_1.PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
|
|
133
|
-
const
|
|
134
|
-
const
|
|
135
|
-
const
|
|
136
|
-
const partyManager = new party_manager_1.PartyManager(metadataStore, snapshotStore, () => identityManager.identity, partyFactory);
|
|
121
|
+
const identity = await (0, identity_credentials_1.createTestIdentityCredentials)(keyring);
|
|
122
|
+
const partyFactory = new party_factory_1.PartyFactory(() => identity, networkManager, modelFactory, snapshotStore, feedProviderFactory);
|
|
123
|
+
const partyManager = new party_manager_1.PartyManager(metadataStore, snapshotStore, () => identity, partyFactory);
|
|
137
124
|
/* TODO(telackey): Injecting "raw" Parties into the feeds behind the scenes seems fishy to me, as it writes the
|
|
138
125
|
* Party messages in a slightly different way than the code inside PartyFactory does, and so could easily diverge
|
|
139
126
|
* from reality. Perhaps the thing to do would be to setup temporary storage, add the Parties in the usual way
|
|
@@ -153,7 +140,7 @@ describe('Party manager', () => {
|
|
|
153
140
|
const feedKey = keyring.getFullKey(feed.key);
|
|
154
141
|
(0, assert_1.default)(feedKey);
|
|
155
142
|
const feedStream = (0, feed_store_1.createWritableFeedStream)(feed);
|
|
156
|
-
feedStream.write({ halo: (0, credentials_1.createPartyGenesisMessage)(keyring, partyKey, feedKey.publicKey, identityKey) });
|
|
143
|
+
feedStream.write({ halo: (0, credentials_1.createPartyGenesisMessage)(keyring, partyKey, feedKey.publicKey, identity.identityKey) });
|
|
157
144
|
feedStream.write({
|
|
158
145
|
echo: (0, debug_2.checkType)({
|
|
159
146
|
itemId: 'foo',
|
|
@@ -166,8 +153,6 @@ describe('Party manager', () => {
|
|
|
166
153
|
});
|
|
167
154
|
}
|
|
168
155
|
// Open.
|
|
169
|
-
await identityManager.createHalo();
|
|
170
|
-
(0, testutils_1.afterTest)(() => identityManager.close());
|
|
171
156
|
await partyManager.open();
|
|
172
157
|
(0, expect_1.default)(partyManager.parties).toHaveLength(numParties);
|
|
173
158
|
await partyManager.close();
|
|
@@ -342,7 +327,7 @@ describe('Party manager', () => {
|
|
|
342
327
|
.createOfflineInvitation(identityB.identityKey.publicKey);
|
|
343
328
|
// Redeem the invitation on B.
|
|
344
329
|
(0, expect_1.default)(partyManagerB.parties).toHaveLength(0);
|
|
345
|
-
const partyB = await partyManagerB.joinParty(invitationDescriptor, invitations_1.OfflineInvitationClaimer.createSecretProvider(identityB));
|
|
330
|
+
const partyB = await partyManagerB.joinParty(invitationDescriptor, invitations_1.OfflineInvitationClaimer.createSecretProvider(identityB.createCredentialsSigner()));
|
|
346
331
|
(0, expect_1.default)(partyB).toBeDefined();
|
|
347
332
|
log(`Joined ${partyB.key.toHex()}`);
|
|
348
333
|
let itemA = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-manager.test.js","sourceRoot":"","sources":["../../../src/parties/party-manager.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"party-manager.test.js","sourceRoot":"","sources":["../../../src/parties/party-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,15 @@ import { KeyChain, KeyRecord, Keyring, Signer } from '@dxos/credentials';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare class CredentialsSigner {
|
|
6
6
|
private readonly _signer;
|
|
7
|
-
private readonly
|
|
8
|
-
private readonly
|
|
9
|
-
private readonly
|
|
7
|
+
private readonly _identityKey;
|
|
8
|
+
private readonly _deviceKey;
|
|
9
|
+
private readonly _signingKeys;
|
|
10
10
|
/**
|
|
11
11
|
* Queries IDENTITY and DEVICE keys from the keyring.
|
|
12
12
|
* Uses the device key without keychain for signing.
|
|
13
13
|
*/
|
|
14
14
|
static createDirectDeviceSigner(keyring: Keyring): CredentialsSigner;
|
|
15
|
-
constructor(_signer: Signer,
|
|
15
|
+
constructor(_signer: Signer, _identityKey: KeyRecord, _deviceKey: KeyRecord, _signingKeys: KeyRecord | KeyChain);
|
|
16
16
|
get signer(): Signer;
|
|
17
17
|
getIdentityKey(): KeyRecord;
|
|
18
18
|
getDeviceKey(): KeyRecord;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials-signer.d.ts","sourceRoot":"","sources":["../../../src/protocol/credentials-signer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG1F;;GAEG;AACH,qBAAa,iBAAiB;IAkB1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"credentials-signer.d.ts","sourceRoot":"","sources":["../../../src/protocol/credentials-signer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG1F;;GAEG;AACH,qBAAa,iBAAiB;IAkB1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IApB/B;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAE,OAAO,EAAE,OAAO;gBAa9B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,SAAS,EACvB,UAAU,EAAE,SAAS,EACrB,YAAY,EAAE,SAAS,GAAG,QAAQ;IAGrD,IAAI,MAAM,IAAK,MAAM,CAEpB;IAED,cAAc,IAAK,SAAS;IAI5B,YAAY,IAAK,SAAS;IAI1B;;;;;;;;;OASG;IACH,oBAAoB,IAAK,SAAS,GAAG,QAAQ;CAG9C"}
|
|
@@ -10,11 +10,11 @@ const debug_1 = require("@dxos/debug");
|
|
|
10
10
|
* Contains a signer (keyring), provides signing keys to create signed credential messages.
|
|
11
11
|
*/
|
|
12
12
|
class CredentialsSigner {
|
|
13
|
-
constructor(_signer,
|
|
13
|
+
constructor(_signer, _identityKey, _deviceKey, _signingKeys) {
|
|
14
14
|
this._signer = _signer;
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
15
|
+
this._identityKey = _identityKey;
|
|
16
|
+
this._deviceKey = _deviceKey;
|
|
17
|
+
this._signingKeys = _signingKeys;
|
|
18
18
|
}
|
|
19
19
|
/**
|
|
20
20
|
* Queries IDENTITY and DEVICE keys from the keyring.
|
|
@@ -24,16 +24,16 @@ class CredentialsSigner {
|
|
|
24
24
|
var _a, _b;
|
|
25
25
|
const identityKey = (_a = keyring.findKey(credentials_1.Filter.matches({ type: credentials_1.KeyType.IDENTITY, own: true, trusted: true }))) !== null && _a !== void 0 ? _a : (0, debug_1.failUndefined)();
|
|
26
26
|
const deviceKey = (_b = keyring.findKey(credentials_1.Keyring.signingFilter({ type: credentials_1.KeyType.DEVICE }))) !== null && _b !== void 0 ? _b : (0, debug_1.failUndefined)();
|
|
27
|
-
return new CredentialsSigner(keyring,
|
|
27
|
+
return new CredentialsSigner(keyring, identityKey, deviceKey, deviceKey);
|
|
28
28
|
}
|
|
29
29
|
get signer() {
|
|
30
30
|
return this._signer;
|
|
31
31
|
}
|
|
32
32
|
getIdentityKey() {
|
|
33
|
-
return this.
|
|
33
|
+
return this._identityKey;
|
|
34
34
|
}
|
|
35
35
|
getDeviceKey() {
|
|
36
|
-
return this.
|
|
36
|
+
return this._deviceKey;
|
|
37
37
|
}
|
|
38
38
|
/**
|
|
39
39
|
* @returns Either a device key record or a key-chain for the device key.
|
|
@@ -46,7 +46,7 @@ class CredentialsSigner {
|
|
|
46
46
|
* Devices need to sign with their keyChain including the device key admission credential in the signature.
|
|
47
47
|
*/
|
|
48
48
|
getDeviceSigningKeys() {
|
|
49
|
-
return this.
|
|
49
|
+
return this._signingKeys;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
exports.CredentialsSigner = CredentialsSigner;
|