π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
update(photos):update-verify-2fa-page
Aswin Asokce42f725ef4b
diff --git a/web/apps/photos/src/components/auth/TwoFactorForm.tsx b/web/apps/photos/src/components/auth/TwoFactorForm.tsxnew file mode 100644index 0000000000..a0b73dcae3--- /dev/null+++ b/web/apps/photos/src/components/auth/TwoFactorForm.tsx@@ -0,0 +1,115 @@+import { styled } from "@mui/material";+import type { TwoFactorVerifyPresentationProps } from "ente-accounts/pages/two-factor/verify";+import { isHTTP401Error } from "ente-base/http";+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 TwoFactorForm({+ onSubmit,+ onRecover,+ onChangeEmail,+}: TwoFactorVerifyPresentationProps): React.JSX.Element {+ const formik = useFormik({+ initialValues: { otp: "" },+ validateOnBlur: false,+ validateOnChange: false,+ onSubmit: async ({ otp }, { setFieldError, resetForm }) => {+ if (!completeCodePattern.test(otp)) {+ setFieldError("otp", t("required"));+ return;+ }++ try {+ await onSubmit(otp);+ resetForm();+ } catch (error) {+ log.error("Failed to submit 2FA code", error);+ resetForm();+ setFieldError(+ "otp",+ isHTTP401Error(error)+ ? t("incorrect_code")+ : t("generic_error"),+ );+ }+ },+ });++ function handleCodeChange(otp: string) {+ const shouldAutoSubmit =+ !completeCodePattern.test(formik.values.otp) &&+ completeCodePattern.test(otp);++ void formik.setFieldValue("otp", otp).then(() => {+ if (shouldAutoSubmit && !formik.isSubmitting) {+ void formik.submitForm();+ }+ });+ }++ return (+ <>+ <ScreenHeader+ title={t("two_factor")}+ subtitle={t("enter_two_factor_otp")}+ />+ <Form onSubmit={formik.handleSubmit}>+ <FormFields>+ <OTPField+ name="otp"+ value={formik.values.otp}+ onChange={handleCodeChange}+ error={Boolean(formik.errors.otp)}+ disabled={formik.isSubmitting}+ autoFocus+ />+ {formik.errors.otp ? (+ <Message kind="error">{formik.errors.otp}</Message>+ ) : null}+ </FormFields>+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={formik.isSubmitting}+ disabled={!completeCodePattern.test(formik.values.otp)}+ >+ {t("verify")}+ </Button>+ <FooterLinks>+ <TextLink+ onClick={onRecover}+ disabled={formik.isSubmitting}+ >+ {t("lost_2fa_device")}+ </TextLink>+ <TextLink+ onClick={onChangeEmail}+ disabled={formik.isSubmitting}+ >+ {t("change_email")}+ </TextLink>+ </FooterLinks>+ </FormFooter>+ </Form>+ </>+ );+}++const FooterLinks = styled("div")({+ display: "flex",+ justifyContent: "space-between",+ gap: "16px",+});diff --git a/web/apps/photos/src/pages/two-factor/verify.tsx b/web/apps/photos/src/pages/two-factor/verify.tsxindex f3f3c99656..c3e22ab684 100644--- a/web/apps/photos/src/pages/two-factor/verify.tsx+++ b/web/apps/photos/src/pages/two-factor/verify.tsx@@ -1 +1,27 @@-export { default } from "ente-accounts/pages/two-factor/verify";+import { TwoFactorForm } from "@/components/auth/TwoFactorForm";+import { PhotosAuthShell } from "@/components/PhotosAuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsTwoFactorVerifyPage, {+ type TwoFactorVerifyPresentationProps,+} from "ente-accounts/pages/two-factor/verify";+import type React from "react";++function TwoFactorPresentation(+ props: TwoFactorVerifyPresentationProps,+): React.JSX.Element {+ return (+ <PhotosAuthShell>+ <TwoFactorForm {...props} />+ </PhotosAuthShell>+ );+}++function TwoFactorVerifyPage(): React.JSX.Element {+ if (!featureFlags.enableNewPhotosAuthFlow) {+ return <AccountsTwoFactorVerifyPage />;+ }++ return <AccountsTwoFactorVerifyPage presentation={TwoFactorPresentation} />;+}++export default TwoFactorVerifyPage;diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsxindex f2b1f920e7..f43f70597f 100644--- a/web/packages/accounts/pages/two-factor/verify.tsx+++ b/web/packages/accounts/pages/two-factor/verify.tsx@@ -13,7 +13,7 @@ import { useBaseContext } from "ente-base/context";import { isHTTPErrorWithStatus } from "ente-base/http";import { t } from "i18next";import { useRouter } from "next/router";-import { useCallback, useEffect, useState } from "react";+import { useCallback, useEffect, useState, type ComponentType } from "react";import {AccountsPageContents,AccountsPageFooter,@@ -21,7 +21,19 @@ import {} from "../../components/layouts/centered-paper";import { unstashRedirect } from "../../services/redirect";-const Page: React.FC = () => {+export interface TwoFactorVerifyPresentationProps {+ onSubmit: (otp: string) => Promise<void>;+ onRecover: () => void;+ onChangeEmail: () => void;+}++export interface TwoFactorVerifyPageProps {+ presentation?: ComponentType<TwoFactorVerifyPresentationProps>;+}++const Page: React.FC<TwoFactorVerifyPageProps> = ({+ presentation: Presentation,+}) => {const { logout } = useBaseContext();const [twoFactorSessionID, setTwoFactorSessionID] = useState("");@@ -62,6 +74,21 @@ const Page: React.FC = () => {[logout, router, twoFactorSessionID],);+ const handleRecover = useCallback(+ () => void router.push("/two-factor/recover"),+ [router],+ );++ if (Presentation) {+ return (+ <Presentation+ onSubmit={handleSubmit}+ onRecover={handleRecover}+ onChangeEmail={logout}+ />+ );+ }+return (<AccountsPageContents><AccountsPageTitle>{t("two_factor")}</AccountsPageTitle>@@ -70,7 +97,7 @@ const Page: React.FC = () => {submitButtonText={t("verify")}/><AccountsPageFooter>- <LinkButton onClick={() => router.push("/two-factor/recover")}>+ <LinkButton onClick={handleRecover}>{t("lost_2fa_device")}</LinkButton><LinkButton onClick={logout}>{t("change_email")}</LinkButton>