TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conv

Browse Source
This commit is contained in:
Manav Rathi
2025-06-03 14:13:48 +05:30
parent 9d9ed0f01f
commit 97314b7dc1
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/packages/accounts/pages/recover.tsx
View File

@@ -8,7 +8,7 @@ import { sendOTT } from "ente-accounts/services/user";
import { recoveryKeyB64FromMnemonic } from "ente-accounts/utils/recovery-key";
import { LinkButton } from "ente-base/components/LinkButton";
import { useBaseContext } from "ente-base/context";
import { sharedCryptoWorker } from "ente-base/crypto";
import { decryptBoxB64 } from "ente-base/crypto";
import log from "ente-base/log";
import SingleInputForm, {
type SingleInputFormProps,
@@ -62,10 +62,11 @@ const Page: React.FC = () => {
) => {
try {
const keyAttr = keyAttributes!;
const cryptoWorker = await sharedCryptoWorker();
const masterKey = await cryptoWorker.decryptB64(
keyAttr.masterKeyEncryptedWithRecoveryKey!,
keyAttr.masterKeyDecryptionNonce!,
const masterKey = await decryptBoxB64(
{
encryptedData: keyAttr.masterKeyEncryptedWithRecoveryKey!,
nonce: keyAttr.masterKeyDecryptionNonce!,
},
await recoveryKeyB64FromMnemonic(recoveryKey),
);
await saveKeyInSessionStore("encryptionKey", masterKey);

8
web/packages/accounts/pages/two-factor/recover.tsx
View File

@@ -14,7 +14,7 @@ import { recoveryKeyB64FromMnemonic } from "ente-accounts/utils/recovery-key";
import { LinkButton } from "ente-base/components/LinkButton";
import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
import { useBaseContext } from "ente-base/context";
import { sharedCryptoWorker } from "ente-base/crypto";
import { decryptBoxB64 } from "ente-base/crypto";
import type { B64EncryptionResult } from "ente-base/crypto/libsodium";
import log from "ente-base/log";
import SingleInputForm, {
@@ -92,10 +92,8 @@ const Page: React.FC<RecoverPageProps> = ({ twoFactorType }) => {
) => {
try {
const { encryptedData, nonce } = encryptedTwoFactorSecret!;
const cryptoWorker = await sharedCryptoWorker();
const twoFactorSecret = await cryptoWorker.decryptB64(
encryptedData,
nonce,
const twoFactorSecret = await decryptBoxB64(
{ encryptedData, nonce },
await recoveryKeyB64FromMnemonic(recoveryKey),
);
const resp = await removeTwoFactor(