@dxos/client-services 0.7.5-main.b19bfc8 → 0.7.5-main.d9d2d4e

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.
@@ -6,7 +6,7 @@ import {
6
6
  InvitationsManager,
7
7
  ServiceContext,
8
8
  SpaceInvitationProtocol
9
- } from "../chunk-2FL5LYPQ.mjs";
9
+ } from "../chunk-2U3XQ4IN.mjs";
10
10
 
11
11
  // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
12
12
  import { createCredential } from "@dxos/credentials";
@@ -10,7 +10,7 @@ export declare class EdgeIdentityRecoveryManager {
10
10
  private readonly _identityProvider;
11
11
  private readonly _acceptRecoveredIdentity;
12
12
  constructor(_keyring: Keyring, _edgeClient: EdgeHttpClient | undefined, _identityProvider: () => Identity | undefined, _acceptRecoveredIdentity: (params: JoinIdentityParams) => Promise<Identity>);
13
- createRecoveryCredential({ recoveryKey, algorithm }: CreateRecoveryCredentialRequest): Promise<{
13
+ createRecoveryCredential({ data }: CreateRecoveryCredentialRequest): Promise<{
14
14
  recoveryCode: string | undefined;
15
15
  }>;
16
16
  requestRecoveryChallenge(): Promise<{
@@ -18,7 +18,7 @@ export declare class EdgeIdentityRecoveryManager {
18
18
  controlFeedKey: PublicKey;
19
19
  challenge: string;
20
20
  }>;
21
- recoverIdentityWithExternalSignature({ identityDid, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData, }: RecoverIdentityRequest.ExternalSignature): Promise<void>;
21
+ recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData, }: RecoverIdentityRequest.ExternalSignature): Promise<void>;
22
22
  recoverIdentity({ recoveryCode }: {
23
23
  recoveryCode: string;
24
24
  }): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"identity-recovery-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-recovery-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQvC,OAAO,EACL,KAAK,+BAA+B,EACpC,KAAK,sBAAsB,EAC5B,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAHxB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,cAAc,GAAG,SAAS,EACvC,iBAAiB,EAAE,MAAM,QAAQ,GAAG,SAAS,EAC7C,wBAAwB,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,QAAQ,CAAC;IAGjF,wBAAwB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,+BAA+B;;;IA8BpF,wBAAwB;;;;;IAyBxB,oCAAoC,CAAC,EAChD,WAAW,EACX,SAAS,EACT,cAAc,EACd,SAAS,EACT,cAAc,EACd,iBAAiB,GAClB,EAAE,sBAAsB,CAAC,iBAAiB;IA8B9B,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE;CAuCxE"}
1
+ {"version":3,"file":"identity-recovery-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-recovery-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQvC,OAAO,EACL,KAAK,+BAA+B,EACpC,KAAK,sBAAsB,EAC5B,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAHxB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,cAAc,GAAG,SAAS,EACvC,iBAAiB,EAAE,MAAM,QAAQ,GAAG,SAAS,EAC7C,wBAAwB,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,QAAQ,CAAC;IAGjF,wBAAwB,CAAC,EAAE,IAAI,EAAE,EAAE,+BAA+B;;;IAsClE,wBAAwB;;;;;IAyBxB,oCAAoC,CAAC,EAChD,SAAS,EACT,SAAS,EACT,cAAc,EACd,SAAS,EACT,cAAc,EACd,iBAAiB,GAClB,EAAE,sBAAsB,CAAC,iBAAiB;IA8B9B,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE;CAuCxE"}
@@ -1,2 +1,2 @@
1
- export declare const DXOS_VERSION = "0.7.5-main.b19bfc8";
1
+ export declare const DXOS_VERSION = "0.7.5-main.d9d2d4e";
2
2
  //# sourceMappingURL=version.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/client-services",
