Alt

web/packages/accounts/services/user.ts

@@ -59,10 +59,13 @@ export const ensureLocalUser = (): LocalUser =>
     ensureExpectedLoggedInValue(localUser());
 
 /**
- * A helper function that throws an error if a value that is expected to be
- * truthy when the user is logged in is instead falsey.
+ * A function throws an error if a value that is expected to be truthy when the
+ * user is logged in is instead falsey.
+ *
+ * This is meant as a convenience wrapper to assert that a value we expect when
+ * the user is logged in is indeed there.
  */
-const ensureExpectedLoggedInValue = <T>(t: T | undefined): T => {
+export const ensureExpectedLoggedInValue = <T>(t: T | undefined): T => {
     if (!t) throw new Error("Not logged in");
     return t;
 };

web/packages/base/crypto/index.ts

@@ -441,7 +441,7 @@ export const boxSealOpen = (
 export const boxSealOpenBytes = (
     encryptedData: string,
     keyPair: KeyPair,
-): Promise<string> =>
+): Promise<Uint8Array> =>
     inWorker()
         ? ei._boxSealOpenBytes(encryptedData, keyPair)
         : sharedWorker().then((w) =>

web/packages/base/crypto/libsodium.ts

@@ -767,7 +767,7 @@ export const boxSeal = async (data: string, publicKey: string) => {
 export const boxSealOpenBytes = async (
     encryptedData: string,
     { publicKey, privateKey }: KeyPair,
-) => {
+): Promise<Uint8Array> => {
     await sodium.ready;
     return sodium.crypto_box_seal_open(
         await fromB64(encryptedData),

web/packages/new/photos/services/user.ts

@@ -1,11 +1,25 @@
 import { ensureSavedKeyAttributes } from "ente-accounts/services/user";
-import { sharedCryptoWorker } from "ente-base/crypto";
+import { boxSealOpenBytes, decryptBox } from "ente-base/crypto";
+import type { KeyPair } from "ente-base/crypto/types";
 import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";
 import { apiURL } from "ente-base/origins";
 import { ensureMasterKeyFromSession } from "ente-base/session";
 import { nullToUndefined } from "ente-utils/transform";
 import { z } from "zod/v4";
 
+/**
+ * Return the public/private keypair of the currently logged in user.
+ */
+export const ensureUserKeyPair = async (): Promise<KeyPair> => {
+    const { encryptedSecretKey, secretKeyDecryptionNonce, publicKey } =
+        ensureSavedKeyAttributes();
+    const privateKey = await decryptBox(
+        { encryptedData: encryptedSecretKey, nonce: secretKeyDecryptionNonce },
+        await ensureMasterKeyFromSession(),
+    );
+    return { publicKey, privateKey };
+};
+
 /**
  * Fetch the public key from remote for the user (if any) who has registered
  * with remote with the given {@link email}.
@@ -84,25 +98,10 @@ export const getAccountDeleteChallenge = async () => {
  */
 export const decryptDeleteAccountChallenge = async (
     encryptedChallenge: string,
-) => {
-    const cryptoWorker = await sharedCryptoWorker();
-    const masterKey = await ensureMasterKeyFromSession();
-    const keyAttributes = ensureSavedKeyAttributes();
-    const secretKey = await cryptoWorker.decryptBox(
-        {
-            encryptedData: keyAttributes.encryptedSecretKey,
-            nonce: keyAttributes.secretKeyDecryptionNonce,
-        },
-        masterKey,
+) =>
+    new TextDecoder().decode(
+        await boxSealOpenBytes(encryptedChallenge, await ensureUserKeyPair()),
     );
-    const b64DecryptedChallenge = await cryptoWorker.boxSealOpen(
-        encryptedChallenge,
-        keyAttributes.publicKey,
-        secretKey,
-    );
-    const utf8DecryptedChallenge = atob(b64DecryptedChallenge);
-    return utf8DecryptedChallenge;
-};
 
 /**
  * Delete the logged in user's account on remote.