Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

refactor(auth):complete-shared-page-adoption-and-fix-lint

Aswin Asok75b44840cdb5
diff --git a/web/apps/auth/src/auth-page-config.ts b/web/apps/auth/src/auth-page-config.ts
index 60c75c9748..38aa9eba64 100644
--- a/web/apps/auth/src/auth-page-config.ts
+++ b/web/apps/auth/src/auth-page-config.ts
@@ -1,4 +1,13 @@
import { AuthShell } from "@/components/AuthShell";
import type { AuthPageConfig } from "ente-accounts/components/auth/AuthPageProvider";
+import { LoginFrame } from "./components/auth/LoginFrame";
-export const authPageConfig: AuthPageConfig = { Shell: AuthShell };
+export const authPageConfig: AuthPageConfig = {
+ encryptWithRecoveryKey: async (data) => {
+ const { encryptWithRecoveryKey } =
+ await import("./services/recovery-key");
+ return encryptWithRecoveryKey(data);
+ },
+ Shell: AuthShell,
+ LoginFrame,
+};
diff --git a/web/apps/auth/src/components/auth/LoginFrame.tsx b/web/apps/auth/src/components/auth/LoginFrame.tsx
new file mode 100644
index 0000000000..0e19bd5a0e
--- /dev/null
+++ b/web/apps/auth/src/components/auth/LoginFrame.tsx
@@ -0,0 +1,62 @@
+import { DevSettingsDialog } from "@/components/auth/DevSettingsDialog";
+import { styled } from "@mui/material";
+import type { AuthLoginFrameProps } from "ente-accounts/components/auth/AuthPageProvider";
+import { DevSettings } from "ente-new/photos/components/DevSettings";
+import React, { useRef, useState } from "react";
+
+export function LoginFrame({
+ children,
+ onHostChanged,
+}: AuthLoginFrameProps): React.JSX.Element {
+ const [showDevSettings, setShowDevSettings] = useState(false);
+ const tapCount = useRef(0);
+
+ const countDevSettingsTap = () => {
+ tapCount.current += 1;
+ if (tapCount.current == 7) {
+ tapCount.current = 0;
+ setShowDevSettings(true);
+ }
+ };
+
+ const handleBackgroundClick: React.MouseEventHandler = (event) => {
+ if (!shouldAllowChangingAPIOrigin()) return;
+ if (showDevSettings) return;
+ if (
+ event.target instanceof Element &&
+ event.target.closest(
+ 'button, a, input, textarea, select, [role="button"]',
+ )
+ ) {
+ return;
+ }
+ countDevSettingsTap();
+ };
+
+ const handleClose = () => {
+ setShowDevSettings(false);
+ onHostChanged();
+ };
+
+ return (
+ <NewAuthRoot onClick={handleBackgroundClick}>
+ {children}
+ <DevSettings
+ open={showDevSettings}
+ onClose={handleClose}
+ presentation={DevSettingsDialog}
+ />
+ </NewAuthRoot>
+ );
+}
+
+const NewAuthRoot = styled("div")({ width: "100%", minHeight: "100svh" });
+
+const shouldAllowChangingAPIOrigin = () => {
+ const hostname = new URL(window.location.origin).hostname;
+ return !(
+ hostname.endsWith(".ente.com") ||
+ hostname.endsWith(".ente.io") ||
+ hostname.endsWith(".ente.sh")
+ );
+};
diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsx
index af005da7c3..670ed3e823 100644
--- a/web/apps/auth/src/pages/generate.tsx
+++ b/web/apps/auth/src/pages/generate.tsx
@@ -1,21 +1 @@
-import { AuthShell } from "@/components/AuthShell";
-import { RecoveryKeyForm } from "ente-accounts/components/auth/RecoveryKeyForm";
-import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
-import AccountsGeneratePage from "ente-accounts/pages/generate";
-import type React from "react";
-
-const RecoveryKeyPresentation = withAuthPageShell(RecoveryKeyForm, AuthShell);
-
-const SetPasswordPresentation = withAuthPageShell(SetPasswordForm, AuthShell);
-
-function GeneratePage(): React.JSX.Element {
- return (
- <AccountsGeneratePage
- passwordPresentation={SetPasswordPresentation}
- recoveryKeyPresentation={RecoveryKeyPresentation}
- />
- );
-}
-
-export default GeneratePage;
+export { default } from "ente-accounts/pages/generate";
diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsx
index d095aaaaa8..675471334f 100644
--- a/web/apps/auth/src/pages/login.tsx
+++ b/web/apps/auth/src/pages/login.tsx
@@ -1,92 +1 @@
-import { DevSettingsDialog } from "@/components/auth/DevSettingsDialog";
-import { AuthShell } from "@/components/AuthShell";
-import { styled } from "@mui/material";
-import { LoginForm } from "ente-accounts/components/auth/LoginForm";
-import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
-import { LoginContents } from "ente-accounts/components/LoginContents";
-import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
-import { LoadingIndicator } from "ente-base/components/loaders";
-import { customAPIHost } from "ente-base/origins";
-import { DevSettings } from "ente-new/photos/components/DevSettings";
-import { useRouter } from "next/router";
-import React, { useCallback, useEffect, useRef, useState } from "react";
-
-const LoginPresentation = withAuthPageShell(LoginForm, AuthShell);
-
-function LoginPage(): React.JSX.Element {
- const [loading, setLoading] = useState(true);
- const [host, setHost] = useState<string | undefined>(undefined);
- const [showDevSettings, setShowDevSettings] = useState(false);
- const tapCount = useRef(0);
-
- const router = useRouter();
-
- const refreshHost = useCallback(
- () => void customAPIHost().then(setHost),
- [],
- );
-
- useEffect(() => {
- refreshHost();
- if (savedPartialLocalUser()?.email) void router.replace("/verify");
- setLoading(false);
- }, [router, refreshHost]);
-
- const onSignUp = useCallback(() => void router.push("/signup"), [router]);
-
- const countDevSettingsTap = () => {
- tapCount.current += 1;
- if (tapCount.current == 7) {
- tapCount.current = 0;
- setShowDevSettings(true);
- }
- };
-
- const handleBackgroundClick: React.MouseEventHandler = (event) => {
- if (!shouldAllowChangingAPIOrigin()) return;
- if (showDevSettings) return;
- if (
- event.target instanceof Element &&
- event.target.closest(
- 'button, a, input, textarea, select, [role="button"]',
- )
- ) {
- return;
- }
- countDevSettingsTap();
- };
-
- const handleClose = () => {
- setShowDevSettings(false);
- refreshHost();
- };
-
- if (loading) return <LoadingIndicator />;
-
- return (
- <NewAuthRoot onClick={handleBackgroundClick}>
- <LoginContents
- {...{ host, onSignUp }}
- presentation={LoginPresentation}
- />
- <DevSettings
- open={showDevSettings}
- onClose={handleClose}
- presentation={DevSettingsDialog}
- />
- </NewAuthRoot>
- );
-}
-
-export default LoginPage;
-
-const NewAuthRoot = styled("div")({ width: "100%", minHeight: "100svh" });
-
-const shouldAllowChangingAPIOrigin = () => {
- const hostname = new URL(window.location.origin).hostname;
- return !(
- hostname.endsWith(".ente.com") ||
- hostname.endsWith(".ente.io") ||
- hostname.endsWith(".ente.sh")
- );
-};
+export { default } from "ente-accounts/pages/login";
diff --git a/web/apps/auth/src/pages/two-factor/setup.tsx b/web/apps/auth/src/pages/two-factor/setup.tsx
index 0bab7dbdaa..7f9adb38e6 100644
--- a/web/apps/auth/src/pages/two-factor/setup.tsx
+++ b/web/apps/auth/src/pages/two-factor/setup.tsx
@@ -1,8 +1 @@
-import { encryptWithRecoveryKey } from "@/services/recovery-key";
-import TwoFactorSetupPage from "ente-accounts/pages/two-factor/setup";
-
-export default function Page() {
- return (
- <TwoFactorSetupPage encryptWithRecoveryKey={encryptWithRecoveryKey} />
- );
-}
+export { default } from "ente-accounts/pages/two-factor/setup";
diff --git a/web/apps/locker/src/auth-page-config.ts b/web/apps/locker/src/auth-page-config.ts
index 8ea1feabdf..22ddac82d2 100644
--- a/web/apps/locker/src/auth-page-config.ts
+++ b/web/apps/locker/src/auth-page-config.ts
@@ -1,4 +1,12 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import type { AuthPageConfig } from "ente-accounts/components/auth/AuthPageProvider";
-export const authPageConfig: AuthPageConfig = { Shell: LockerAuthShell };
+export const authPageConfig: AuthPageConfig = {
+ encryptWithRecoveryKey: async (data) => {
+ const { encryptWithRecoveryKey } =
+ await import("./services/recovery-key");
+ return encryptWithRecoveryKey(data);
+ },
+ Shell: LockerAuthShell,
+ keepLoginLoadingOnRedirect: true,
+};
diff --git a/web/apps/locker/src/pages/generate.tsx b/web/apps/locker/src/pages/generate.tsx
index 548e7e6df2..670ed3e823 100644
--- a/web/apps/locker/src/pages/generate.tsx
+++ b/web/apps/locker/src/pages/generate.tsx
@@ -1,27 +1 @@
-import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
-import { RecoveryKeyForm } from "ente-accounts/components/auth/RecoveryKeyForm";
-import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
-import AccountsGeneratePage from "ente-accounts/pages/generate";
-import type React from "react";
-
-const RecoveryKeyPresentation = withAuthPageShell(
- RecoveryKeyForm,
- LockerAuthShell,
-);
-
-const SetPasswordPresentation = withAuthPageShell(
- SetPasswordForm,
- LockerAuthShell,
-);
-
-function GeneratePage(): React.JSX.Element {
- return (
- <AccountsGeneratePage
- passwordPresentation={SetPasswordPresentation}
- recoveryKeyPresentation={RecoveryKeyPresentation}
- />
- );
-}
-
-export default GeneratePage;
+export { default } from "ente-accounts/pages/generate";
diff --git a/web/apps/locker/src/pages/login.tsx b/web/apps/locker/src/pages/login.tsx
index 5cf97cf4bb..675471334f 100644
--- a/web/apps/locker/src/pages/login.tsx
+++ b/web/apps/locker/src/pages/login.tsx
@@ -1,45 +1 @@
-import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
-import { LoginForm } from "ente-accounts/components/auth/LoginForm";
-import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
-import { LoginContents } from "ente-accounts/components/LoginContents";
-import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
-import { LoadingIndicator } from "ente-base/components/loaders";
-import { customAPIHost } from "ente-base/origins";
-import { useRouter } from "next/router";
-import React, { useCallback, useEffect, useState } from "react";
-
-const LoginPresentation = withAuthPageShell(LoginForm, LockerAuthShell);
-
-function LoginPage(): React.JSX.Element {
- const [loading, setLoading] = useState(true);
- const [host, setHost] = useState<string | undefined>(undefined);
-
- const router = useRouter();
-
- const refreshHost = useCallback(
- () => void customAPIHost().then(setHost),
- [],
- );
-
- useEffect(() => {
- refreshHost();
- if (savedPartialLocalUser()?.email) {
- void router.replace("/verify");
- return;
- }
- setLoading(false);
- }, [router, refreshHost]);
-
- const onSignUp = useCallback(() => void router.push("/signup"), [router]);
-
- return loading ? (
- <LoadingIndicator />
- ) : (
- <LoginContents
- {...{ host, onSignUp }}
- presentation={LoginPresentation}
- />
- );
-}
-
-export default LoginPage;
+export { default } from "ente-accounts/pages/login";
diff --git a/web/apps/locker/src/pages/two-factor/setup.tsx b/web/apps/locker/src/pages/two-factor/setup.tsx
index 0bab7dbdaa..7f9adb38e6 100644
--- a/web/apps/locker/src/pages/two-factor/setup.tsx
+++ b/web/apps/locker/src/pages/two-factor/setup.tsx
@@ -1,8 +1 @@
-import { encryptWithRecoveryKey } from "@/services/recovery-key";
-import TwoFactorSetupPage from "ente-accounts/pages/two-factor/setup";
-
-export default function Page() {
- return (
- <TwoFactorSetupPage encryptWithRecoveryKey={encryptWithRecoveryKey} />
- );
-}
+export { default } from "ente-accounts/pages/two-factor/setup";
diff --git a/web/apps/photos/src/auth-page-config.ts b/web/apps/photos/src/auth-page-config.ts
index 3113570342..1b2914943b 100644
--- a/web/apps/photos/src/auth-page-config.ts
+++ b/web/apps/photos/src/auth-page-config.ts
@@ -4,7 +4,13 @@ import type { AuthPageConfig } from "ente-accounts/components/auth/AuthPageProvi
import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
export const authPageConfig: AuthPageConfig = {
+ encryptWithRecoveryKey: async (data) => {
+ const { encryptWithRecoveryKey } =
+ await import("./services/recovery-key");
+ return encryptWithRecoveryKey(data);
+ },
Shell: PhotosAuthShell,
+ recoveryKeyCloseDestination: "/plan",
passkeyPresentation: withAuthPageShell(
PasskeyVerificationForm,
PhotosAuthShell,
diff --git a/web/apps/photos/src/pages/generate.tsx b/web/apps/photos/src/pages/generate.tsx
index e51a806b3e..670ed3e823 100644
--- a/web/apps/photos/src/pages/generate.tsx
+++ b/web/apps/photos/src/pages/generate.tsx
@@ -1,35 +1 @@
-import { PhotosAuthShell } from "@/components/PhotosAuthShell";
-import { RecoveryKeyForm } from "ente-accounts/components/auth/RecoveryKeyForm";
-import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
-import AccountsGeneratePage from "ente-accounts/pages/generate";
-import { useRouter } from "next/router";
-import type React from "react";
-
-const RecoveryKeyPresentation = withAuthPageShell(
- RecoveryKeyForm,
- PhotosAuthShell,
-);
-
-const SetPasswordPresentation = withAuthPageShell(
- SetPasswordForm,
- PhotosAuthShell,
-);
-
-function GeneratePage(): React.JSX.Element {
- const router = useRouter();
-
- function handleRecoveryKeyClose() {
- void router.push("/plan");
- }
-
- return (
- <AccountsGeneratePage
- passwordPresentation={SetPasswordPresentation}
- recoveryKeyPresentation={RecoveryKeyPresentation}
- onRecoveryKeyClose={handleRecoveryKeyClose}
- />
- );
-}
-
-export default GeneratePage;
+export { default } from "ente-accounts/pages/generate";
diff --git a/web/apps/photos/src/pages/two-factor/setup.tsx b/web/apps/photos/src/pages/two-factor/setup.tsx
index 0bab7dbdaa..7f9adb38e6 100644
--- a/web/apps/photos/src/pages/two-factor/setup.tsx
+++ b/web/apps/photos/src/pages/two-factor/setup.tsx
@@ -1,8 +1 @@
-import { encryptWithRecoveryKey } from "@/services/recovery-key";
-import TwoFactorSetupPage from "ente-accounts/pages/two-factor/setup";
-
-export default function Page() {
- return (
- <TwoFactorSetupPage encryptWithRecoveryKey={encryptWithRecoveryKey} />
- );
-}
+export { default } from "ente-accounts/pages/two-factor/setup";
diff --git a/web/packages/accounts/components/auth/AuthPageProvider.ts b/web/packages/accounts/components/auth/AuthPageProvider.ts
index 142f2ea45c..db74c51097 100644
--- a/web/packages/accounts/components/auth/AuthPageProvider.ts
+++ b/web/packages/accounts/components/auth/AuthPageProvider.ts
@@ -1,9 +1,24 @@
-import { createContext, useContext, type ComponentType } from "react";
+import {
+ createContext,
+ useContext,
+ type ComponentType,
+ type PropsWithChildren,
+} from "react";
import type { VerifyingPasskeyPresentationProps } from "../LoginComponents";
import type { AuthPageShellProps } from "./AuthPageShell";
-/** App defaults for shared account pages, not reusable forms or dialogs. */
+export interface AuthLoginFrameProps extends PropsWithChildren {
+ onHostChanged: () => void;
+}
+
+// App defaults for shared account pages, not reusable forms or dialogs.
export interface AuthPageConfig {
+ LoginFrame?: ComponentType<AuthLoginFrameProps>;
+ keepLoginLoadingOnRedirect?: boolean;
+ recoveryKeyCloseDestination?: string;
+ encryptWithRecoveryKey?: (
+ data: string,
+ ) => Promise<{ encryptedData: string; nonce: string }>;
passkeyPresentation?: ComponentType<VerifyingPasskeyPresentationProps>;
Shell?: ComponentType<
Pick<AuthPageShellProps, "children" | "contentWidth">
diff --git a/web/packages/accounts/components/auth/withAuthPageShell.tsx b/web/packages/accounts/components/auth/withAuthPageShell.tsx
index b708deba35..54ec4cc098 100644
--- a/web/packages/accounts/components/auth/withAuthPageShell.tsx
+++ b/web/packages/accounts/components/auth/withAuthPageShell.tsx
@@ -4,7 +4,7 @@ interface AuthShellProps extends PropsWithChildren {
contentWidth?: 400 | 420;
}
-/** Compose at module scope so rerenders preserve form state and focus. */
+// Compose at module scope so rerenders preserve form state and focus.
export function withAuthPageShell<Props extends object>(
Form: ComponentType<Props>,
Shell: ComponentType<AuthShellProps>,
diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsx
index 088c2d422d..766e6c32c6 100644
--- a/web/packages/accounts/pages/generate.tsx
+++ b/web/packages/accounts/pages/generate.tsx
@@ -1,4 +1,7 @@
import { Divider } from "@mui/material";
+import { useAuthPageConfig } from "ente-accounts/components/auth/AuthPageProvider";
+import { RecoveryKeyForm } from "ente-accounts/components/auth/RecoveryKeyForm";
+import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
import {
AccountsPageContents,
AccountsPageFooter,
@@ -50,10 +53,17 @@ export interface GeneratePageProps {
}
const Page: React.FC<GeneratePageProps> = ({
- passwordPresentation,
- recoveryKeyPresentation,
+ passwordPresentation: explicitPasswordPresentation,
+ recoveryKeyPresentation: explicitRecoveryKeyPresentation,
onRecoveryKeyClose,
}) => {
+ const { Shell, recoveryKeyCloseDestination } = useAuthPageConfig();
+ const passwordPresentation =
+ explicitPasswordPresentation ??
+ (Shell ? ConfiguredPasswordPresentation : undefined);
+ const recoveryKeyPresentation =
+ explicitRecoveryKeyPresentation ??
+ (Shell ? ConfiguredRecoveryKeyPresentation : undefined);
const { logout, showMiniDialog } = useBaseContext();
const [userEmail, setUserEmail] = useState("");
@@ -110,7 +120,7 @@ const Page: React.FC<GeneratePageProps> = ({
if (onRecoveryKeyClose) {
onRecoveryKeyClose();
} else {
- void router.push(appHomeRoute);
+ void router.push(recoveryKeyCloseDestination ?? appHomeRoute);
}
}
@@ -160,3 +170,25 @@ const Page: React.FC<GeneratePageProps> = ({
};
export default Page;
+
+function ConfiguredPasswordPresentation(
+ props: NewPasswordPresentationProps,
+): React.JSX.Element {
+ const Shell = useAuthPageConfig().Shell!;
+ return (
+ <Shell>
+ <SetPasswordForm {...props} />
+ </Shell>
+ );
+}
+
+function ConfiguredRecoveryKeyPresentation(
+ props: RecoveryKeyPresentationProps,
+): React.JSX.Element {
+ const Shell = useAuthPageConfig().Shell!;
+ return (
+ <Shell>
+ <RecoveryKeyForm {...props} />
+ </Shell>
+ );
+}
diff --git a/web/packages/accounts/pages/login.tsx b/web/packages/accounts/pages/login.tsx
index f0cbe5ec5a..4b6bb8d411 100644
--- a/web/packages/accounts/pages/login.tsx
+++ b/web/packages/accounts/pages/login.tsx
@@ -16,7 +16,8 @@ export interface LoginPageProps {
}
const Page: React.FC<LoginPageProps> = ({ presentation }) => {
- const { Shell } = useAuthPageConfig();
+ const { Shell, LoginFrame, keepLoginLoadingOnRedirect } =
+ useAuthPageConfig();
const Presentation =
presentation ?? (Shell ? ConfiguredLoginPresentation : undefined);
const [loading, setLoading] = useState(true);
@@ -24,23 +25,37 @@ const Page: React.FC<LoginPageProps> = ({ presentation }) => {
const router = useRouter();
+ const refreshHost = useCallback(
+ () => void customAPIHost().then(setHost),
+ [],
+ );
+
useEffect(() => {
- void customAPIHost().then(setHost);
- if (savedPartialLocalUser()?.email) void router.replace("/verify");
+ refreshHost();
+ if (savedPartialLocalUser()?.email) {
+ void router.replace("/verify");
+ if (keepLoginLoadingOnRedirect) return;
+ }
setLoading(false);
- }, [router]);
+ }, [router, refreshHost, keepLoginLoadingOnRedirect]);
const onSignUp = useCallback(() => void router.push("/signup"), [router]);
- return loading ? (
- <LoadingIndicator />
- ) : Presentation ? (
+ if (loading) return <LoadingIndicator />;
+
+ const contents = Presentation ? (
<LoginContents {...{ host, onSignUp }} presentation={Presentation} />
) : (
<AccountsPageContents>
<LoginContents {...{ host, onSignUp }} />
</AccountsPageContents>
);
+
+ return LoginFrame ? (
+ <LoginFrame onHostChanged={refreshHost}>{contents}</LoginFrame>
+ ) : (
+ contents
+ );
};
export default Page;
diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index a8dc22d23b..9ad7dfb6d4 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -1,4 +1,8 @@
import { Paper, Stack, styled, Typography } from "@mui/material";
+import {
+ useAuthPageConfig,
+ type AuthPageConfig,
+} from "ente-accounts/components/auth/AuthPageProvider";
import { CodeBlock } from "ente-accounts/components/CodeBlock";
import { Verify2FACodeForm } from "ente-accounts/components/Verify2FACodeForm";
import { appHomeRoute } from "ente-accounts/services/redirect";
@@ -18,14 +22,15 @@ import { useRouter } from "next/router";
import React, { useEffect, useState } from "react";
export interface TwoFactorSetupPageProps {
- encryptWithRecoveryKey: (
- data: string,
- ) => Promise<{ encryptedData: string; nonce: string }>;
+ encryptWithRecoveryKey?: AuthPageConfig["encryptWithRecoveryKey"];
}
const Page: React.FC<TwoFactorSetupPageProps> = ({
- encryptWithRecoveryKey,
+ encryptWithRecoveryKey: explicitEncryptWithRecoveryKey,
}) => {
+ const config = useAuthPageConfig();
+ const encryptWithRecoveryKey =
+ explicitEncryptWithRecoveryKey ?? config.encryptWithRecoveryKey;
const [twoFactorSecret, setTwoFactorSecret] = useState<
TwoFactorSecret | undefined
>();
@@ -37,6 +42,8 @@ const Page: React.FC<TwoFactorSetupPageProps> = ({
}, []);
const handleSubmit = async (otp: string) => {
+ if (!encryptWithRecoveryKey)
+ throw new Error("Two-factor setup encryption is not configured");
await setupTwoFactorFinish(
await encryptWithRecoveryKey(twoFactorSecret!.secretCode),
otp,