3
- "version": "0.7.5-main.b19bfc8",
3
+ "version": "0.7.5-main.d9d2d4e",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,48 +43,48 @@
43
43
  "dependencies": {
44
44
  "cbor-x": "^1.5.4",
45
45
  "platform": "^1.3.6",
46
- "@dxos/async": "0.7.5-main.b19bfc8",
47
- "@dxos/client-protocol": "0.7.5-main.b19bfc8",
48
- "@dxos/automerge": "0.7.5-main.b19bfc8",
49
- "@dxos/codec-protobuf": "0.7.5-main.b19bfc8",
50
- "@dxos/context": "0.7.5-main.b19bfc8",
51
- "@dxos/config": "0.7.5-main.b19bfc8",
52
- "@dxos/credentials": "0.7.5-main.b19bfc8",
53
- "@dxos/crypto": "0.7.5-main.b19bfc8",
54
- "@dxos/debug": "0.7.5-main.b19bfc8",
55
- "@dxos/echo-protocol": "0.7.5-main.b19bfc8",
56
- "@dxos/echo-pipeline": "0.7.5-main.b19bfc8",
57
- "@dxos/echo-db": "0.7.5-main.b19bfc8",
58
- "@dxos/echo-schema": "0.7.5-main.b19bfc8",
59
- "@dxos/edge-client": "0.7.5-main.b19bfc8",
60
- "@dxos/feed-store": "0.7.5-main.b19bfc8",
61
- "@dxos/invariant": "0.7.5-main.b19bfc8",
62
- "@dxos/indexing": "0.7.5-main.b19bfc8",
63
- "@dxos/keyring": "0.7.5-main.b19bfc8",
64
- "@dxos/kv-store": "0.7.5-main.b19bfc8",
65
- "@dxos/keys": "0.7.5-main.b19bfc8",
66
- "@dxos/lock-file": "0.7.5-main.b19bfc8",
67
- "@dxos/messaging": "0.7.5-main.b19bfc8",
68
- "@dxos/node-std": "0.7.5-main.b19bfc8",
69
- "@dxos/log": "0.7.5-main.b19bfc8",
70
- "@dxos/network-manager": "0.7.5-main.b19bfc8",
71
- "@dxos/random-access-storage": "0.7.5-main.b19bfc8",
72
- "@dxos/protocols": "0.7.5-main.b19bfc8",
73
- "@dxos/teleport": "0.7.5-main.b19bfc8",
74
- "@dxos/rpc": "0.7.5-main.b19bfc8",
75
- "@dxos/teleport-extension-gossip": "0.7.5-main.b19bfc8",
76
- "@dxos/teleport-extension-object-sync": "0.7.5-main.b19bfc8",
77
- "@dxos/timeframe": "0.7.5-main.b19bfc8",
78
- "@dxos/tracing": "0.7.5-main.b19bfc8",
79
- "@dxos/util": "0.7.5-main.b19bfc8",
80
- "@dxos/websocket-rpc": "0.7.5-main.b19bfc8"
46
+ "@dxos/async": "0.7.5-main.d9d2d4e",
47
+ "@dxos/automerge": "0.7.5-main.d9d2d4e",
48
+ "@dxos/client-protocol": "0.7.5-main.d9d2d4e",
49
+ "@dxos/codec-protobuf": "0.7.5-main.d9d2d4e",
50
+ "@dxos/config": "0.7.5-main.d9d2d4e",
51
+ "@dxos/context": "0.7.5-main.d9d2d4e",
52
+ "@dxos/credentials": "0.7.5-main.d9d2d4e",
53
+ "@dxos/crypto": "0.7.5-main.d9d2d4e",
54
+ "@dxos/echo-db": "0.7.5-main.d9d2d4e",
55
+ "@dxos/debug": "0.7.5-main.d9d2d4e",
56
+ "@dxos/echo-pipeline": "0.7.5-main.d9d2d4e",
57
+ "@dxos/echo-protocol": "0.7.5-main.d9d2d4e",
58
+ "@dxos/echo-schema": "0.7.5-main.d9d2d4e",
59
+ "@dxos/feed-store": "0.7.5-main.d9d2d4e",
60
+ "@dxos/edge-client": "0.7.5-main.d9d2d4e",
61
+ "@dxos/indexing": "0.7.5-main.d9d2d4e",
62
+ "@dxos/keyring": "0.7.5-main.d9d2d4e",
63
+ "@dxos/invariant": "0.7.5-main.d9d2d4e",
64
+ "@dxos/keys": "0.7.5-main.d9d2d4e",
65
+ "@dxos/kv-store": "0.7.5-main.d9d2d4e",
66
+ "@dxos/lock-file": "0.7.5-main.d9d2d4e",
67
+ "@dxos/log": "0.7.5-main.d9d2d4e",
68
+ "@dxos/messaging": "0.7.5-main.d9d2d4e",
69
+ "@dxos/node-std": "0.7.5-main.d9d2d4e",
70
+ "@dxos/protocols": "0.7.5-main.d9d2d4e",
71
+ "@dxos/random-access-storage": "0.7.5-main.d9d2d4e",
72
+ "@dxos/network-manager": "0.7.5-main.d9d2d4e",
73
+ "@dxos/teleport-extension-gossip": "0.7.5-main.d9d2d4e",
74
+ "@dxos/rpc": "0.7.5-main.d9d2d4e",
75
+ "@dxos/teleport-extension-object-sync": "0.7.5-main.d9d2d4e",
76
+ "@dxos/teleport": "0.7.5-main.d9d2d4e",
77
+ "@dxos/timeframe": "0.7.5-main.d9d2d4e",
78
+ "@dxos/tracing": "0.7.5-main.d9d2d4e",
79
+ "@dxos/util": "0.7.5-main.d9d2d4e",
80
+ "@dxos/websocket-rpc": "0.7.5-main.d9d2d4e"
81
81
  },
