@abraca/dabra 1.5.0 → 1.8.0

package/src/webrtc/DevicePairingChannel.ts

@@ -77,11 +77,15 @@ interface PairRequestMsg {
 
 interface PairApprovedMsg {
 	type: "pair-approved";
+	/** Approver's account-level Ed25519 public key (base64url). */
+	masterPublicKey?: string;
 }
 
 interface PairInviteCodeMsg {
 	type: "pair-invite-code";
 	code: string;
+	/** Approver's account-level Ed25519 public key (base64url). */
+	masterPublicKey?: string;
 }
 
 interface PairRejectedMsg {
@@ -171,8 +175,12 @@ export class DevicePairingChannel extends EventEmitter {
 	/**
 	 * Approve the pending pairing request. Calls `client.addKey()` to
 	 * register Device B's public key, then notifies Device B.
+	 *
+	 * @param client Authenticated REST client.
+	 * @param masterPublicKey Approver's account-level Ed25519 public key (base64url).
+	 *   Sent to Device B so it can adopt the master's identity doc.
 	 */
-	async approve(client: AbracadabraClient): Promise<PairingResult> {
+	async approve(client: AbracadabraClient, masterPublicKey?: string): Promise<PairingResult> {
 		if (this.role !== "approver") {
 			return { success: false, error: "Only the approver can approve" };
 		}
@@ -192,7 +200,7 @@ export class DevicePairingChannel extends EventEmitter {
 				x25519Key: req.x25519Key,
 			});
 
-			this.sendMessage({ type: "pair-approved" });
+			this.sendMessage({ type: "pair-approved", masterPublicKey });
 			this._pendingRequest = null;
 			this.emit("pairingComplete", { success: true } as PairingResult);
 			return { success: true };
@@ -210,8 +218,12 @@ export class DevicePairingChannel extends EventEmitter {
 	 * Approve via server-side device invite. Creates a single-use invite code
 	 * and sends it to Device B over the E2EE channel. Device B redeems it
 	 * independently via HTTP — Device A can go offline after this.
+	 *
+	 * @param client Authenticated REST client.
+	 * @param masterPublicKey Approver's account-level Ed25519 public key (base64url).
+	 *   Sent to Device B so it can adopt the master's identity doc.
 	 */
-	async approveWithInvite(client: AbracadabraClient): Promise<PairingResult> {
+	async approveWithInvite(client: AbracadabraClient, masterPublicKey?: string): Promise<PairingResult> {
 		if (this.role !== "approver") {
 			return { success: false, error: "Only the approver can approve" };
 		}
@@ -224,7 +236,7 @@ export class DevicePairingChannel extends EventEmitter {
 
 		try {
 			const { code } = await client.createDeviceInvite();
-			this.sendMessage({ type: "pair-invite-code", code });
+			this.sendMessage({ type: "pair-invite-code", code, masterPublicKey });
 			this._pendingRequest = null;
 			this.emit("pairingComplete", { success: true } as PairingResult);
 			return { success: true };
@@ -462,7 +474,7 @@ export class DevicePairingChannel extends EventEmitter {
 
 			case "pair-approved":
 				if (this.role !== "requester") return;
-				this.emit("approved");
+				this.emit("approved", { masterPublicKey: msg.masterPublicKey });
 				this.emit("pairingComplete", { success: true } as PairingResult);
 				break;
 
@@ -477,7 +489,7 @@ export class DevicePairingChannel extends EventEmitter {
 
 			case "pair-invite-code":
 				if (this.role !== "requester") return;
-				this.emit("inviteCode", msg.code);
+				this.emit("inviteCode", msg.code, msg.masterPublicKey);
 				break;
 		}
 	}