From 96f21ecbffacdb7c19b4086a450b52179870d0b5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 26 Nov 2024 17:23:13 +0530
Subject: [PATCH] Conv deprecated

---
 web/apps/auth/src/services/remote.ts | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/web/apps/auth/src/services/remote.ts b/web/apps/auth/src/services/remote.ts
index 87450285e9..da42a1b68e 100644
--- a/web/apps/auth/src/services/remote.ts
+++ b/web/apps/auth/src/services/remote.ts
@@ -1,24 +1,22 @@
-import { decryptMetadataJSON_New, sharedCryptoWorker } from "@/base/crypto";
+import { decryptBoxB64, decryptMetadataJSON_New } from "@/base/crypto";
 import { authenticatedRequestHeaders, ensureOk, HTTPError } from "@/base/http";
 import log from "@/base/log";
 import { apiURL } from "@/base/origins";
+import { masterKeyFromSession } from "@/base/session-store";
 import { ensureString } from "@/utils/ensure";
-import { getActualKey } from "@ente/shared/user";
 import { codeFromURIString, type Code } from "services/code";
 import { z } from "zod";
 
 export const getAuthCodes = async (): Promise<Code[]> => {
-    const masterKey = await getActualKey();
+    const masterKey = await masterKeyFromSession();
     const authenticatorEntityKey = await getAuthenticatorEntityKey();
     if (!authenticatorEntityKey) {
         // The user might not have stored any codes yet from the mobile app.
         return [];
     }
 
-    const cryptoWorker = await sharedCryptoWorker();
-    const authenticatorKey = await cryptoWorker.decryptB64(
-        authenticatorEntityKey.encryptedKey,
-        authenticatorEntityKey.header,
+    const authenticatorKey = await decryptAuthenticatorKey(
+        authenticatorEntityKey,
         masterKey,
     );
     const authEntities = await authenticatorEntityDiff(authenticatorKey);
@@ -150,3 +148,19 @@ export const getAuthenticatorEntityKey = async (): Promise<
         return AuthenticatorEntityKey.parse(await res.json());
     }
 };
+
+/**
+ * Decrypt an encrypted authenticator key using the user's master key.
+ */
+const decryptAuthenticatorKey = async (
+    remote: AuthenticatorEntityKey,
+    masterKey: Uint8Array,
+) =>
+    decryptBoxB64(
+        {
+            encryptedData: remote.encryptedKey,
+            // Remote calls it the header, but it really is the nonce.
+            nonce: remote.header,
+        },
+        masterKey,
+    );