beenull/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: twoFactorType prop with default in recovery page

Browse source
This commit is contained in:
httpjamesm 2024-03-11 13:52:46 -04:00
parent 44568dc142
commit 267bd56285
No known key found for this signature in database
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
web/packages/accounts/pages/two-factor/recover.tsx
View file

@ -8,6 +8,7 @@ import { useEffect, useState } from "react";
import { recoverTwoFactor, removeTwoFactor } from "@ente/accounts/api/user";
import { PAGES } from "@ente/accounts/constants/pages";
import { TwoFactorType } from "@ente/accounts/constants/twofactor";
import { logoutUser } from "@ente/accounts/services/user";
import { PageProps } from "@ente/shared/apps/types";
import { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types";
@ -28,7 +29,11 @@ const bip39 = require("bip39");
// mobile client library only supports english.
bip39.setDefaultWordlist("english");
export default function Recover({ router, appContext }: PageProps) {
export default function Recover({
router,
appContext,
twoFactorType = TwoFactorType.TOTP,
}: PageProps) {
const [encryptedTwoFactorSecret, setEncryptedTwoFactorSecret] =
useState<B64EncryptionResult>(null);
const [sessionID, setSessionID] = useState(null);
@ -49,7 +54,10 @@ export default function Recover({ router, appContext }: PageProps) {
}
const main = async () => {
try {
const resp = await recoverTwoFactor(user.twoFactorSessionID);
const resp = await recoverTwoFactor(
user.twoFactorSessionID,
twoFactorType,
);
setDoesHaveEncryptedRecoveryKey(!!resp.encryptedSecret);
if (!resp.encryptedSecret) {
showContactSupportDialog({
@ -106,7 +114,11 @@ export default function Recover({ router, appContext }: PageProps) {
encryptedTwoFactorSecret.nonce,
await cryptoWorker.fromHex(recoveryKey),
);
const resp = await removeTwoFactor(sessionID, twoFactorSecret);
const resp = await removeTwoFactor(
sessionID,
twoFactorSecret,
twoFactorType,
);
const { keyAttributes, encryptedToken, token, id } = resp;
setData(LS_KEYS.USER, {
...getData(LS_KEYS.USER),

2
web/packages/shared/apps/types.ts
View file

@ -1,4 +1,5 @@
import { EmotionCache } from "@emotion/react";
import { TwoFactorType } from "@ente/accounts/constants/twofactor";
import { SetDialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types";
import { AppProps } from "next/app";
import { NextRouter } from "next/router";
@ -16,4 +17,5 @@ export interface PageProps {
};
router: NextRouter;
appName: APPS;
twoFactorType?: TwoFactorType;
}