@dxos/protocols 0.7.5-staging.2ff1350 → 0.7.5-staging.e6154f3

package/src/edge.ts

@@ -69,25 +69,20 @@ export type JoinSpaceResponseBody = {
   spaceGenesisFeedKey: string;
 };
 
+export type RecoverIdentitySignature =
+  | string
+  // This is the format of the signature from the WebAuthn authenticator.
+  | {
+      signature: string;
+      clientDataJson: string;
+      authenticatorData: string;
+    };
+
 export type RecoverIdentityRequest = {
-  /**
-   * Required if recoveryKey is not provided.
-   */
-  identityDid?: string;
-  /**
-   * Required if identityDid is not provided.
-   */
-  recoveryKey?: string;
   deviceKey: string;
   controlFeedKey: string;
-  signature?:
-    | string
-    // This is the format of the signature from the WebAuthn authenticator.
-    | {
-        signature: string;
-        clientDataJson: string;
-        authenticatorData: string;
-      };
+  lookupKey?: string;
+  signature?: RecoverIdentitySignature;
 };
 
 export type RecoverIdentityResponseBody = {

package/src/proto/dxos/client/services.proto

@@ -132,7 +132,7 @@ message RequestRecoveryChallengeResponse {
 
 message RecoverIdentityRequest {
   message ExternalSignature {
-    string identity_did = 1;
+    dxos.keys.PublicKey lookup_key = 1;
     dxos.keys.PublicKey device_key = 2;
     dxos.keys.PublicKey control_feed_key = 3;
     bytes signature = 4;
@@ -147,12 +147,20 @@ message RecoverIdentityRequest {
   }
 }
 
-message CreateRecoveryCredentialRequest {
-  /// Optional recovery key. If not provided, a new key will be generated.
-  optional dxos.keys.PublicKey recovery_key = 1;
+message RecoveryCredentialData {
+  /// Recovery key used to validate recovery challenge signature.
+  dxos.keys.PublicKey recovery_key = 1;
+
+  /// Public key used to identify the recovery key.
+  dxos.keys.PublicKey lookup_key = 2;
 
   /// Algorithm used to generate the recovery key.
-  optional string algorithm = 2;
+  string algorithm = 3;
+}
+
+message CreateRecoveryCredentialRequest {
+  /// If not provided, a new key will be generated.
+  optional RecoveryCredentialData data = 1;
 }
 
 message CreateRecoveryCredentialResponse {

package/src/proto/dxos/halo/credentials.proto

@@ -141,6 +141,8 @@ message IdentityRecovery {
   dxos.keys.PublicKey recovery_key = 2;
   /// Algorithm used to derive the recovery key (e.g., ED25519, ES256, etc.).
   string algorithm = 3;
+  /// Public key used to identify the recovery key (e.g., passkey user handle).
+  dxos.keys.PublicKey lookup_key = 4;
 }
 
 message ProfileDocument {

package/src/proto/gen/dxos/client/services.ts

@@ -629,7 +629,7 @@ export namespace RecoverIdentityRequest {
      *   {@link file://./../../../dxos/client/services.proto}
      */
     export interface ExternalSignature {
-        identityDid: string;
+        lookupKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
         deviceKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
         controlFeedKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
         signature: Uint8Array;
@@ -649,21 +649,32 @@ export namespace RecoverIdentityRequest {
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
  */
-export interface CreateRecoveryCredentialRequest {
+export interface RecoveryCredentialData {
     /**
-     * Optional recovery key. If not provided, a new key will be generated.
-     *
-     * Options:
-     *   - proto3_optional = true
+     * Recovery key used to validate recovery challenge signature.
      */
-    recoveryKey?: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    recoveryKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    /**
+     * Public key used to identify the recovery key.
+     */
+    lookupKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
     /**
      * Algorithm used to generate the recovery key.
+     */
+    algorithm: string;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface CreateRecoveryCredentialRequest {
+    /**
+     * If not provided, a new key will be generated.
      *
      * Options:
      *   - proto3_optional = true
      */
-    algorithm?: string;
+    data?: RecoveryCredentialData;
 }
 /**
  * Defined in:

package/src/proto/gen/dxos/halo/credentials.ts

@@ -223,6 +223,10 @@ export interface IdentityRecovery {
      * Algorithm used to derive the recovery key (e.g., ED25519, ES256, etc.).
      */
     algorithm: string;
+    /**
+     * Public key used to identify the recovery key (e.g., passkey user handle).
+     */
+    lookupKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
 }
 /**
  * Defined in: