@dxos/client-services 0.7.5-labs.e27f9b9 → 0.7.5-labs.f5080a1

package/dist/lib/browser/{chunk-OHBCYJRF.mjs → chunk-DBNNIIDX.mjs}

@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.7.5-labs.e27f9b9";
+var DXOS_VERSION = "0.7.5-labs.f5080a1";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -3814,15 +3814,26 @@ var IdentityServiceImpl = class extends Resource5 {
   async createRecoveryCredential(request) {
     return this._recoveryManager.createRecoveryCredential(request);
   }
+  async requestRecoveryChallenge() {
+    return this._recoveryManager.requestRecoveryChallenge();
+  }
   async recoverIdentity(request) {
-    await this._recoveryManager.recoverIdentity(request);
+    if (request.recoveryCode) {
+      await this._recoveryManager.recoverIdentity({
+        recoveryCode: request.recoveryCode
+      });
+    } else if (request.external) {
+      await this._recoveryManager.recoverIdentityWithExternalSignature(request.external);
+    } else {
+      throw new Error("Invalid request.");
+    }
     return this._getIdentity();
   }
   // TODO(burdon): Rename createPresentation?
   async signPresentation({ presentation, nonce }) {
     invariant9(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 105,
+      L: 116,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3841,7 +3852,7 @@ var IdentityServiceImpl = class extends Resource5 {
     const identity = this._identityManager.identity;
     invariant9(identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 119,
+      L: 130,
       S: this,
       A: [
         "identity",
@@ -3879,7 +3890,7 @@ var IdentityServiceImpl = class extends Resource5 {
             duplicate: space.id
           }, {
             F: __dxlog_file14,
-            L: 153,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3893,7 +3904,7 @@ var IdentityServiceImpl = class extends Resource5 {
     }, (err) => {
       log11.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 164,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7421,7 +7432,7 @@ var EdgeIdentityRecoveryManager = class {
       recoveryCode = generateSeedPhrase();
       const keypair = keyPairFromSeedPhrase(recoveryCode);
       recoveryKey = PublicKey14.from(keypair.publicKey);
-      algorithm = -8;
+      algorithm = "ED25519";
     }
     invariant19(algorithm, "Algorithm is required.", {
       F: __dxlog_file27,
@@ -7457,7 +7468,7 @@ var EdgeIdentityRecoveryManager = class {
       recoveryCode
     };
   }
-  async recoverIdentity({ recoveryCode }) {
+  async requestRecoveryChallenge() {
     invariant19(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
       L: 66,
@@ -7467,6 +7478,67 @@ var EdgeIdentityRecoveryManager = class {
         "'Not connected to EDGE.'"
       ]
     });
+    const deviceKey = await this._keyring.createKey();
+    const controlFeedKey = await this._keyring.createKey();
+    const request = {
+      deviceKey: deviceKey.toHex(),
+      controlFeedKey: controlFeedKey.toHex()
+    };
+    try {
+      await this._edgeClient.recoverIdentity(request);
+      throw new Error("No challenge received.");
+    } catch (error) {
+      if (!(error instanceof EdgeAuthChallengeError2)) {
+        throw error;
+      }
+      return {
+        deviceKey,
+        controlFeedKey,
+        challenge: error.challenge
+      };
+    }
+  }
+  async recoverIdentityWithExternalSignature({ identityDid, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
+    invariant19(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file27,
+      L: 98,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
+    const request = {
+      identityDid,
+      deviceKey: deviceKey.toHex(),
+      controlFeedKey: controlFeedKey.toHex(),
+      signature: clientDataJson && authenticatorData ? {
+        signature: Buffer.from(signature).toString("base64"),
+        clientDataJson: Buffer.from(clientDataJson).toString("base64"),
+        authenticatorData: Buffer.from(authenticatorData).toString("base64")
+      } : Buffer.from(signature).toString("base64")
+    };
+    const response = await this._edgeClient.recoverIdentity(request);
+    await this._acceptRecoveredIdentity({
+      authorizedDeviceCredential: decodeCredential(response.deviceAuthCredential),
+      haloGenesisFeedKey: PublicKey14.fromHex(response.genesisFeedKey),
+      haloSpaceKey: PublicKey14.fromHex(response.haloSpaceKey),
+      identityKey: PublicKey14.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
+  async recoverIdentity({ recoveryCode }) {
+    invariant19(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file27,
+      L: 128,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
     const recoveryKeypair = keyPairFromSeedPhrase(recoveryCode);
     const recoveryKey = PublicKey14.from(recoveryKeypair.publicKey);
     const deviceKey = await this._keyring.createKey();
@@ -7491,7 +7563,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     log23.info("recovering identity", response, {
       F: __dxlog_file27,
-      L: 92,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9093,4 +9165,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-OHBCYJRF.mjs.map
+//# sourceMappingURL=chunk-DBNNIIDX.mjs.map