💚 End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
update(photos):update-signup-flow
Aswin Asokacaa033c32f0
diff --git a/web/apps/photos/src/components/PhotosAuthShell.tsx b/web/apps/photos/src/components/PhotosAuthShell.tsxindex d4f8c78410..d7f75d6a1e 100644--- a/web/apps/photos/src/components/PhotosAuthShell.tsx+++ b/web/apps/photos/src/components/PhotosAuthShell.tsx@@ -134,10 +134,13 @@ const PageCard = styled("div")(({ theme }) => ({[authAboveMobileMediaQuery]: { borderRadius: "24px" },"@media (min-width: 1024px)": {width: "1032px",- height: "740px",+ height: "min(740px, 100%)",flexDirection: "row",},- "@media (min-width: 1600px)": { width: "1240px", height: "900px" },+ "@media (min-width: 1600px)": {+ width: "1240px",+ height: "min(900px, 100%)",+ },}));const DesktopBrandSlot = styled("div")({@@ -182,6 +185,8 @@ const ContentSheet = styled("section")(({ theme }) => ({position: "relative",zIndex: 1,overflowY: "auto",+ scrollbarWidth: "none",+ "&::-webkit-scrollbar": { display: "none" },boxSizing: "border-box",borderRadius: "24px 24px 0 0",backgroundColor: "#fff",diff --git a/web/apps/photos/src/components/auth/OTPField.tsx b/web/apps/photos/src/components/auth/OTPField.tsxindex ebfb69cee2..3056a19bc9 100644--- a/web/apps/photos/src/components/auth/OTPField.tsx+++ b/web/apps/photos/src/components/auth/OTPField.tsx@@ -49,8 +49,8 @@ export function OTPField({}function updateDigit(index: number, digit: string) {- const otp = value.split("");- otp[index] = digit;+ const otp = value.padEnd(length, " ").slice(0, length).split("");+ otp[index] = digit || " ";onChange(otp.join(""));}@@ -97,7 +97,7 @@ export function OTPField({index: number,event: React.KeyboardEvent<HTMLInputElement>,) {- const otp = value.split("");+ const otp = value.padEnd(length, " ").slice(0, length).split("");if ([event.code, event.key].includes("Backspace")) {event.preventDefault();updateDigit(index, "");@@ -129,7 +129,7 @@ export function OTPField({event: React.ClipboardEvent<HTMLInputElement>,) {event.preventDefault();- const otp = value.split("");+ const otp = value.padEnd(length, " ").slice(0, length).split("");const pastedData = event.clipboardData.getData("text/plain").slice(0, length - index)@@ -158,7 +158,7 @@ export function OTPField({id={index === 0 ? id : undefined}name={index === 0 ? name : undefined}type="tel"- value={value[index] ?? ""}+ value={value[index]?.trim() ?? ""}onChange={(event) => handleChange(index, event)}onFocus={(event) => event.currentTarget.select()}onInput={(event) => handleInput(index, event)}diff --git a/web/apps/photos/src/components/auth/RecoveryKeyForm.tsx b/web/apps/photos/src/components/auth/RecoveryKeyForm.tsxnew file mode 100644index 0000000000..f58c48b176--- /dev/null+++ b/web/apps/photos/src/components/auth/RecoveryKeyForm.tsx@@ -0,0 +1,106 @@+import ContentCopyIcon from "@mui/icons-material/ContentCopy";+import DoneIcon from "@mui/icons-material/Done";+import { CircularProgress, styled } from "@mui/material";+import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";+import { useClipboardCopy } from "ente-base/components/utils/hooks";+import { pt } from "ente-base/i18n";+import { t } from "i18next";+import type React from "react";+import { Button } from "./Button";+import { FormFooter } from "./FormFooter";+import { Message } from "./Message";+import { ScreenHeader } from "./ScreenHeader";+import { authFocusRing } from "./styles";++export function RecoveryKeyForm({+ recoveryKey,+ onClose,+ onSave,+}: RecoveryKeyPresentationProps): React.JSX.Element {+ const [copied, handleCopy] = useClipboardCopy(recoveryKey ?? "");+ const CopyIcon = copied ? DoneIcon : ContentCopyIcon;++ return (+ <>+ <ScreenHeader+ title={pt("Your recovery key")}+ subtitle={t("recovery_key_description")}+ />+ <RecoveryKeyBox>+ {recoveryKey ? (+ <>+ <RecoveryKeyText>{recoveryKey}</RecoveryKeyText>+ <CopyButton+ type="button"+ onClick={handleCopy}+ aria-label={+ copied ? t("copied") : pt("Copy recovery key")+ }+ >+ <CopyIcon fontSize="small" />+ </CopyButton>+ </>+ ) : (+ <CircularProgress+ size={24}+ sx={{ color: "var(--photos-auth-primary)" }}+ />+ )}+ </RecoveryKeyBox>+ <Message note>{t("key_not_stored_note")}</Message>+ <FormFooter>+ <Actions>+ <Button fullWidth variant="secondary" onClick={onClose}>+ {t("do_this_later")}+ </Button>+ <Button fullWidth onClick={onSave} disabled={!recoveryKey}>+ {t("save_key")}+ </Button>+ </Actions>+ </FormFooter>+ </>+ );+}++const RecoveryKeyBox = styled("div")({+ minHeight: "128px",+ padding: "20px",+ borderRadius: "16px",+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ position: "relative",+ boxSizing: "border-box",+ backgroundColor: "var(--photos-auth-field)",+ boxShadow: "inset 0 0 0 1px var(--photos-auth-stroke)",+});++const RecoveryKeyText = styled("p")({+ margin: 0,+ paddingRight: "28px",+ fontSize: "15px",+ fontWeight: 500,+ lineHeight: "24px",+ wordBreak: "break-word",+ color: "var(--photos-auth-text)",+});++const CopyButton = styled("button")({+ width: "32px",+ height: "32px",+ padding: 0,+ border: 0,+ borderRadius: "8px",+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ position: "absolute",+ top: "12px",+ right: "12px",+ backgroundColor: "transparent",+ color: "var(--photos-auth-text-muted)",+ cursor: "pointer",+ "&:focus-visible": authFocusRing,+});++const Actions = styled("div")({ display: "flex", gap: "12px" });diff --git a/web/apps/photos/src/components/auth/SignUpForm.tsx b/web/apps/photos/src/components/auth/SignUpForm.tsxnew file mode 100644index 0000000000..af259f4591--- /dev/null+++ b/web/apps/photos/src/components/auth/SignUpForm.tsx@@ -0,0 +1,235 @@+import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";+import { styled, Tooltip } from "@mui/material";+import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";+import { pt } from "ente-base/i18n";+import { t } from "i18next";+import type React from "react";+import { Trans } from "react-i18next";+import { Button } from "./Button";+import { Checkbox } from "./Checkbox";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { Message, type MessageKind } from "./Message";+import { ScreenHeader } from "./ScreenHeader";+import { TextField } from "./TextField";+import { TextLink } from "./TextLink";++export function SignUpForm({+ email,+ password,+ confirmPassword,+ referral,+ acceptedTerms,+ emailError,+ passwordError,+ confirmPasswordError,+ passwordStrength,+ isSubmitting,+ isSubmitDisabled,+ isJoinAlbumContext,+ host,+ onEmailChange,+ onPasswordChange,+ onConfirmPasswordChange,+ onReferralChange,+ onAcceptedTermsChange,+ onSubmit,+ onLogin,+}: SignUpPresentationProps): React.JSX.Element {+ const passwordStrengthKind: MessageKind | undefined = passwordStrength+ ? passwordStrength === "weak"+ ? "error"+ : passwordStrength === "moderate"+ ? "warning"+ : "success"+ : undefined;++ return (+ <>+ <ScreenHeader+ title={+ isJoinAlbumContext+ ? t("signup_to_join_album")+ : pt("Create your account")+ }+ subtitle={pt("A few details and you’ll be ready to go.")}+ />+ <Form onSubmit={onSubmit}>+ <FormFields>+ <TextField+ name="email"+ label={pt("Email address")}+ placeholder={pt("[email protected]")}+ type="email"+ autoComplete="username"+ value={email}+ onChange={onEmailChange}+ autoFocus+ error={Boolean(emailError)}+ helperText={emailError}+ disabled={isSubmitting}+ />+ <PasswordField>+ <TextField+ name="password"+ label={t("password")}+ placeholder={pt("Your password")}+ autoComplete="new-password"+ showPasswordToggle+ value={password}+ onChange={onPasswordChange}+ error={Boolean(passwordError)}+ helperText={passwordError}+ disabled={isSubmitting}+ />+ {passwordStrength && passwordStrengthKind ? (+ <Message kind={passwordStrengthKind}>+ {t("password_strength", {+ context: passwordStrength,+ })}+ </Message>+ ) : null}+ </PasswordField>+ <TextField+ name="confirmPassword"+ label={t("confirm_password")}+ placeholder={pt("Repeat password")}+ autoComplete="new-password"+ showPasswordToggle+ value={confirmPassword}+ onChange={onConfirmPasswordChange}+ error={Boolean(confirmPasswordError)}+ helperText={confirmPasswordError}+ disabled={isSubmitting}+ />+ <TextField+ name="referral"+ label={+ <ReferralLabel>+ {t("referral_source_hint")}+ <Tooltip title={t("referral_source_info")}>+ <InfoOutlinedIcon+ fontSize="inherit"+ tabIndex={0}+ aria-label={t("referral_source_info")}+ />+ </Tooltip>+ </ReferralLabel>+ }+ placeholder={pt("Optional")}+ value={referral}+ onChange={onReferralChange}+ disabled={isSubmitting}+ />+ </FormFields>+ <Checkbox+ name="acceptedTerms"+ checked={acceptedTerms}+ onChange={onAcceptedTermsChange}+ disabled={isSubmitting}+ label={+ <TermsText>+ <Trans+ i18nKey="terms_and_conditions"+ components={{+ a: (+ <TermsLink+ href="https://ente.com/terms"+ target="_blank"+ />+ ),+ b: (+ <TermsLink+ href="https://ente.com/privacy"+ target="_blank"+ />+ ),+ }}+ />+ </TermsText>+ }+ />+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={isSubmitting}+ disabled={isSubmitDisabled}+ >+ {t("create_account")}+ </Button>+ {isSubmitting ? (+ <CenteredMessage>+ <Message>{t("key_generation_in_progress")}</Message>+ </CenteredMessage>+ ) : null}+ <AccountPrompt>+ <span>{pt("Already have an account?")}</span>+ <TextLink regular onClick={onLogin}>+ {t("login")}+ </TextLink>+ </AccountPrompt>+ {host ? <Host>{host}</Host> : null}+ </FormFooter>+ </Form>+ </>+ );+}++const PasswordField = styled("div")({+ display: "flex",+ flexDirection: "column",+ gap: "8px",+});++const ReferralLabel = styled("span")({+ display: "inline-flex",+ alignItems: "center",+ gap: "4px",+ "& > svg": { fontSize: "14px" },+});++const TermsText = styled("span")({+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "20px",+ color: "var(--photos-auth-text)",+});++const TermsLink = styled("a")({+ color: "var(--photos-auth-primary)",+ textDecoration: "none",+ "&:hover": { textDecoration: "underline" },+ "&:focus-visible": {+ borderRadius: "4px",+ outline: "2px solid var(--photos-auth-primary)",+ outlineOffset: "2px",+ },+});++const CenteredMessage = styled("div")({+ display: "flex",+ justifyContent: "center",+});++const AccountPrompt = styled("div")({+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ gap: "6px",+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "20px",+ textAlign: "center",+ color: "var(--photos-auth-text-muted)",+});++const Host = styled("div")({+ minHeight: "16px",+ fontSize: "12px",+ fontWeight: 500,+ lineHeight: "16px",+ textAlign: "center",+ color: "var(--photos-auth-text-faint)",+});diff --git a/web/apps/photos/src/components/auth/VerifyEmailForm.tsx b/web/apps/photos/src/components/auth/VerifyEmailForm.tsxnew file mode 100644index 0000000000..1f9a36fa9c--- /dev/null+++ b/web/apps/photos/src/components/auth/VerifyEmailForm.tsx@@ -0,0 +1,129 @@+import { styled } from "@mui/material";+import type { VerifyEmailPresentationProps } from "ente-accounts/pages/verify";+import { pt } from "ente-base/i18n";+import log from "ente-base/log";+import { useFormik } from "formik";+import { t } from "i18next";+import type React from "react";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { Message } from "./Message";+import { OTPField } from "./OTPField";+import { ScreenHeader } from "./ScreenHeader";+import { TextLink } from "./TextLink";++const completeCodePattern = /^\d{6}$/;++export function VerifyEmailForm({+ email,+ resend,+ onSubmit,+ onResend,+ onChangeEmail,+}: VerifyEmailPresentationProps): React.JSX.Element {+ const formik = useFormik({+ initialValues: { code: "" },+ onSubmit: async ({ code }, { setFieldError }) => {+ function setCodeError(message: string) {+ setFieldError("code", message);+ }++ if (!completeCodePattern.test(code)) {+ setCodeError(t("required"));+ return;+ }++ try {+ await onSubmit(code, setCodeError);+ } catch (error) {+ log.error("Failed to submit email verification code", error);+ setCodeError(t("generic_error"));+ }+ },+ });++ function handleCodeChange(code: string) {+ void formik.setFieldValue("code", code).then(() => {+ if (completeCodePattern.test(code) && !formik.isSubmitting) {+ void formik.submitForm();+ }+ });+ }++ const resendLabel =+ resend === "sending"+ ? t("status_sending")+ : resend === "sent"+ ? t("status_sent")+ : t("resend_code");++ return (+ <>+ <ScreenHeader+ title={pt("Check your inbox")}+ subtitle={+ <>+ {pt("We sent a verification code to ")}+ <Email>{email}</Email>+ </>+ }+ />+ <Form onSubmit={formik.handleSubmit}>+ <FormFields>+ <FieldLabel>{t("verification_code")}</FieldLabel>+ <OTPField+ name="code"+ value={formik.values.code}+ onChange={handleCodeChange}+ error={Boolean(formik.errors.code)}+ disabled={formik.isSubmitting}+ autoFocus+ />+ {formik.errors.code ? (+ <Message kind="error">{formik.errors.code}</Message>+ ) : null}+ </FormFields>+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={formik.isSubmitting}+ >+ {t("verify")}+ </Button>+ <FooterLinks>+ <TextLink+ onClick={onResend}+ disabled={resend !== "enable"}+ >+ {resendLabel}+ </TextLink>+ <TextLink onClick={onChangeEmail}>+ {t("change_email")}+ </TextLink>+ </FooterLinks>+ </FormFooter>+ </Form>+ </>+ );+}++const Email = styled("strong")({+ color: "var(--photos-auth-text)",+ wordBreak: "break-word",+});++const FieldLabel = styled("span")({+ fontSize: "12px",+ fontWeight: 500,+ lineHeight: "16px",+ color: "var(--photos-auth-text-muted)",+});++const FooterLinks = styled("div")({+ display: "flex",+ justifyContent: "space-between",+ gap: "16px",+});diff --git a/web/apps/photos/src/pages/generate.tsx b/web/apps/photos/src/pages/generate.tsxindex 670ed3e823..14e694d02a 100644--- a/web/apps/photos/src/pages/generate.tsx+++ b/web/apps/photos/src/pages/generate.tsx@@ -1 +1,25 @@-export { default } from "ente-accounts/pages/generate";+import { RecoveryKeyForm } from "@/components/auth/RecoveryKeyForm";+import { PhotosAuthShell } from "@/components/PhotosAuthShell";+import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";+import AccountsGeneratePage from "ente-accounts/pages/generate";+import type React from "react";++function RecoveryKeyPresentation(+ props: RecoveryKeyPresentationProps,+): React.JSX.Element {+ return (+ <PhotosAuthShell>+ <RecoveryKeyForm {...props} />+ </PhotosAuthShell>+ );+}++function GeneratePage(): React.JSX.Element {+ return (+ <AccountsGeneratePage+ recoveryKeyPresentation={RecoveryKeyPresentation}+ />+ );+}++export default GeneratePage;diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsxindex e4ab20bb6a..18ce2647c8 100644--- a/web/apps/photos/src/pages/index.tsx+++ b/web/apps/photos/src/pages/index.tsx@@ -1,3 +1,5 @@+import { SignUpForm } from "@/components/auth/SignUpForm";+import { PhotosAuthShell } from "@/components/PhotosAuthShell";import { Box, Stack, Typography, styled } from "@mui/material";import { LoginContents } from "ente-accounts/components/LoginContents";import { SignUpContents } from "ente-accounts/components/SignUpContents";@@ -113,6 +115,14 @@ const Page: React.FC = () => {<TappableContainer onMaybeChangeHost={refreshHost}>{loading ? (<ActivityIndicator />+ ) : !showLogin ? (+ <PhotosAuthShell>+ <SignUpContents+ {...{ router, host }}+ onLogin={() => setShowLogin(true)}+ presentation={SignUpForm}+ />+ </PhotosAuthShell>) : (<><SlideshowPanel>@@ -145,17 +155,10 @@ const Page: React.FC = () => {]}><Stack sx={{ width: "320px", py: 4, gap: 4 }}>- {showLogin ? (- <LoginContents- {...{ host }}- onSignUp={() => setShowLogin(false)}- />- ) : (- <SignUpContents- {...{ router, host }}- onLogin={() => setShowLogin(true)}- />- )}+ <LoginContents+ {...{ host }}+ onSignUp={() => setShowLogin(false)}+ /></Stack></DesktopBox></>diff --git a/web/apps/photos/src/pages/signup.tsx b/web/apps/photos/src/pages/signup.tsxindex fa3c32852a..0ba3b35e6a 100644--- a/web/apps/photos/src/pages/signup.tsx+++ b/web/apps/photos/src/pages/signup.tsx@@ -1 +1,19 @@-export { default } from "ente-accounts/pages/signup";+import { SignUpForm } from "@/components/auth/SignUpForm";+import { PhotosAuthShell } from "@/components/PhotosAuthShell";+import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";+import AccountsSignUpPage from "ente-accounts/pages/signup";+import type React from "react";++function SignUpPresentation(props: SignUpPresentationProps): React.JSX.Element {+ return (+ <PhotosAuthShell>+ <SignUpForm {...props} />+ </PhotosAuthShell>+ );+}++function SignUpPage(): React.JSX.Element {+ return <AccountsSignUpPage presentation={SignUpPresentation} />;+}++export default SignUpPage;diff --git a/web/apps/photos/src/pages/verify.tsx b/web/apps/photos/src/pages/verify.tsxindex 7ec623fac9..31ee4a6e81 100644--- a/web/apps/photos/src/pages/verify.tsx+++ b/web/apps/photos/src/pages/verify.tsx@@ -1 +1,22 @@-export { default } from "ente-accounts/pages/verify";+import { VerifyEmailForm } from "@/components/auth/VerifyEmailForm";+import { PhotosAuthShell } from "@/components/PhotosAuthShell";+import AccountsVerifyPage, {+ type VerifyEmailPresentationProps,+} from "ente-accounts/pages/verify";+import type React from "react";++function VerifyEmailPresentation(+ props: VerifyEmailPresentationProps,+): React.JSX.Element {+ return (+ <PhotosAuthShell>+ <VerifyEmailForm {...props} />+ </PhotosAuthShell>+ );+}++function VerifyPage(): React.JSX.Element {+ return <AccountsVerifyPage presentation={VerifyEmailPresentation} />;+}++export default VerifyPage;diff --git a/web/packages/accounts/components/RecoveryKey.tsx b/web/packages/accounts/components/RecoveryKey.tsxindex 2cc0f9a5ae..6af447cb1d 100644--- a/web/packages/accounts/components/RecoveryKey.tsx+++ b/web/packages/accounts/components/RecoveryKey.tsx@@ -16,7 +16,7 @@ import type { ModalVisibilityProps } from "ente-base/components/utils/modal";import log from "ente-base/log";import { saveStringAsFile } from "ente-base/utils/web";import { t } from "i18next";-import { useCallback, useEffect, useState } from "react";+import { useCallback, useEffect, useState, type ComponentType } from "react";import {getUserRecoveryKey,recoveryKeyToMnemonic,@@ -27,14 +27,51 @@ type RecoveryKeyProps = ModalVisibilityProps & {showMiniDialog: (attributes: MiniDialogAttributes) => void;};+export interface RecoveryKeyPresentationProps {+ recoveryKey: string | undefined;+ onClose: () => void;+ onSave: () => void;+}+export const RecoveryKey: React.FC<RecoveryKeyProps> = ({open,onClose,showMiniDialog,}) => {- const [recoveryKey, setRecoveryKey] = useState<string | undefined>();const fullScreen = useIsSmallWidth();+ return (+ <Dialog+ fullScreen={fullScreen}+ open={open}+ onClose={onClose}+ // MUI hardcodes the dialog maxWidth for "xs" to 444px, even though+ // the "xs" breakpoint itself is 0.+ // https://github.com/mui/material-ui/issues/34646+ maxWidth="xs"+ fullWidth+ >+ <SpacedRow sx={{ p: "8px 4px 8px 0" }}>+ <DialogTitle variant="h3">{t("recovery_key")}</DialogTitle>+ <DialogCloseIconButton {...{ onClose }} />+ </SpacedRow>+ <RecoveryKeyContents {...{ open, onClose, showMiniDialog }} />+ </Dialog>+ );+};++interface RecoveryKeyContentsProps extends RecoveryKeyProps {+ presentation?: ComponentType<RecoveryKeyPresentationProps>;+}++export function RecoveryKeyContents({+ open,+ onClose,+ showMiniDialog,+ presentation: Presentation,+}: RecoveryKeyContentsProps): React.JSX.Element {+ const [recoveryKey, setRecoveryKey] = useState<string | undefined>();+const handleLoadError = useCallback((e: unknown) => {log.error("Failed to generate recovery key", e);@@ -54,26 +91,23 @@ export const RecoveryKey: React.FC<RecoveryKeyProps> = ({.catch(handleLoadError);}, [open, handleLoadError]);- const handleSaveClick = () => {+ function handleSaveClick() {saveRecoveryKeyMnemonicAsFile(recoveryKey!);onClose();- };+ }++ if (Presentation) {+ return (+ <Presentation+ recoveryKey={recoveryKey}+ onClose={onClose}+ onSave={handleSaveClick}+ />+ );+ }return (- <Dialog- fullScreen={fullScreen}- open={open}- onClose={onClose}- // MUI hardcodes the dialog maxWidth for "xs" to 444px, even though- // the "xs" breakpoint itself is 0.- // https://github.com/mui/material-ui/issues/34646- maxWidth="xs"- fullWidth- >- <SpacedRow sx={{ p: "8px 4px 8px 0" }}>- <DialogTitle variant="h3">{t("recovery_key")}</DialogTitle>- <DialogCloseIconButton {...{ onClose }} />- </SpacedRow>+ <><DialogContent><Typography sx={{ mb: 3 }}>{t("recovery_key_description")}@@ -107,9 +141,9 @@ export const RecoveryKey: React.FC<RecoveryKeyProps> = ({{t("save_key")}</FocusVisibleButton></DialogActions>- </Dialog>+ </>);-};+}const getUserRecoveryKeyMnemonic = async () =>recoveryKeyToMnemonic(await getUserRecoveryKey());diff --git a/web/packages/accounts/components/SignUpContents.tsx b/web/packages/accounts/components/SignUpContents.tsxindex 85f901c0d7..82af5a3ce2 100644--- a/web/packages/accounts/components/SignUpContents.tsx+++ b/web/packages/accounts/components/SignUpContents.tsx@@ -29,7 +29,11 @@ import {sendOTT,type GenerateKeysAndAttributesResult,} from "ente-accounts/services/user";-import { isWeakPassword } from "ente-accounts/utils/password";+import {+ estimatePasswordStrength,+ isWeakPassword,+ type PasswordStrength,+} from "ente-accounts/utils/password";import { LinkButton } from "ente-base/components/LinkButton";import { LoadingButton } from "ente-base/components/mui/LoadingButton";import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";@@ -39,7 +43,7 @@ import log from "ente-base/log";import { useFormik } from "formik";import { t } from "i18next";import type { NextRouter } from "next/router";-import React, { useCallback, useEffect, useState } from "react";+import React, { useCallback, useEffect, useMemo, useState } from "react";import { Trans } from "react-i18next";import { z } from "zod";import { PasswordStrengthHint } from "./PasswordStrength";@@ -52,12 +56,45 @@ interface SignUpContentsProps {router: NextRouter;onLogin: () => void;host: string | undefined;+ presentation?: React.ComponentType<SignUpPresentationProps>;+}++export interface SignUpPresentationProps {+ email: string;+ password: string;+ confirmPassword: string;+ referral: string;+ acceptedTerms: boolean;+ emailError: string | undefined;+ passwordError: string | undefined;+ confirmPasswordError: string | undefined;+ passwordStrength: PasswordStrength | undefined;+ isSubmitting: boolean;+ isSubmitDisabled: boolean;+ isJoinAlbumContext: boolean;+ host: string | undefined;+ onEmailChange: React.ChangeEventHandler<+ HTMLInputElement | HTMLTextAreaElement+ >;+ onPasswordChange: React.ChangeEventHandler<+ HTMLInputElement | HTMLTextAreaElement+ >;+ onConfirmPasswordChange: React.ChangeEventHandler<+ HTMLInputElement | HTMLTextAreaElement+ >;+ onReferralChange: React.ChangeEventHandler<+ HTMLInputElement | HTMLTextAreaElement+ >;+ onAcceptedTermsChange: (acceptedTerms: boolean) => void;+ onSubmit: React.SubmitEventHandler<HTMLFormElement>;+ onLogin: () => void;}export const SignUpContents: React.FC<SignUpContentsProps> = ({router,onLogin,host,+ presentation: Presentation,}) => {const [showPassword, setShowPassword] = useState(false);const [isJoinAlbumContext, setIsJoinAlbumContext] = useState(false);@@ -167,6 +204,49 @@ export const SignUpContents: React.FC<SignUpContentsProps> = ({},});+ const passwordStrength = useMemo(+ () =>+ Presentation && formik.values.password+ ? estimatePasswordStrength(formik.values.password)+ : undefined,+ [Presentation, formik.values.password],+ );++ function handleAcceptedTermsChange(acceptedTerms: boolean) {+ void formik.setFieldValue("acceptedTerms", acceptedTerms);+ }++ if (Presentation) {+ return (+ <Presentation+ email={formik.values.email}+ password={formik.values.password}+ confirmPassword={formik.values.confirmPassword}+ referral={formik.values.referral}+ acceptedTerms={formik.values.acceptedTerms}+ emailError={formik.errors.email}+ passwordError={formik.errors.password}+ confirmPasswordError={formik.errors.confirmPassword}+ passwordStrength={passwordStrength}+ isSubmitting={formik.isSubmitting}+ isSubmitDisabled={+ !formik.values.acceptedTerms ||+ !passwordStrength ||+ passwordStrength === "weak"+ }+ isJoinAlbumContext={isJoinAlbumContext}+ host={host}+ onEmailChange={formik.handleChange}+ onPasswordChange={formik.handleChange}+ onConfirmPasswordChange={formik.handleChange}+ onReferralChange={formik.handleChange}+ onAcceptedTermsChange={handleAcceptedTermsChange}+ onSubmit={formik.handleSubmit}+ onLogin={onLogin}+ />+ );+ }+const form = (<form onSubmit={formik.handleSubmit}><TextFielddiff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsxindex 4275ae994a..21dd00aad0 100644--- a/web/packages/accounts/pages/generate.tsx+++ b/web/packages/accounts/pages/generate.tsx@@ -4,7 +4,11 @@ import {AccountsPageFooter,AccountsPageTitle,} from "ente-accounts/components/layouts/centered-paper";-import { RecoveryKey } from "ente-accounts/components/RecoveryKey";+import {+ RecoveryKey,+ RecoveryKeyContents,+ type RecoveryKeyPresentationProps,+} from "ente-accounts/components/RecoveryKey";import {savedJustSignedUp,savedOriginalKeyAttributes,@@ -33,13 +37,17 @@ import { useBaseContext } from "ente-base/context";import log from "ente-base/log";import { t } from "i18next";import { useRouter } from "next/router";-import { useCallback, useEffect, useState } from "react";+import { useCallback, useEffect, useState, type ComponentType } from "react";import {NewPasswordForm,type NewPasswordFormProps,} from "../components/NewPasswordForm";-const Page: React.FC = () => {+export interface GeneratePageProps {+ recoveryKeyPresentation?: ComponentType<RecoveryKeyPresentationProps>;+}++const Page: React.FC<GeneratePageProps> = ({ recoveryKeyPresentation }) => {const { logout, showMiniDialog } = useBaseContext();const [userEmail, setUserEmail] = useState("");@@ -93,31 +101,42 @@ const Page: React.FC = () => {[userEmail],);- return (- <>- {openRecoveryKey ? (- <RecoveryKey- open={openRecoveryKey}- onClose={() => void router.push(appHomeRoute)}- showMiniDialog={showMiniDialog}- />- ) : userEmail ? (- <AccountsPageContents>- <AccountsPageTitle>{t("set_password")}</AccountsPageTitle>- <NewPasswordForm- userEmail={userEmail}- submitButtonTitle={t("set_password")}- onSubmit={handleSubmit}- />- <Divider sx={{ mt: 1 }} />- <AccountsPageFooter>- <LinkButton onClick={logout}>{t("go_back")}</LinkButton>- </AccountsPageFooter>- </AccountsPageContents>- ) : (- <LoadingIndicator />- )}- </>+ function handleRecoveryKeyClose() {+ void router.push(appHomeRoute);+ }++ if (openRecoveryKey && recoveryKeyPresentation) {+ return (+ <RecoveryKeyContents+ open+ onClose={handleRecoveryKeyClose}+ showMiniDialog={showMiniDialog}+ presentation={recoveryKeyPresentation}+ />+ );+ }++ return openRecoveryKey ? (+ <RecoveryKey+ open+ onClose={handleRecoveryKeyClose}+ showMiniDialog={showMiniDialog}+ />+ ) : userEmail ? (+ <AccountsPageContents>+ <AccountsPageTitle>{t("set_password")}</AccountsPageTitle>+ <NewPasswordForm+ userEmail={userEmail}+ submitButtonTitle={t("set_password")}+ onSubmit={handleSubmit}+ />+ <Divider sx={{ mt: 1 }} />+ <AccountsPageFooter>+ <LinkButton onClick={logout}>{t("go_back")}</LinkButton>+ </AccountsPageFooter>+ </AccountsPageContents>+ ) : (+ <LoadingIndicator />);};diff --git a/web/packages/accounts/pages/signup.tsx b/web/packages/accounts/pages/signup.tsxindex dfea7a50c7..b91edc37b3 100644--- a/web/packages/accounts/pages/signup.tsx+++ b/web/packages/accounts/pages/signup.tsx@@ -1,12 +1,24 @@import { AccountsPageContents } from "ente-accounts/components/layouts/centered-paper";-import { SignUpContents } from "ente-accounts/components/SignUpContents";+import {+ SignUpContents,+ type SignUpPresentationProps,+} from "ente-accounts/components/SignUpContents";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";+import React, {+ useCallback,+ useEffect,+ useState,+ type ComponentType,+} from "react";-const Page: React.FC = () => {+export interface SignUpPageProps {+ presentation?: ComponentType<SignUpPresentationProps>;+}++const Page: React.FC<SignUpPageProps> = ({ presentation }) => {const [loading, setLoading] = useState(true);const [host, setHost] = useState<string | undefined>(undefined);@@ -22,6 +34,8 @@ const Page: React.FC = () => {return loading ? (<LoadingIndicator />+ ) : presentation ? (+ <SignUpContents {...{ router, host, onLogin, presentation }} />) : (<AccountsPageContents><SignUpContents {...{ router, host, onLogin }} />diff --git a/web/packages/accounts/pages/verify.tsx b/web/packages/accounts/pages/verify.tsxindex 39eec9874a..1255fa9ded 100644--- a/web/packages/accounts/pages/verify.tsx+++ b/web/packages/accounts/pages/verify.tsx@@ -51,10 +51,22 @@ import log from "ente-base/log";import { saveAuthToken } from "ente-base/token";import { t } from "i18next";import { useRouter } from "next/router";-import { useCallback, useEffect, useState } from "react";+import { useCallback, useEffect, useState, type ComponentType } from "react";import { Trans } from "react-i18next";-const Page: React.FC = () => {+export interface VerifyEmailPresentationProps {+ email: string;+ resend: "enable" | "sending" | "sent";+ onSubmit: SingleInputFormProps["onSubmit"];+ onResend: () => void;+ onChangeEmail: () => void;+}++export interface VerifyPageProps {+ presentation?: ComponentType<VerifyEmailPresentationProps>;+}++const Page: React.FC<VerifyPageProps> = ({ presentation: Presentation }) => {const { logout, showMiniDialog } = useBaseContext();const [email, setEmail] = useState("");@@ -185,6 +197,21 @@ const Page: React.FC = () => {);}+ if (Presentation) {+ return (+ <>+ <Presentation+ email={email}+ resend={resend}+ onSubmit={onSubmit}+ onResend={resendEmail}+ onChangeEmail={logout}+ />+ <SecondFactorChoice {...secondFactorChoiceProps} />+ </>+ );+ }+return (<AccountsPageContents><AccountsPageTitle>