π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
feat(photos):add-account-settings-subtext
Aswin Asoka47f27490fc8
diff --git a/web/apps/photos/src/components/sidebar/Sidebar.tsx b/web/apps/photos/src/components/sidebar/Sidebar.tsxindex f805507c83..fd4088d7f1 100644--- a/web/apps/photos/src/components/sidebar/Sidebar.tsx+++ b/web/apps/photos/src/components/sidebar/Sidebar.tsx@@ -33,7 +33,11 @@ import {} from "@mui/material";import Typography from "@mui/material/Typography";import { RecoveryKey } from "ente-accounts/components/RecoveryKey";-import { openAccountsManagePasskeysPage } from "ente-accounts/services/passkey";+import {+ getPasskeyCount,+ openAccountsManagePasskeysPage,+} from "ente-accounts/services/passkey";+import { getActiveSessions } from "ente-accounts/services/sessions";import { isDesktop } from "ente-base/app";import { EnteLogo, EnteLogoBox } from "ente-base/components/EnteLogo";import { LinkButton } from "ente-base/components/LinkButton";@@ -76,6 +80,7 @@ import {isHLSGenerationSupported,toggleHLSGeneration,} from "ente-gallery/services/video";+import { formattedStorageByteSize } from "ente-gallery/utils/units";import {useAppLockSnapshot,useHLSGenerationStatusSnapshot,@@ -99,6 +104,7 @@ import {updateCustomDomain,updateMapEnabled,} from "ente-new/photos/services/settings";+import { get2FAStatus } from "ente-new/photos/services/user";import {familyAdminEmail,hasExceededStorageQuota,@@ -951,6 +957,42 @@ const Account: React.FC<AccountProps> = ({}) => {const { showMiniDialog } = useBaseContext();const userDetails = useUserDetailsSnapshot();+ const [twoFactorEnabled, setTwoFactorEnabled] = useState<boolean>();+ const [passkeyCount, setPasskeyCount] = useState<number>();+ const [sessionCount, setSessionCount] = useState<number>();++ const accountLabel = (label: string, subtext?: string) => (+ <Stack sx={{ gap: 0.5, alignItems: "flex-start", textAlign: "left" }}>+ <Typography sx={{ fontWeight: "medium" }}>{label}</Typography>+ {subtext && (+ <Typography+ variant="small"+ sx={{ color: "text.muted", fontWeight: 400 }}+ >+ {subtext}+ </Typography>+ )}+ </Stack>+ );+ const planSubtext = userDetails+ ? [+ formattedStorageByteSize(userDetails.subscription.storage),+ userDetails.subscription.period+ ? t(+ userDetails.subscription.period == "year"+ ? "yearly"+ : "monthly",+ )+ : undefined,+ userDetails.familyData+ ? t("account_family_members", {+ count: userDetails.familyData.members.length,+ })+ : undefined,+ ]+ .filter(Boolean)+ .join(" Β· ")+ : undefined;const router = useRouter();@@ -967,6 +1009,29 @@ const Account: React.FC<AccountProps> = ({const { show: showDeleteAccount, props: deleteAccountVisibilityProps } =useModalVisibility();+ useEffect(() => {+ if (+ !open ||+ twoFactorVisibilityProps.open ||+ sessionsVisibilityProps.open+ )+ return;+ let cancelled = false;+ void Promise.all([+ get2FAStatus().catch(() => undefined),+ getPasskeyCount().catch(() => undefined),+ getActiveSessions().catch(() => undefined),+ ]).then(([twoFactor, passkeys, sessions]) => {+ if (cancelled) return;+ setTwoFactorEnabled(twoFactor);+ setPasskeyCount(passkeys);+ setSessionCount(sessions?.length);+ });+ return () => {+ cancelled = true;+ };+ }, [open, twoFactorVisibilityProps.open, sessionsVisibilityProps.open]);+const isNonAdminFamilyMember = useMemo(() =>userDetails &&@@ -1094,7 +1159,7 @@ const Account: React.FC<AccountProps> = ({<Stack sx={{ px: 2, py: 1, gap: 3 }}><RowButtonGroup><RowButton- label={t("manage_plan")}+ label={accountLabel(t("manage_plan"), planSubtext)}onClick={handleManageSubscription}/></RowButtonGroup>@@ -1106,14 +1171,40 @@ const Account: React.FC<AccountProps> = ({</RowButtonGroup><RowButtonGroup><RowButton- label={t("two_factor")}+ label={accountLabel(+ t("two_factor"),+ twoFactorEnabled === undefined+ ? undefined+ : t(+ twoFactorEnabled+ ? "account_two_factor_on"+ : "account_two_factor_off",+ ),+ )}onClick={showTwoFactor}/><RowButtonDivider />- <RowButton label={t("passkeys")} onClick={handlePasskeys} />+ <RowButton+ label={accountLabel(+ t("passkeys"),+ passkeyCount === undefined+ ? undefined+ : t("account_passkeys", {+ count: passkeyCount,+ }),+ )}+ onClick={handlePasskeys}+ /><RowButtonDivider /><RowButton- label={t("active_sessions")}+ label={accountLabel(+ t("active_sessions"),+ sessionCount === undefined+ ? undefined+ : t("account_sessions", {+ count: sessionCount,+ }),+ )}onClick={handleActiveSessions}/></RowButtonGroup>@@ -1124,7 +1215,10 @@ const Account: React.FC<AccountProps> = ({/><RowButtonDivider /><RowButton- label={t("change_email")}+ label={accountLabel(+ t("change_email"),+ userDetails?.email,+ )}onClick={handleChangeEmail}/></RowButtonGroup>diff --git a/web/apps/photos/tests/passkey-count.test.ts b/web/apps/photos/tests/passkey-count.test.tsnew file mode 100644index 0000000000..3d57036c68--- /dev/null+++ b/web/apps/photos/tests/passkey-count.test.ts@@ -0,0 +1,57 @@+import { getPasskeyCount } from "ente-accounts/services/passkey";+import { afterEach, expect, test, vi } from "vitest";++vi.mock("ente-base/app", () => ({+ clientPackageName: "io.ente.photos.web",+ isDesktop: false,+}));+vi.mock("ente-base/origins", () => ({+ apiURL: (path: string) => Promise.resolve(path),+}));+vi.mock("ente-base/http", () => ({+ authenticatedRequestHeaders: () =>+ Promise.resolve({ "X-Auth-Token": "photos-token" }),+ ensureOk: (response: Response) => {+ if (!response.ok) throw new Error("Request failed");+ },+}));+vi.mock("ente-accounts/services/accounts-db", () => ({}));+vi.mock("ente-accounts/services/user", () => ({}));+vi.mock("ente-accounts/services/redirect", () => ({}));++afterEach(() => vi.unstubAllGlobals());++test.each([+ [[{ id: "key-1" }], 1],+ [null, 0],+ [[], 0],+])(+ "counts passkeys using an Accounts token: %j",+ async (passkeys, expected) => {+ const fetchMock = vi+ .fn()+ .mockResolvedValueOnce(+ Response.json({+ accountsToken: "accounts-token",+ accountsUrl: "https://accounts.ente.io",+ }),+ )+ .mockResolvedValueOnce(+ Response.json({+ passkeys,+ accountsUrl: "https://accounts.ente.io",+ }),+ );+ vi.stubGlobal("fetch", fetchMock);+ expect(await getPasskeyCount()).toBe(expected);+ expect(fetchMock).toHaveBeenNthCalledWith(1, "/users/accounts-token", {+ headers: { "X-Auth-Token": "photos-token" },+ });+ expect(fetchMock).toHaveBeenNthCalledWith(2, "/passkeys", {+ headers: {+ "X-Auth-Token": "accounts-token",+ "X-Client-Package": "io.ente.photos.web",+ },+ });+ },+);diff --git a/web/packages/accounts/services/passkey.ts b/web/packages/accounts/services/passkey.tsindex 49499f9d91..326c7f4a07 100644--- a/web/packages/accounts/services/passkey.ts+++ b/web/packages/accounts/services/passkey.ts@@ -18,6 +18,21 @@ import { apiURL } from "ente-base/origins";import { z } from "zod";import { unstashRedirect } from "./redirect";+export const getPasskeyCount = async () => {+ const { accountsToken } = await getAccountsTokenAndURL();+ const res = await fetch(await apiURL("/passkeys"), {+ headers: {+ "X-Auth-Token": accountsToken,+ "X-Client-Package": clientPackageName,+ },+ });+ ensureOk(res);+ const { passkeys } = z+ .object({ passkeys: z.array(z.unknown()).nullish() })+ .parse(await res.json());+ return passkeys?.length ?? 0;+};+export const passkeyVerificationRedirectURL = (accountsURL: string,passkeySessionID: string,diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.jsonindex de763a8d7c..423100c5cb 100644--- a/web/packages/base/locales/en-US/translation.json+++ b/web/packages/base/locales/en-US/translation.json@@ -1,4 +1,12 @@{+ "account_two_factor_on": "On",+ "account_two_factor_off": "Off",+ "account_passkeys_one": "{{count}} key",+ "account_passkeys_other": "{{count}} keys",+ "account_sessions_one": "{{count}} device",+ "account_sessions_other": "{{count}} devices",+ "account_family_members_one": "{{count}} member",+ "account_family_members_other": "{{count}} members","intro_slide_1_title": "Private backups<br/>for your memories","intro_slide_1": "End-to-end encrypted by default","intro_slide_2_title": "Safely stored<br/>at a fallout shelter",