82
82
  "devDependencies": {
83
83
  "@types/platform": "^1.3.4",
84
84
  "@types/readable-stream": "^2.3.9",
85
85
  "get-port-please": "^3.1.1",
86
- "@dxos/signal": "0.7.5-main.b19bfc8",
87
- "@dxos/test-utils": "0.7.5-main.b19bfc8"
86
+ "@dxos/signal": "0.7.5-main.d9d2d4e",
87
+ "@dxos/test-utils": "0.7.5-main.d9d2d4e"
88
88
  },
89
89
  "publishConfig": {
90
90
  "access": "public"
@@ -32,19 +32,26 @@ export class EdgeIdentityRecoveryManager {
32
32
  private readonly _acceptRecoveredIdentity: (params: JoinIdentityParams) => Promise<Identity>,
33
33
  ) {}
34
34
 
35
- public async createRecoveryCredential({ recoveryKey, algorithm }: CreateRecoveryCredentialRequest) {
35
+ public async createRecoveryCredential({ data }: CreateRecoveryCredentialRequest) {
36
36
  const identity = this._identityProvider();
37
37
  invariant(identity);
38
38
 
39
+ let recoveryKey: PublicKey;
40
+ let lookupKey: PublicKey;
41
+ let algorithm: string;
39
42
  let recoveryCode: string | undefined;
40
- if (!recoveryKey) {
43
+ if (data) {
44
+ recoveryKey = data.recoveryKey;
45
+ lookupKey = data.lookupKey;
46
+ algorithm = data.algorithm;
47
+ } else {
41
48
  recoveryCode = generateSeedPhrase();
42
49
  const keypair = keyPairFromSeedPhrase(recoveryCode);
43
50
  recoveryKey = PublicKey.from(keypair.publicKey);
51
+ lookupKey = PublicKey.from(keypair.publicKey);
44
52
  algorithm = 'ED25519';
45
53
  }
46
54
 
47
- invariant(algorithm, 'Algorithm is required.');
48
55
  const identityKey = identity.identityKey;
49
56
  const credential = await identity.getIdentityCredentialSigner().createCredential({
50
57
  subject: identityKey,
@@ -53,6 +60,7 @@ export class EdgeIdentityRecoveryManager {
53
60
  recoveryKey,
54
61
  identityKey,
55
62
  algorithm,
63
+ lookupKey,
56
64
  },
57
65
  });
58
66
 
@@ -88,7 +96,7 @@ export class EdgeIdentityRecoveryManager {
88
96
  }
89
97
 
90
98
  public async recoverIdentityWithExternalSignature({
91
- identityDid,
99
+ lookupKey,
92
100
  deviceKey,
93
101
  controlFeedKey,
94
102
  signature,
@@ -98,7 +106,7 @@ export class EdgeIdentityRecoveryManager {
98
106
  invariant(this._edgeClient, 'Not connected to EDGE.');
99
107
 
100
108
  const request: EdgeRecoverIdentityRequest = {
101
- identityDid,
109
+ lookupKey: lookupKey.toHex(),
102
110
  deviceKey: deviceKey.toHex(),
103
111
  controlFeedKey: controlFeedKey.toHex(),
104
112
  signature:
@@ -132,7 +140,7 @@ export class EdgeIdentityRecoveryManager {
132
140
  const deviceKey = await this._keyring.createKey();
133
141
  const controlFeedKey = await this._keyring.createKey();
134
142
  const request: EdgeRecoverIdentityRequest = {
135
- recoveryKey: recoveryKey.toHex(),
143
+ lookupKey: recoveryKey.toHex(),
136
144
  deviceKey: deviceKey.toHex(),
137
145
  controlFeedKey: controlFeedKey.toHex(),
138
146
  };
package/src/version.ts CHANGED
@@ -1 +1 @@
1
- export const DXOS_VERSION = "0.7.5-main.b19bfc8";
1
+ export const DXOS_VERSION = "0.7.5-main.d9d2d4e";