Skip to content

armgit / ente

Public Imported from GitHub
0

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

refractor(auth):create-shared-rendering-hook

Aswin Asoke8115b63bfd5
diff --git a/web/apps/auth/src/pages/change-password.tsx b/web/apps/auth/src/pages/change-password.tsx
index ee5795e757..630460b002 100644
--- a/web/apps/auth/src/pages/change-password.tsx
+++ b/web/apps/auth/src/pages/change-password.tsx
@@ -1,18 +1,10 @@
import { AuthShell } from "@/components/AuthShell";
import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsChangePasswordPage from "ente-accounts/pages/change-password";
import type React from "react";
-function ResetPasswordPresentation(
- props: NewPasswordPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell>
- <SetPasswordForm {...props} />
- </AuthShell>
- );
-}
+const ResetPasswordPresentation = withAuthPageShell(SetPasswordForm, AuthShell);
function ChangePasswordPage(): React.JSX.Element {
return (
diff --git a/web/apps/auth/src/pages/credentials.tsx b/web/apps/auth/src/pages/credentials.tsx
index ec9cecd228..2d85b926a1 100644
--- a/web/apps/auth/src/pages/credentials.tsx
+++ b/web/apps/auth/src/pages/credentials.tsx
@@ -4,20 +4,11 @@ import {
PasswordForm,
} from "ente-accounts/components/auth/CredentialsForm";
import { SecondFactorChoiceDialog } from "ente-accounts/components/auth/SecondFactorChoiceDialog";
-import AccountsCredentialsPage, {
- type CredentialsPresentationProps,
-} from "ente-accounts/pages/credentials";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsCredentialsPage from "ente-accounts/pages/credentials";
import type React from "react";
-function CredentialsPresentation(
- props: CredentialsPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell>
- <CredentialsForm {...props} />
- </AuthShell>
- );
-}
+const CredentialsPresentation = withAuthPageShell(CredentialsForm, AuthShell);
function CredentialsPage(): React.JSX.Element {
return (
diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsx
index 27d1afc436..af005da7c3 100644
--- a/web/apps/auth/src/pages/generate.tsx
+++ b/web/apps/auth/src/pages/generate.tsx
@@ -1,30 +1,13 @@
import { AuthShell } from "@/components/AuthShell";
import { RecoveryKeyForm } from "ente-accounts/components/auth/RecoveryKeyForm";
import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";
-import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsGeneratePage from "ente-accounts/pages/generate";
import type React from "react";
-function RecoveryKeyPresentation(
- props: RecoveryKeyPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell>
- <RecoveryKeyForm {...props} />
- </AuthShell>
- );
-}
+const RecoveryKeyPresentation = withAuthPageShell(RecoveryKeyForm, AuthShell);
-function SetPasswordPresentation(
- props: NewPasswordPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell>
- <SetPasswordForm {...props} />
- </AuthShell>
- );
-}
+const SetPasswordPresentation = withAuthPageShell(SetPasswordForm, AuthShell);
function GeneratePage(): React.JSX.Element {
return (
diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsx
index 783d6ee81c..d095aaaaa8 100644
--- a/web/apps/auth/src/pages/login.tsx
+++ b/web/apps/auth/src/pages/login.tsx
@@ -2,10 +2,8 @@ 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 {
- LoginContents,
- type LoginPresentationProps,
-} from "ente-accounts/components/LoginContents";
+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";
@@ -13,13 +11,7 @@ import { DevSettings } from "ente-new/photos/components/DevSettings";
import { useRouter } from "next/router";
import React, { useCallback, useEffect, useRef, useState } from "react";
-function LoginPresentation(props: LoginPresentationProps): React.JSX.Element {
- return (
- <AuthShell>
- <LoginForm {...props} />
- </AuthShell>
- );
-}
+const LoginPresentation = withAuthPageShell(LoginForm, AuthShell);
function LoginPage(): React.JSX.Element {
const [loading, setLoading] = useState(true);
diff --git a/web/apps/auth/src/pages/passkeys/recover.tsx b/web/apps/auth/src/pages/passkeys/recover.tsx
index 3f7f7dddff..4b7e7be268 100644
--- a/web/apps/auth/src/pages/passkeys/recover.tsx
+++ b/web/apps/auth/src/pages/passkeys/recover.tsx
@@ -1,19 +1,14 @@
import { AuthShell } from "@/components/AuthShell";
import { RecoverTwoFactorForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsTwoFactorRecoverPage, {
- type TwoFactorRecoverPresentationProps,
-} from "ente-accounts/pages/two-factor/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorRecoverPage from "ente-accounts/pages/two-factor/recover";
import type React from "react";
-function RecoverTwoFactorPresentation(
- props: TwoFactorRecoverPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell contentWidth={420}>
- <RecoverTwoFactorForm {...props} />
- </AuthShell>
- );
-}
+const RecoverTwoFactorPresentation = withAuthPageShell(
+ RecoverTwoFactorForm,
+ AuthShell,
+ 420,
+);
function PasskeyRecoverPage(): React.JSX.Element {
return (
diff --git a/web/apps/auth/src/pages/recover.tsx b/web/apps/auth/src/pages/recover.tsx
index 8f0286a8bc..f18e853619 100644
--- a/web/apps/auth/src/pages/recover.tsx
+++ b/web/apps/auth/src/pages/recover.tsx
@@ -1,19 +1,14 @@
import { AuthShell } from "@/components/AuthShell";
import { RecoverAccountForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsRecoverPage, {
- type RecoverAccountPresentationProps,
-} from "ente-accounts/pages/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsRecoverPage from "ente-accounts/pages/recover";
import type React from "react";
-function RecoverAccountPresentation(
- props: RecoverAccountPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell contentWidth={420}>
- <RecoverAccountForm {...props} />
- </AuthShell>
- );
-}
+const RecoverAccountPresentation = withAuthPageShell(
+ RecoverAccountForm,
+ AuthShell,
+ 420,
+);
function RecoverPage(): React.JSX.Element {
return <AccountsRecoverPage presentation={RecoverAccountPresentation} />;
diff --git a/web/apps/auth/src/pages/signup.tsx b/web/apps/auth/src/pages/signup.tsx
index 152600d5e6..b8b5ef449b 100644
--- a/web/apps/auth/src/pages/signup.tsx
+++ b/web/apps/auth/src/pages/signup.tsx
@@ -1,16 +1,10 @@
import { AuthShell } from "@/components/AuthShell";
import { SignUpForm } from "ente-accounts/components/auth/SignUpForm";
-import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsSignUpPage from "ente-accounts/pages/signup";
import type React from "react";
-function SignUpPresentation(props: SignUpPresentationProps): React.JSX.Element {
- return (
- <AuthShell>
- <SignUpForm {...props} />
- </AuthShell>
- );
-}
+const SignUpPresentation = withAuthPageShell(SignUpForm, AuthShell);
function SignUpPage(): React.JSX.Element {
return <AccountsSignUpPage presentation={SignUpPresentation} />;
diff --git a/web/apps/auth/src/pages/two-factor/recover.tsx b/web/apps/auth/src/pages/two-factor/recover.tsx
index a7822818ea..626f82e30e 100644
--- a/web/apps/auth/src/pages/two-factor/recover.tsx
+++ b/web/apps/auth/src/pages/two-factor/recover.tsx
@@ -1,19 +1,14 @@
import { AuthShell } from "@/components/AuthShell";
import { RecoverTwoFactorForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsTwoFactorRecoverPage, {
- type TwoFactorRecoverPresentationProps,
-} from "ente-accounts/pages/two-factor/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorRecoverPage from "ente-accounts/pages/two-factor/recover";
import type React from "react";
-function RecoverTwoFactorPresentation(
- props: TwoFactorRecoverPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell contentWidth={420}>
- <RecoverTwoFactorForm {...props} />
- </AuthShell>
- );
-}
+const RecoverTwoFactorPresentation = withAuthPageShell(
+ RecoverTwoFactorForm,
+ AuthShell,
+ 420,
+);
function TwoFactorRecoverPage(): React.JSX.Element {
return (
diff --git a/web/apps/auth/src/pages/two-factor/verify.tsx b/web/apps/auth/src/pages/two-factor/verify.tsx
index 55aaa5c3bc..7c01d58549 100644
--- a/web/apps/auth/src/pages/two-factor/verify.tsx
+++ b/web/apps/auth/src/pages/two-factor/verify.tsx
@@ -1,19 +1,10 @@
import { AuthShell } from "@/components/AuthShell";
import { TwoFactorForm } from "ente-accounts/components/auth/TwoFactorForm";
-import AccountsTwoFactorVerifyPage, {
- type TwoFactorVerifyPresentationProps,
-} from "ente-accounts/pages/two-factor/verify";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorVerifyPage from "ente-accounts/pages/two-factor/verify";
import type React from "react";
-function TwoFactorPresentation(
- props: TwoFactorVerifyPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell>
- <TwoFactorForm {...props} />
- </AuthShell>
- );
-}
+const TwoFactorPresentation = withAuthPageShell(TwoFactorForm, AuthShell);
function TwoFactorVerifyPage(): React.JSX.Element {
return <AccountsTwoFactorVerifyPage presentation={TwoFactorPresentation} />;
diff --git a/web/apps/auth/src/pages/verify.tsx b/web/apps/auth/src/pages/verify.tsx
index d7c2a9ee04..71056cfed0 100644
--- a/web/apps/auth/src/pages/verify.tsx
+++ b/web/apps/auth/src/pages/verify.tsx
@@ -1,20 +1,11 @@
import { AuthShell } from "@/components/AuthShell";
import { SecondFactorChoiceDialog } from "ente-accounts/components/auth/SecondFactorChoiceDialog";
import { VerifyEmailForm } from "ente-accounts/components/auth/VerifyEmailForm";
-import AccountsVerifyPage, {
- type VerifyEmailPresentationProps,
-} from "ente-accounts/pages/verify";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsVerifyPage from "ente-accounts/pages/verify";
import type React from "react";
-function VerifyEmailPresentation(
- props: VerifyEmailPresentationProps,
-): React.JSX.Element {
- return (
- <AuthShell>
- <VerifyEmailForm {...props} />
- </AuthShell>
- );
-}
+const VerifyEmailPresentation = withAuthPageShell(VerifyEmailForm, AuthShell);
function VerifyPage(): React.JSX.Element {
return (
diff --git a/web/apps/locker/src/pages/change-password.tsx b/web/apps/locker/src/pages/change-password.tsx
index 5c8424cc48..0f4c3b89d9 100644
--- a/web/apps/locker/src/pages/change-password.tsx
+++ b/web/apps/locker/src/pages/change-password.tsx
@@ -1,18 +1,13 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsChangePasswordPage from "ente-accounts/pages/change-password";
import type React from "react";
-function ResetPasswordPresentation(
- props: NewPasswordPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell>
- <SetPasswordForm {...props} />
- </LockerAuthShell>
- );
-}
+const ResetPasswordPresentation = withAuthPageShell(
+ SetPasswordForm,
+ LockerAuthShell,
+);
function ChangePasswordPage(): React.JSX.Element {
return (
diff --git a/web/apps/locker/src/pages/credentials.tsx b/web/apps/locker/src/pages/credentials.tsx
index f0ce2a3b83..7a283168f6 100644
--- a/web/apps/locker/src/pages/credentials.tsx
+++ b/web/apps/locker/src/pages/credentials.tsx
@@ -4,20 +4,14 @@ import {
PasswordForm,
} from "ente-accounts/components/auth/CredentialsForm";
import { SecondFactorChoiceDialog } from "ente-accounts/components/auth/SecondFactorChoiceDialog";
-import AccountsCredentialsPage, {
- type CredentialsPresentationProps,
-} from "ente-accounts/pages/credentials";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsCredentialsPage from "ente-accounts/pages/credentials";
import type React from "react";
-function CredentialsPresentation(
- props: CredentialsPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell>
- <CredentialsForm {...props} />
- </LockerAuthShell>
- );
-}
+const CredentialsPresentation = withAuthPageShell(
+ CredentialsForm,
+ LockerAuthShell,
+);
function CredentialsPage(): React.JSX.Element {
return (
diff --git a/web/apps/locker/src/pages/generate.tsx b/web/apps/locker/src/pages/generate.tsx
index 2a59b11176..548e7e6df2 100644
--- a/web/apps/locker/src/pages/generate.tsx
+++ b/web/apps/locker/src/pages/generate.tsx
@@ -1,30 +1,19 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { RecoveryKeyForm } from "ente-accounts/components/auth/RecoveryKeyForm";
import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
-import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";
-import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsGeneratePage from "ente-accounts/pages/generate";
import type React from "react";
-function RecoveryKeyPresentation(
- props: RecoveryKeyPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell>
- <RecoveryKeyForm {...props} />
- </LockerAuthShell>
- );
-}
+const RecoveryKeyPresentation = withAuthPageShell(
+ RecoveryKeyForm,
+ LockerAuthShell,
+);
-function SetPasswordPresentation(
- props: NewPasswordPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell>
- <SetPasswordForm {...props} />
- </LockerAuthShell>
- );
-}
+const SetPasswordPresentation = withAuthPageShell(
+ SetPasswordForm,
+ LockerAuthShell,
+);
function GeneratePage(): React.JSX.Element {
return (
diff --git a/web/apps/locker/src/pages/login.tsx b/web/apps/locker/src/pages/login.tsx
index 4a8d9e80c9..5cf97cf4bb 100644
--- a/web/apps/locker/src/pages/login.tsx
+++ b/web/apps/locker/src/pages/login.tsx
@@ -1,22 +1,14 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { LoginForm } from "ente-accounts/components/auth/LoginForm";
-import {
- LoginContents,
- type LoginPresentationProps,
-} from "ente-accounts/components/LoginContents";
+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";
-function LoginPresentation(props: LoginPresentationProps): React.JSX.Element {
- return (
- <LockerAuthShell>
- <LoginForm {...props} />
- </LockerAuthShell>
- );
-}
+const LoginPresentation = withAuthPageShell(LoginForm, LockerAuthShell);
function LoginPage(): React.JSX.Element {
const [loading, setLoading] = useState(true);
diff --git a/web/apps/locker/src/pages/passkeys/recover.tsx b/web/apps/locker/src/pages/passkeys/recover.tsx
index dd758ce7d9..1416eb05af 100644
--- a/web/apps/locker/src/pages/passkeys/recover.tsx
+++ b/web/apps/locker/src/pages/passkeys/recover.tsx
@@ -1,19 +1,14 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { RecoverTwoFactorForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsTwoFactorRecoverPage, {
- type TwoFactorRecoverPresentationProps,
-} from "ente-accounts/pages/two-factor/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorRecoverPage from "ente-accounts/pages/two-factor/recover";
import type React from "react";
-function RecoverTwoFactorPresentation(
- props: TwoFactorRecoverPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell contentWidth={420}>
- <RecoverTwoFactorForm {...props} />
- </LockerAuthShell>
- );
-}
+const RecoverTwoFactorPresentation = withAuthPageShell(
+ RecoverTwoFactorForm,
+ LockerAuthShell,
+ 420,
+);
function PasskeyRecoverPage(): React.JSX.Element {
return (
diff --git a/web/apps/locker/src/pages/recover.tsx b/web/apps/locker/src/pages/recover.tsx
index a9a0abb229..28b3dd5c4b 100644
--- a/web/apps/locker/src/pages/recover.tsx
+++ b/web/apps/locker/src/pages/recover.tsx
@@ -1,19 +1,14 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { RecoverAccountForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsRecoverPage, {
- type RecoverAccountPresentationProps,
-} from "ente-accounts/pages/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsRecoverPage from "ente-accounts/pages/recover";
import type React from "react";
-function RecoverAccountPresentation(
- props: RecoverAccountPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell contentWidth={420}>
- <RecoverAccountForm {...props} />
- </LockerAuthShell>
- );
-}
+const RecoverAccountPresentation = withAuthPageShell(
+ RecoverAccountForm,
+ LockerAuthShell,
+ 420,
+);
function RecoverPage(): React.JSX.Element {
return <AccountsRecoverPage presentation={RecoverAccountPresentation} />;
diff --git a/web/apps/locker/src/pages/signup.tsx b/web/apps/locker/src/pages/signup.tsx
index a9e9788bb9..af48f70bdc 100644
--- a/web/apps/locker/src/pages/signup.tsx
+++ b/web/apps/locker/src/pages/signup.tsx
@@ -1,16 +1,10 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { SignUpForm } from "ente-accounts/components/auth/SignUpForm";
-import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsSignUpPage from "ente-accounts/pages/signup";
import type React from "react";
-function SignUpPresentation(props: SignUpPresentationProps): React.JSX.Element {
- return (
- <LockerAuthShell>
- <SignUpForm {...props} />
- </LockerAuthShell>
- );
-}
+const SignUpPresentation = withAuthPageShell(SignUpForm, LockerAuthShell);
function SignUpPage(): React.JSX.Element {
return <AccountsSignUpPage presentation={SignUpPresentation} />;
diff --git a/web/apps/locker/src/pages/two-factor/recover.tsx b/web/apps/locker/src/pages/two-factor/recover.tsx
index ff1cad949b..7edba4afc5 100644
--- a/web/apps/locker/src/pages/two-factor/recover.tsx
+++ b/web/apps/locker/src/pages/two-factor/recover.tsx
@@ -1,19 +1,14 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { RecoverTwoFactorForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsTwoFactorRecoverPage, {
- type TwoFactorRecoverPresentationProps,
-} from "ente-accounts/pages/two-factor/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorRecoverPage from "ente-accounts/pages/two-factor/recover";
import type React from "react";
-function RecoverTwoFactorPresentation(
- props: TwoFactorRecoverPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell contentWidth={420}>
- <RecoverTwoFactorForm {...props} />
- </LockerAuthShell>
- );
-}
+const RecoverTwoFactorPresentation = withAuthPageShell(
+ RecoverTwoFactorForm,
+ LockerAuthShell,
+ 420,
+);
function TwoFactorRecoverPage(): React.JSX.Element {
return (
diff --git a/web/apps/locker/src/pages/two-factor/verify.tsx b/web/apps/locker/src/pages/two-factor/verify.tsx
index 88a0291426..249efdf1f1 100644
--- a/web/apps/locker/src/pages/two-factor/verify.tsx
+++ b/web/apps/locker/src/pages/two-factor/verify.tsx
@@ -1,19 +1,10 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { TwoFactorForm } from "ente-accounts/components/auth/TwoFactorForm";
-import AccountsTwoFactorVerifyPage, {
- type TwoFactorVerifyPresentationProps,
-} from "ente-accounts/pages/two-factor/verify";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorVerifyPage from "ente-accounts/pages/two-factor/verify";
import type React from "react";
-function TwoFactorPresentation(
- props: TwoFactorVerifyPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell>
- <TwoFactorForm {...props} />
- </LockerAuthShell>
- );
-}
+const TwoFactorPresentation = withAuthPageShell(TwoFactorForm, LockerAuthShell);
function TwoFactorVerifyPage(): React.JSX.Element {
return <AccountsTwoFactorVerifyPage presentation={TwoFactorPresentation} />;
diff --git a/web/apps/locker/src/pages/verify.tsx b/web/apps/locker/src/pages/verify.tsx
index 0c8bbc12f8..ed7da3d0d2 100644
--- a/web/apps/locker/src/pages/verify.tsx
+++ b/web/apps/locker/src/pages/verify.tsx
@@ -1,20 +1,14 @@
import { LockerAuthShell } from "@/components/auth/LockerAuthShell";
import { SecondFactorChoiceDialog } from "ente-accounts/components/auth/SecondFactorChoiceDialog";
import { VerifyEmailForm } from "ente-accounts/components/auth/VerifyEmailForm";
-import AccountsVerifyPage, {
- type VerifyEmailPresentationProps,
-} from "ente-accounts/pages/verify";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsVerifyPage from "ente-accounts/pages/verify";
import type React from "react";
-function VerifyEmailPresentation(
- props: VerifyEmailPresentationProps,
-): React.JSX.Element {
- return (
- <LockerAuthShell>
- <VerifyEmailForm {...props} />
- </LockerAuthShell>
- );
-}
+const VerifyEmailPresentation = withAuthPageShell(
+ VerifyEmailForm,
+ LockerAuthShell,
+);
function VerifyPage(): React.JSX.Element {
return (
diff --git a/web/apps/photos/src/pages/change-password.tsx b/web/apps/photos/src/pages/change-password.tsx
index af6e358a9a..2d92a7b29a 100644
--- a/web/apps/photos/src/pages/change-password.tsx
+++ b/web/apps/photos/src/pages/change-password.tsx
@@ -1,18 +1,13 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
-import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";
import { SetPasswordForm } from "ente-accounts/components/auth/SetPasswordForm";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsChangePasswordPage from "ente-accounts/pages/change-password";
import type React from "react";
-function ResetPasswordPresentation(
- props: NewPasswordPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <SetPasswordForm {...props} />
- </PhotosAuthShell>
- );
-}
+const ResetPasswordPresentation = withAuthPageShell(
+ SetPasswordForm,
+ PhotosAuthShell,
+);
function ChangePasswordPage(): React.JSX.Element {
return (
diff --git a/web/apps/photos/src/pages/credentials.tsx b/web/apps/photos/src/pages/credentials.tsx
index 6173eea342..2fa76df413 100644
--- a/web/apps/photos/src/pages/credentials.tsx
+++ b/web/apps/photos/src/pages/credentials.tsx
@@ -5,31 +5,19 @@ import {
PasswordForm,
} from "ente-accounts/components/auth/CredentialsForm";
import { SecondFactorChoiceDialog } from "ente-accounts/components/auth/SecondFactorChoiceDialog";
-import type { VerifyingPasskeyPresentationProps } from "ente-accounts/components/LoginComponents";
-import AccountsCredentialsPage, {
- type CredentialsPresentationProps,
-} from "ente-accounts/pages/credentials";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsCredentialsPage from "ente-accounts/pages/credentials";
import type React from "react";
-function CredentialsPresentation(
- props: CredentialsPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <CredentialsForm {...props} />
- </PhotosAuthShell>
- );
-}
+const CredentialsPresentation = withAuthPageShell(
+ CredentialsForm,
+ PhotosAuthShell,
+);
-function PasskeyPresentation(
- props: VerifyingPasskeyPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <PasskeyVerificationForm {...props} />
- </PhotosAuthShell>
- );
-}
+const PasskeyPresentation = withAuthPageShell(
+ PasskeyVerificationForm,
+ PhotosAuthShell,
+);
function CredentialsPage(): React.JSX.Element {
return (
diff --git a/web/apps/photos/src/pages/generate.tsx b/web/apps/photos/src/pages/generate.tsx
index c3560bea85..e51a806b3e 100644
--- a/web/apps/photos/src/pages/generate.tsx
+++ b/web/apps/photos/src/pages/generate.tsx
@@ -1,31 +1,20 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
-import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";
-import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";
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";
-function RecoveryKeyPresentation(
- props: RecoveryKeyPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <RecoveryKeyForm {...props} />
- </PhotosAuthShell>
- );
-}
+const RecoveryKeyPresentation = withAuthPageShell(
+ RecoveryKeyForm,
+ PhotosAuthShell,
+);
-function SetPasswordPresentation(
- props: NewPasswordPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <SetPasswordForm {...props} />
- </PhotosAuthShell>
- );
-}
+const SetPasswordPresentation = withAuthPageShell(
+ SetPasswordForm,
+ PhotosAuthShell,
+);
function GeneratePage(): React.JSX.Element {
const router = useRouter();
diff --git a/web/apps/photos/src/pages/login.tsx b/web/apps/photos/src/pages/login.tsx
index 1fafaf5a8c..9d181c565c 100644
--- a/web/apps/photos/src/pages/login.tsx
+++ b/web/apps/photos/src/pages/login.tsx
@@ -1,16 +1,10 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
-import type { LoginPresentationProps } from "ente-accounts/components/LoginContents";
import { LoginForm } from "ente-accounts/components/auth/LoginForm";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsLoginPage from "ente-accounts/pages/login";
import type React from "react";
-function LoginPresentation(props: LoginPresentationProps): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <LoginForm {...props} />
- </PhotosAuthShell>
- );
-}
+const LoginPresentation = withAuthPageShell(LoginForm, PhotosAuthShell);
function LoginPage(): React.JSX.Element {
return <AccountsLoginPage presentation={LoginPresentation} />;
diff --git a/web/apps/photos/src/pages/passkeys/recover.tsx b/web/apps/photos/src/pages/passkeys/recover.tsx
index dc00f11363..eac04f0531 100644
--- a/web/apps/photos/src/pages/passkeys/recover.tsx
+++ b/web/apps/photos/src/pages/passkeys/recover.tsx
@@ -1,19 +1,14 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
import { RecoverTwoFactorForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsTwoFactorRecoverPage, {
- type TwoFactorRecoverPresentationProps,
-} from "ente-accounts/pages/two-factor/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorRecoverPage from "ente-accounts/pages/two-factor/recover";
import type React from "react";
-function RecoverTwoFactorPresentation(
- props: TwoFactorRecoverPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell contentWidth={420}>
- <RecoverTwoFactorForm {...props} />
- </PhotosAuthShell>
- );
-}
+const RecoverTwoFactorPresentation = withAuthPageShell(
+ RecoverTwoFactorForm,
+ PhotosAuthShell,
+ 420,
+);
function PasskeyRecoverPage(): React.JSX.Element {
return (
diff --git a/web/apps/photos/src/pages/recover.tsx b/web/apps/photos/src/pages/recover.tsx
index 4087698f89..40e94d2f5f 100644
--- a/web/apps/photos/src/pages/recover.tsx
+++ b/web/apps/photos/src/pages/recover.tsx
@@ -1,19 +1,14 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
import { RecoverAccountForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsRecoverPage, {
- type RecoverAccountPresentationProps,
-} from "ente-accounts/pages/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsRecoverPage from "ente-accounts/pages/recover";
import type React from "react";
-function RecoverAccountPresentation(
- props: RecoverAccountPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell contentWidth={420}>
- <RecoverAccountForm {...props} />
- </PhotosAuthShell>
- );
-}
+const RecoverAccountPresentation = withAuthPageShell(
+ RecoverAccountForm,
+ PhotosAuthShell,
+ 420,
+);
function RecoverPage(): React.JSX.Element {
return <AccountsRecoverPage presentation={RecoverAccountPresentation} />;
diff --git a/web/apps/photos/src/pages/signup.tsx b/web/apps/photos/src/pages/signup.tsx
index ceb16ca387..35019c6b80 100644
--- a/web/apps/photos/src/pages/signup.tsx
+++ b/web/apps/photos/src/pages/signup.tsx
@@ -1,16 +1,10 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
-import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";
import { SignUpForm } from "ente-accounts/components/auth/SignUpForm";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
import AccountsSignUpPage from "ente-accounts/pages/signup";
import type React from "react";
-function SignUpPresentation(props: SignUpPresentationProps): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <SignUpForm {...props} />
- </PhotosAuthShell>
- );
-}
+const SignUpPresentation = withAuthPageShell(SignUpForm, PhotosAuthShell);
function SignUpPage(): React.JSX.Element {
return <AccountsSignUpPage presentation={SignUpPresentation} />;
diff --git a/web/apps/photos/src/pages/two-factor/recover.tsx b/web/apps/photos/src/pages/two-factor/recover.tsx
index 4b49ee55d5..4658481820 100644
--- a/web/apps/photos/src/pages/two-factor/recover.tsx
+++ b/web/apps/photos/src/pages/two-factor/recover.tsx
@@ -1,19 +1,14 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
import { RecoverTwoFactorForm } from "ente-accounts/components/auth/RecoveryForm";
-import AccountsTwoFactorRecoverPage, {
- type TwoFactorRecoverPresentationProps,
-} from "ente-accounts/pages/two-factor/recover";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorRecoverPage from "ente-accounts/pages/two-factor/recover";
import type React from "react";
-function RecoverTwoFactorPresentation(
- props: TwoFactorRecoverPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell contentWidth={420}>
- <RecoverTwoFactorForm {...props} />
- </PhotosAuthShell>
- );
-}
+const RecoverTwoFactorPresentation = withAuthPageShell(
+ RecoverTwoFactorForm,
+ PhotosAuthShell,
+ 420,
+);
function TwoFactorRecoverPage(): React.JSX.Element {
return (
diff --git a/web/apps/photos/src/pages/two-factor/verify.tsx b/web/apps/photos/src/pages/two-factor/verify.tsx
index 3f43a41cb1..2502a44576 100644
--- a/web/apps/photos/src/pages/two-factor/verify.tsx
+++ b/web/apps/photos/src/pages/two-factor/verify.tsx
@@ -1,19 +1,10 @@
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
import { TwoFactorForm } from "ente-accounts/components/auth/TwoFactorForm";
-import AccountsTwoFactorVerifyPage, {
- type TwoFactorVerifyPresentationProps,
-} from "ente-accounts/pages/two-factor/verify";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsTwoFactorVerifyPage from "ente-accounts/pages/two-factor/verify";
import type React from "react";
-function TwoFactorPresentation(
- props: TwoFactorVerifyPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <TwoFactorForm {...props} />
- </PhotosAuthShell>
- );
-}
+const TwoFactorPresentation = withAuthPageShell(TwoFactorForm, PhotosAuthShell);
function TwoFactorVerifyPage(): React.JSX.Element {
return <AccountsTwoFactorVerifyPage presentation={TwoFactorPresentation} />;
diff --git a/web/apps/photos/src/pages/verify.tsx b/web/apps/photos/src/pages/verify.tsx
index c60f1a968a..e3e6edd9c4 100644
--- a/web/apps/photos/src/pages/verify.tsx
+++ b/web/apps/photos/src/pages/verify.tsx
@@ -2,31 +2,19 @@ import { PasskeyVerificationForm } from "@/components/auth/PasskeyVerificationFo
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
import { SecondFactorChoiceDialog } from "ente-accounts/components/auth/SecondFactorChoiceDialog";
import { VerifyEmailForm } from "ente-accounts/components/auth/VerifyEmailForm";
-import type { VerifyingPasskeyPresentationProps } from "ente-accounts/components/LoginComponents";
-import AccountsVerifyPage, {
- type VerifyEmailPresentationProps,
-} from "ente-accounts/pages/verify";
+import { withAuthPageShell } from "ente-accounts/components/auth/withAuthPageShell";
+import AccountsVerifyPage from "ente-accounts/pages/verify";
import type React from "react";
-function VerifyEmailPresentation(
- props: VerifyEmailPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <VerifyEmailForm {...props} />
- </PhotosAuthShell>
- );
-}
+const VerifyEmailPresentation = withAuthPageShell(
+ VerifyEmailForm,
+ PhotosAuthShell,
+);
-function PasskeyPresentation(
- props: VerifyingPasskeyPresentationProps,
-): React.JSX.Element {
- return (
- <PhotosAuthShell>
- <PasskeyVerificationForm {...props} />
- </PhotosAuthShell>
- );
-}
+const PasskeyPresentation = withAuthPageShell(
+ PasskeyVerificationForm,
+ PhotosAuthShell,
+);
function VerifyPage(): React.JSX.Element {
return (
diff --git a/web/packages/accounts/components/auth/withAuthPageShell.tsx b/web/packages/accounts/components/auth/withAuthPageShell.tsx
new file mode 100644
index 0000000000..b708deba35
--- /dev/null
+++ b/web/packages/accounts/components/auth/withAuthPageShell.tsx
@@ -0,0 +1,20 @@
+import type { ComponentType, JSX, PropsWithChildren } from "react";
+
+interface AuthShellProps extends PropsWithChildren {
+ contentWidth?: 400 | 420;
+}
+
+/** Compose at module scope so rerenders preserve form state and focus. */
+export function withAuthPageShell<Props extends object>(
+ Form: ComponentType<Props>,
+ Shell: ComponentType<AuthShellProps>,
+ contentWidth?: AuthShellProps["contentWidth"],
+): ComponentType<Props> {
+ return function AuthPresentation(props: Props): JSX.Element {
+ return (
+ <Shell contentWidth={contentWidth}>
+ <Form {...props} />
+ </Shell>
+ );
+ };
+}