π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refactor(photos):inline-two-factor-and-map-toggles
Aswin Asokc61803ac1f36
diff --git a/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsx b/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsxdeleted file mode 100644index 69899a44bd..0000000000--- a/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsx+++ /dev/null@@ -1,153 +0,0 @@-import LockIcon from "@mui/icons-material/Lock";-import { Stack, Typography } from "@mui/material";-import {- savedPartialLocalUser,- updateSavedLocalUser,-} from "ente-accounts/services/accounts-db";-import {- RowButton,- RowButtonGroup,- RowButtonGroupHint,- RowSwitch,-} from "ente-base/components/RowButton";-import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";-import {- TitledNestedSidebarDrawer,- type NestedSidebarDrawerVisibilityProps,-} from "ente-base/components/mui/SidebarDrawer";-import { useBaseContext } from "ente-base/context";-import { disable2FA, get2FAStatus } from "ente-new/photos/services/user";-import { t } from "i18next";-import router, { useRouter } from "next/router";-import { useEffect, useState } from "react";--export const TwoFactorSettings: React.FC<- NestedSidebarDrawerVisibilityProps-> = ({ open, onClose, onRootClose }) => {- const [isTwoFactorEnabled, setIsTwoFactorEnabled] = useState(false);-- useEffect(() => {- if (savedPartialLocalUser()?.isTwoFactorEnabled) {- setIsTwoFactorEnabled(true);- }- }, []);-- useEffect(() => {- if (!open) return;- void (async () => {- const isEnabled = await get2FAStatus();- setIsTwoFactorEnabled(isEnabled);- updateSavedLocalUser({ isTwoFactorEnabled: isEnabled });- })();- }, [open]);-- const handleRootClose = () => {- onClose();- onRootClose();- };-- return (- <TitledNestedSidebarDrawer- maxWidth="440px"- {...{ open, onClose }}- onRootClose={handleRootClose}- title={t("two_factor_authentication")}- >- {isTwoFactorEnabled ? (- <ManageDrawerContents onRootClose={handleRootClose} />- ) : (- <SetupDrawerContents onRootClose={handleRootClose} />- )}- </TitledNestedSidebarDrawer>- );-};--type ContentsProps = Pick<NestedSidebarDrawerVisibilityProps, "onRootClose">;--const SetupDrawerContents: React.FC<ContentsProps> = ({ onRootClose }) => {- const router = useRouter();-- const configure = () => {- onRootClose();- void router.push("/two-factor/setup");- };-- return (- <Stack sx={{ px: "16px", py: "20px", alignItems: "center" }}>- <LockIcon sx={{ fontSize: "40px", color: "text.muted" }} />- <Typography- sx={{- color: "text.muted",- textAlign: "center",- marginBlock: "32px 36px",- }}- >- {t("two_factor_info")}- </Typography>- <FocusVisibleButton color="accent" fullWidth onClick={configure}>- {t("enable_two_factor")}- </FocusVisibleButton>- </Stack>- );-};--const ManageDrawerContents: React.FC<ContentsProps> = ({ onRootClose }) => {- const { showMiniDialog } = useBaseContext();-- const confirmDisable = () =>- showMiniDialog({- title: t("disable_two_factor"),- message: t("disable_two_factor_message"),- continue: {- text: t("disable"),- color: "critical",- action: disable,- },- });-- const disable = async () => {- await disable2FA();- updateSavedLocalUser({ isTwoFactorEnabled: undefined });- onRootClose();- };-- const confirmReconfigure = () =>- showMiniDialog({- title: t("update_two_factor"),- message: t("update_two_factor_message"),- continue: {- text: t("update"),- color: "primary",- action: reconfigure,- },- });-- const reconfigure = async () => {- onRootClose();- await router.push("/two-factor/setup");- };-- return (- <Stack sx={{ px: "16px", py: "20px", gap: "24px" }}>- <RowButtonGroup>- <RowSwitch- label={t("enabled")}- checked={true}- onClick={confirmDisable}- />- </RowButtonGroup>-- <Stack>- <RowButtonGroup>- <RowButton- label={t("reconfigure")}- onClick={confirmReconfigure}- />- </RowButtonGroup>- <RowButtonGroupHint>- {t("reconfigure_two_factor_hint")}- </RowButtonGroupHint>- </Stack>- </Stack>- );-};diff --git a/web/apps/photos/src/components/sidebar/accounts/Account.tsx b/web/apps/photos/src/components/sidebar/accounts/Account.tsxindex 3ad347faf6..0d2543c04f 100644--- a/web/apps/photos/src/components/sidebar/accounts/Account.tsx+++ b/web/apps/photos/src/components/sidebar/accounts/Account.tsx@@ -4,9 +4,11 @@ import {} from "@/services/recovery-key";import { Box, Stack } from "@mui/material";import { RecoveryKey } from "ente-accounts/components/RecoveryKey";+import { updateSavedLocalUser } from "ente-accounts/services/accounts-db";import { openAccountsManagePasskeysPage } from "ente-accounts/services/passkey";import { getActiveSessions } from "ente-accounts/services/sessions";import { isDesktop } from "ente-base/app";+import { EnteSwitch } from "ente-base/components/EnteSwitch";import {TitledNestedSidebarDrawer,type NestedSidebarDrawerVisibilityProps,@@ -21,7 +23,7 @@ import {suppressAutoLockOnBlurForTrustedPrompt,} from "ente-new/photos/services/app-lock";import type { SidebarActionID } from "ente-new/photos/services/search/types";-import { get2FAStatus } from "ente-new/photos/services/user";+import { disable2FA, get2FAStatus } from "ente-new/photos/services/user";import {familyMemberStorageLimit,isFamilyAdmin,@@ -36,7 +38,6 @@ import { useRouter } from "next/router";import React, { useCallback, useEffect, useMemo, useState } from "react";import { DeleteAccount } from "../account/DeleteAccount";import { SessionsSettings } from "../account/SessionsSettings";-import { TwoFactorSettings } from "../account/TwoFactorSettings";import { ManageMemberSubscription } from "./ManageMemberSubscription";import { openManageSubscription } from "./subscription";@@ -72,6 +73,7 @@ export const Account: React.FC<AccountProps> = ({const { showMiniDialog } = useBaseContext();const userDetails = useUserDetailsSnapshot();const [twoFactorEnabled, setTwoFactorEnabled] = useState<boolean>();+ const [disablingTwoFactor, setDisablingTwoFactor] = useState(false);const [sessionCount, setSessionCount] = useState<number>();let planSubtext: string | undefined;@@ -109,20 +111,13 @@ export const Account: React.FC<AccountProps> = ({} = useModalVisibility();const { show: showRecoveryKey, props: recoveryKeyVisibilityProps } =useModalVisibility();- const { show: showTwoFactor, props: twoFactorVisibilityProps } =- useModalVisibility();const { show: showSessions, props: sessionsVisibilityProps } =useModalVisibility();const { show: showDeleteAccount, props: deleteAccountVisibilityProps } =useModalVisibility();useEffect(() => {- if (- !open ||- twoFactorVisibilityProps.open ||- sessionsVisibilityProps.open- )- return;+ if (!open || sessionsVisibilityProps.open) return;let cancelled = false;void Promise.all([get2FAStatus().catch(() => undefined),@@ -135,7 +130,7 @@ export const Account: React.FC<AccountProps> = ({return () => {cancelled = true;};- }, [open, twoFactorVisibilityProps.open, sessionsVisibilityProps.open]);+ }, [open, sessionsVisibilityProps.open]);const isNonAdminFamilyMember = useMemo(() =>@@ -211,8 +206,62 @@ export const Account: React.FC<AccountProps> = ({showDeleteAccount();}, [showDeleteAccount]);+ const configureTwoFactor = useCallback(() => {+ onClose();+ onRootClose();+ void router.push("/two-factor/setup");+ }, [onClose, onRootClose, router]);++ const handleTwoFactorToggle = useCallback(() => {+ if (twoFactorEnabled === undefined || disablingTwoFactor) return;+ if (!twoFactorEnabled) {+ configureTwoFactor();+ return;+ }+ showMiniDialog({+ title: t("disable_two_factor"),+ message: t("disable_two_factor_message"),+ continue: {+ text: t("disable"),+ color: "critical",+ action: async () => {+ setDisablingTwoFactor(true);+ try {+ await disable2FA();+ updateSavedLocalUser({ isTwoFactorEnabled: undefined });+ setTwoFactorEnabled(false);+ } finally {+ setDisablingTwoFactor(false);+ }+ },+ },+ });+ }, [+ twoFactorEnabled,+ disablingTwoFactor,+ configureTwoFactor,+ showMiniDialog,+ ]);++ const handleReconfigureTwoFactor = useCallback(() => {+ showMiniDialog({+ title: t("update_two_factor"),+ message: t("update_two_factor_message"),+ continue: {+ text: t("update"),+ color: "primary",+ action: configureTwoFactor,+ },+ });+ }, [configureTwoFactor, showMiniDialog]);+useEffect(() => {if (!open || !pendingAction) return;+ if (+ pendingAction == "account.twoFactor" &&+ twoFactorEnabled === undefined+ )+ return;switch (pendingAction) {case "account.subscription":handleManageSubscription();@@ -221,8 +270,10 @@ export const Account: React.FC<AccountProps> = ({void handleRecoveryKey();break;case "account.twoFactor.reconfigure":+ handleReconfigureTwoFactor();+ break;case "account.twoFactor":- showTwoFactor();+ handleTwoFactorToggle();break;case "account.passkeys":void handlePasskeys();@@ -252,7 +303,9 @@ export const Account: React.FC<AccountProps> = ({open,onActionHandled,pendingAction,- showTwoFactor,+ handleReconfigureTwoFactor,+ handleTwoFactorToggle,+ twoFactorEnabled,]);return (@@ -279,8 +332,26 @@ export const Account: React.FC<AccountProps> = ({? undefined: t(twoFactorEnabled ? "on" : "off")}- onClick={showTwoFactor}+ endIcon={+ <EnteSwitch+ checked={twoFactorEnabled === true}+ disabled={+ twoFactorEnabled === undefined ||+ disablingTwoFactor+ }+ onChange={handleTwoFactorToggle}+ slotProps={{+ input: { "aria-label": t("two_factor") },+ }}+ />+ }/>+ {twoFactorEnabled && (+ <RowCard+ title={t("update_two_factor")}+ onClick={handleReconfigureTwoFactor}+ />+ )}<RowCard title={t("passkeys")} onClick={handlePasskeys} /><RowCardtitle={t("active_sessions")}@@ -320,10 +391,6 @@ export const Account: React.FC<AccountProps> = ({{...{ userDetails }}/>)}- <TwoFactorSettings- {...twoFactorVisibilityProps}- onRootClose={onRootClose}- /><SessionsSettings{...sessionsVisibilityProps}onRootClose={onRootClose}diff --git a/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx b/web/apps/photos/src/components/sidebar/preferences/Preferences.tsxindex 74b5805525..53c7f74a96 100644--- a/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx+++ b/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx@@ -118,8 +118,6 @@ export const Preferences: React.FC<PreferencesProps> = ({}) => {const { show: showDomainSettings, props: domainSettingsVisibilityProps } =useModalVisibility();- const { show: showMapSettings, props: mapSettingsVisibilityProps } =- useModalVisibility();const {show: showAdvancedSettings,props: advancedSettingsVisibilityProps,@@ -127,6 +125,15 @@ export const Preferences: React.FC<PreferencesProps> = ({const { show: showMLSettings, props: mlSettingsVisibilityProps } =useModalVisibility();+ const { mapEnabled } = useSettingsSnapshot();+ const [mapErrorMessage, setMapErrorMessage] = useState<string>();+ const handleToggleMap = useCallback(() => {+ setMapErrorMessage(undefined);+ void updateMapEnabled(!mapEnabled).catch(() => {+ setMapErrorMessage(t("generic_error"));+ });+ }, [mapEnabled]);+const hlsGenStatusSnapshot = useHLSGenerationStatusSnapshot();const isHLSGenerationEnabled = !!hlsGenStatusSnapshot?.enabled;const hlsProcessedFraction = hlsGenStatusSnapshot?.enabled@@ -143,9 +150,6 @@ export const Preferences: React.FC<PreferencesProps> = ({case "preferences.customDomains":showDomainSettings();break;- case "preferences.map":- showMapSettings();- break;case "preferences.advanced":case "preferences.fasterUpload":case "preferences.openOnStartup":@@ -154,6 +158,7 @@ export const Preferences: React.FC<PreferencesProps> = ({case "preferences.mlSearch":showMLSettings();break;+ case "preferences.map":case "preferences.language":case "preferences.theme":case "preferences.streamableVideos":@@ -167,7 +172,6 @@ export const Preferences: React.FC<PreferencesProps> = ({showAdvancedSettings,showDomainSettings,showMLSettings,- showMapSettings,]);const handleRootClose = () => {@@ -200,11 +204,26 @@ export const Preferences: React.FC<PreferencesProps> = ({endIcon={<ChevronRightIcon />}onClick={showDomainSettings}/>- <RowButton- endIcon={<ChevronRightIcon />}- label={t("map")}- onClick={showMapSettings}- />+ <Stack>+ <RowButtonGroup>+ <RowSwitch+ label={t("map")}+ checked={mapEnabled}+ onClick={handleToggleMap}+ />+ </RowButtonGroup>+ <RowButtonGroupHint>+ {t("maps_privacy_notice")}+ </RowButtonGroupHint>+ {mapErrorMessage && (+ <Typography+ variant="small"+ sx={{ color: "critical.main", mt: 0.5 }}+ >+ {mapErrorMessage}+ </Typography>+ )}+ </Stack><RowButtonendIcon={<ChevronRightIcon />}label={t("advanced")}@@ -259,10 +278,6 @@ export const Preferences: React.FC<PreferencesProps> = ({{...domainSettingsVisibilityProps}onRootClose={onRootClose}/>- <MapSettings- {...mapSettingsVisibilityProps}- onRootClose={onRootClose}- /><AdvancedSettings{...advancedSettingsVisibilityProps}onRootClose={onRootClose}@@ -533,61 +548,6 @@ const DomainItem: React.FC<React.PropsWithChildren<DomainSectionProps>> = ({</Stack>);-const MapSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({- open,- onClose,- onRootClose,-}) => {- const { mapEnabled } = useSettingsSnapshot();- const [errorMessage, setErrorMessage] = useState<string | undefined>();-- const handleToggle = useCallback(() => {- setErrorMessage(undefined);- void updateMapEnabled(!mapEnabled).catch(() => {- setErrorMessage(t("generic_error"));- });- }, [mapEnabled]);-- const handleRootClose = () => {- onClose();- onRootClose();- };-- return (- <TitledNestedSidebarDrawer- maxWidth="440px"- {...{ open, onClose }}- onRootClose={handleRootClose}- title={t("map")}- >- <Stack sx={{ px: 2, py: "20px" }}>- <RowButtonGroup>- <RowSwitch- label={t("enabled")}- checked={mapEnabled}- onClick={handleToggle}- />- </RowButtonGroup>- <RowButtonGroupHint>- {t("maps_privacy_notice")}- </RowButtonGroupHint>- {errorMessage && (- <Typography- variant="small"- sx={{- color: "critical.main",- mt: 0.5,- textAlign: "center",- }}- >- {errorMessage}- </Typography>- )}- </Stack>- </TitledNestedSidebarDrawer>- );-};-const AdvancedSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({open,onClose,