Return result from linkIdentities

open-chat-labs · Aug 5, 2024 · 9dc093e · 9dc093e
1 parent 4c10828
commit 9dc093e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
@@ -420,6 +420,7 @@ import type {
     SubmitProofOfUniquePersonhoodResponse,
     Achievement,
     PayForDiamondMembershipResponse,
+    LinkIdentitiesResponse,
 } from "openchat-shared";
 import {
     AuthProvider,
@@ -7356,8 +7357,8 @@ export class OpenChat extends OpenChatAgentWorker {
         initiatorDelegation: DelegationChain,
         approverKey: ECDSAKeyIdentity,
         approverDelegation: DelegationChain,
-    ) {
-        this.sendRequest({
+    ): Promise<LinkIdentitiesResponse> {
+        return this.sendRequest({
             kind: "linkIdentities",
             initiatorKey: initiatorKey.getKeyPair(),
             initiatorDelegation: initiatorDelegation.toJSON(),

diff --git a/frontend/openchat-shared/src/domain/identity.ts b/frontend/openchat-shared/src/domain/identity.ts
@@ -96,3 +96,5 @@ export type ApproveIdentityLinkResponse =
     | "link_request_not_found"
     | "invalid_signature"
     | "delegation_too_old";
+
+export type LinkIdentitiesResponse = InitiateIdentityLinkResponse | ApproveIdentityLinkResponse;
diff --git a/frontend/openchat-shared/src/domain/worker.ts b/frontend/openchat-shared/src/domain/worker.ts
@@ -169,6 +169,7 @@ import type {
     GenerateChallengeResponse,
     GetDelegationResponse,
     GetOpenChatIdentityResponse,
+    LinkIdentitiesResponse,
     PrepareDelegationResponse,
     SiwePrepareLoginResponse,
     SiwsPrepareLoginResponse,
@@ -2104,4 +2105,6 @@ export type WorkerResult<T> = T extends Init
     ? void
     : T extends SubmitProofOfUniquePersonhood
     ? SubmitProofOfUniquePersonhoodResponse
+    : T extends LinkIdentities
+    ? LinkIdentitiesResponse
     : never;
diff --git a/frontend/openchat-worker/src/worker.ts b/frontend/openchat-worker/src/worker.ts
@@ -23,6 +23,7 @@ import {
     type GetOpenChatIdentityResponse,
     type ChallengeAttempt,
     type CreateOpenChatIdentityError,
+    type LinkIdentitiesResponse,
 } from "openchat-shared";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -1813,7 +1814,7 @@ async function linkIdentities(
     initiatorDelegation: JsonnableDelegationChain,
     approverKey: CryptoKeyPair,
     approverDelegation: JsonnableDelegationChain,
-) {
+): Promise<LinkIdentitiesResponse> {
     const initiatorIdentity = DelegationIdentity.fromDelegation(
         await ECDSAKeyIdentity.fromKeyPair(initiatorKey),
         DelegationChain.fromJSON(initiatorDelegation),
@@ -1833,7 +1834,8 @@ async function linkIdentities(
     }
 
     const initiateResponse = await initiatorAgent.initiateIdentityLink(approver);
-    if (initiateResponse === "success") {
-        await approverAgent.approveIdentityLink(initiator);
+    if (initiateResponse !== "success") {
+        return initiateResponse;
     }
+    return await approverAgent.approveIdentityLink(initiator);
 }