π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Acquire Legacy sessions in Locker services
Manav Rathi3464dd1977f3
diff --git a/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx b/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsxindex ba216d4dec..26937b64d2 100644--- a/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx+++ b/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx@@ -1,11 +1,10 @@-import { ensureAuthenticatedSession } from "@/services/authenticated-session";+import * as legacy from "@/services/legacy";import { UserAdd01Icon } from "@hugeicons/core-free-icons";import { CircularProgress } from "@mui/material";import {LegacyDrawerContent,type LegacySuggestedUser,} from "ente-contacts/legacy";-import * as legacy from "ente-locker-wasm/legacy";import { t } from "i18next";import React from "react";import { LockerSidebarCardButton } from "./LockerSidebarCardButton";@@ -27,7 +26,6 @@ export const LockerLegacyDrawer: React.FC<intro={t("legacy_intro")}open={open}suggestedUsers={suggestedUsers}- getSession={ensureAuthenticatedSession}operations={legacy}renderAddContactButton={({ onClick, disabled, loading }) => (<LockerSidebarCardButtondiff --git a/web/apps/locker/src/services/legacy.ts b/web/apps/locker/src/services/legacy.tsnew file mode 100644index 0000000000..3bc0475e41--- /dev/null+++ b/web/apps/locker/src/services/legacy.ts@@ -0,0 +1,84 @@+import type { LegacyContactRecord } from "ente-contacts/legacy";+import * as legacy from "ente-locker-wasm/legacy";+import { ensureAuthenticatedSession } from "./authenticated-session";++export const getInfo = async () =>+ legacy.getInfo(await ensureAuthenticatedSession());++export const publicKey = async (email: string) =>+ legacy.publicKey(await ensureAuthenticatedSession(), email);++export const verificationID = legacy.verificationID;++export const addContact = async (+ email: string,+ recoveryNoticeInDays?: number,+) =>+ legacy.addContact(+ await ensureAuthenticatedSession(),+ email,+ recoveryNoticeInDays,+ );++export const updateContact = async (+ userID: number,+ emergencyContactID: number,+ state: LegacyContactRecord["state"],+) =>+ legacy.updateContact(+ await ensureAuthenticatedSession(),+ userID,+ emergencyContactID,+ state,+ );++export const updateRecoveryNotice = async (+ emergencyContactID: number,+ recoveryNoticeInDays: number,+) =>+ legacy.updateRecoveryNotice(+ await ensureAuthenticatedSession(),+ emergencyContactID,+ recoveryNoticeInDays,+ );++export const startRecovery = async (+ userID: number,+ emergencyContactID: number,+) =>+ legacy.startRecovery(+ await ensureAuthenticatedSession(),+ userID,+ emergencyContactID,+ );++export const stopRecovery = async (+ recoveryID: string,+ userID: number,+ emergencyContactID: number,+) =>+ legacy.stopRecovery(+ await ensureAuthenticatedSession(),+ recoveryID,+ userID,+ emergencyContactID,+ );++export const rejectRecovery = async (+ recoveryID: string,+ userID: number,+ emergencyContactID: number,+) =>+ legacy.rejectRecovery(+ await ensureAuthenticatedSession(),+ recoveryID,+ userID,+ emergencyContactID,+ );++export const changePassword = async (recoveryID: string, newPassword: string) =>+ legacy.changePassword(+ await ensureAuthenticatedSession(),+ recoveryID,+ newPassword,+ );diff --git a/web/checks/wasm-exports/exports.mjs b/web/checks/wasm-exports/exports.mjsindex 93d2f77c3f..1ff88c9720 100644--- a/web/checks/wasm-exports/exports.mjs+++ b/web/checks/wasm-exports/exports.mjs@@ -205,15 +205,6 @@ export function unusedExports(files, projects, rustOrigins = new Map()) {ts.isPropertyAccessExpression(node.parent))) {reference(checker.getSymbolAtLocation(node));- const expected = checker.getContextualType(node);- for (const property of expected?.getProperties() ?? []) {- reference(- checker.getPropertyOfType(- checker.getTypeAtLocation(node),- property.name,- ),- );- }} else if (ts.isElementAccessExpression(node) &&ts.isStringLiteral(node.argumentExpression)diff --git a/web/checks/wasm-exports/test.mjs b/web/checks/wasm-exports/test.mjsindex 6d7b9f5c64..9086960c28 100644--- a/web/checks/wasm-exports/test.mjs+++ b/web/checks/wasm-exports/test.mjs@@ -121,49 +121,6 @@ test("production references cross lazy loaders, aliases, destructuring and worke}});-test("injected operations count only properties in the receiving interface", () => {- const directory = mkdtempSync(join(tmpdir(), "wasm-operations-"));- try {- const operations = join(directory, "operations.ts");- const entry = join(directory, "entry.tsx");- writeFileSync(- operations,- `- export const getInfo = () => "info";- export const unused = () => "unused";- `,- );- writeFileSync(- entry,- `- import * as operations from "./operations";- interface Operations { getInfo(): string; }- const View = (props: { operations: Operations }) => null;- export const app = <View operations={operations} />;- `,- );- const result = unusedExports(- [operations],- [- {- entryFiles: [entry],- options: {- jsx: ts.JsxEmit.Preserve,- module: ts.ModuleKind.ESNext,- moduleResolution: ts.ModuleResolutionKind.Bundler,- },- },- ],- );- assert.deepEqual(- result.map(({ name }) => name),- ["unused"],- );- } finally {- rmSync(directory, { recursive: true, force: true });- }-});-test("copies of a Rust export need one caller across artifacts", () => {const directory = mkdtempSync(join(tmpdir(), "wasm-export-origins-"));const file = (name, contents) => {diff --git a/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx b/web/packages/contacts/legacy/components/LegacyAddContactContent.tsxindex 769a396e57..b0c83abb0a 100644--- a/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx+++ b/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx@@ -10,7 +10,7 @@ import {import { ensureLocalUser } from "ente-accounts/services/user";import { useBaseContext } from "ente-base/context";import { isNamedError } from "ente-base/error";-import { useMemo, useState } from "react";+import React, { useMemo, useState } from "react";import type { LegacyOperations, LegacySuggestedUser } from "..";import { contactsDisplaySnapshot } from "../..";import { resolveContactDisplayFromSnapshot } from "../../resolver";@@ -20,9 +20,8 @@ import { LegacyRecoveryDayPicker } from "./LegacyRecoveryDayPicker";const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;-interface LegacyAddContactContentProps<Session> {- getSession: () => Promise<Session>;- operations: LegacyOperations<Session>;+interface LegacyAddContactContentProps {+ operations: LegacyOperations;existingEmails: string[];onAdded: () => Promise<void>;suggestedUsers: LegacySuggestedUser[];@@ -34,14 +33,15 @@ const nonEnteDialogAttributes = (email: string) => ({message: `${email} is not linked to an Ente account yet, so it cannot be used as a trusted contact.`,});-export const LegacyAddContactContent = <Session,>({- getSession,+export const LegacyAddContactContent: React.FC<+ LegacyAddContactContentProps+> = ({operations,existingEmails,onAdded,suggestedUsers,variant = "page",-}: LegacyAddContactContentProps<Session>) => {+}) => {const { showMiniDialog, onGenericError } = useBaseContext();const currentUser = ensureLocalUser();const [email, setEmail] = useState("");@@ -104,10 +104,7 @@ export const LegacyAddContactContent = <Session,>({return;}try {- const key = await operations.publicKey(- await getSession(),- normalizedEmail,- );+ const key = await operations.publicKey(normalizedEmail);const verificationID = key? await operations.verificationID(key): undefined;@@ -164,10 +161,7 @@ export const LegacyAddContactContent = <Session,>({void (async () => {try {- const key = await operations.publicKey(- await getSession(),- normalizedEmail,- );+ const key = await operations.publicKey(normalizedEmail);if (!key) {showMiniDialog(nonEnteDialogAttributes(normalizedEmail));return;@@ -199,7 +193,6 @@ export const LegacyAddContactContent = <Session,>({action: async () => {try {await operations.addContact(- await getSession(),normalizedEmail,selectedRecoveryDays,);diff --git a/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx b/web/packages/contacts/legacy/components/LegacyDrawerContent.tsxindex c6ae04ee77..2131f7b4cf 100644--- a/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx+++ b/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx@@ -146,7 +146,7 @@ const warningBannerSx = {backgroundColor: "rgba(255, 82, 82, 0.14)",};-interface LegacyDrawerContentProps<Session> {+interface LegacyDrawerContentProps {intro?: React.ReactNode;renderAddContactButton?: (props: {onClick: () => void;@@ -154,8 +154,7 @@ interface LegacyDrawerContentProps<Session> {loading: boolean;}) => React.ReactNode;open: boolean;- getSession: () => Promise<Session>;- operations: LegacyOperations<Session>;+ operations: LegacyOperations;suggestedUsers?: LegacySuggestedUser[];}@@ -167,14 +166,13 @@ interface ConfirmActionDialogInput {action: () => Promise<void>;}-export const LegacyDrawerContent = <Session,>({+export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({intro,open,- getSession,operations,suggestedUsers = [],renderAddContactButton,-}: LegacyDrawerContentProps<Session>) => {+}) => {const { showMiniDialog, onGenericError } = useBaseContext();const [info, setInfo] = useState<LegacyInfo | undefined>();const [isLoading, setIsLoading] = useState(false);@@ -187,7 +185,7 @@ export const LegacyDrawerContent = <Session,>({async (reportErrors: boolean) => {setIsLoading(true);try {- setInfo(await operations.getInfo(await getSession()));+ setInfo(await operations.getInfo());return true;} catch (error) {if (reportErrors) {@@ -203,7 +201,7 @@ export const LegacyDrawerContent = <Session,>({setIsLoading(false);}},- [getSession, operations, onGenericError],+ [operations, onGenericError],);const refresh = useCallback(async () => {@@ -339,7 +337,6 @@ export const LegacyDrawerContent = <Session,>({setIsSubmitting(true);try {await operations.updateRecoveryNotice(- await getSession(),selectedOwnerContact.emergencyContact.id,selectedOwnerDays,);@@ -359,7 +356,6 @@ export const LegacyDrawerContent = <Session,>({setIsSubmitting(false);}}, [- getSession,operations,onGenericError,refreshAfterMutation,@@ -391,7 +387,6 @@ export const LegacyDrawerContent = <Session,>({continueColor: "accent",action: async () => {await operations.startRecovery(- await getSession(),selectedTrustedContact.user.id,selectedTrustedContact.emergencyContact.id,);@@ -418,7 +413,6 @@ export const LegacyDrawerContent = <Session,>({continueText: "Cancel recovery",action: async () => {await operations.stopRecovery(- await getSession(),selectedTrustedRecovery.id,selectedTrustedRecovery.user.id,selectedTrustedRecovery.emergencyContact.id,@@ -433,7 +427,6 @@ export const LegacyDrawerContent = <Session,>({continueText: "Remove contact",action: async () => {await operations.updateContact(- await getSession(),selectedTrustedContact.user.id,selectedTrustedContact.emergencyContact.id,"CONTACT_LEFT",@@ -457,7 +450,6 @@ export const LegacyDrawerContent = <Session,>({setIsSubmitting(true);try {await operations.changePassword(- await getSession(),resetPasswordPage.session.id,password,);@@ -750,7 +742,6 @@ export const LegacyDrawerContent = <Session,>({onClose={() => setActiveSheet(undefined)}><LegacyAddContactContent- getSession={getSession}operations={operations}variant="sheet"suggestedUsers={addScreenSuggestedUsers}@@ -814,7 +805,6 @@ export const LegacyDrawerContent = <Session,>({: "Remove contact",action: async () => {await operations.updateContact(- await getSession(),selectedOwnerContact.user.id,selectedOwnerContact.emergencyContact.id,@@ -852,9 +842,8 @@ export const LegacyDrawerContent = <Session,>({loading={isSubmitting}onClick={() =>void runAction(- async () =>+ () =>operations.updateContact(- await getSession(),selectedTrustedInvite.user.id,selectedTrustedInvite.emergencyContact.id,@@ -870,9 +859,8 @@ export const LegacyDrawerContent = <Session,>({buttonType="tertiaryCritical"onClick={() =>void runAction(- async () =>+ () =>operations.updateContact(- await getSession(),selectedTrustedInvite.user.id,selectedTrustedInvite.emergencyContact.id,@@ -912,7 +900,6 @@ export const LegacyDrawerContent = <Session,>({continueText: "Reject recovery",action: async () => {await operations.rejectRecovery(- await getSession(),selectedRecoveryAttempt.id,selectedRecoveryAttempt.user.id,selectedRecoveryAttempt.emergencyContactdiff --git a/web/packages/contacts/legacy/types.ts b/web/packages/contacts/legacy/types.tsindex d303bb255c..70cef5713e 100644--- a/web/packages/contacts/legacy/types.ts+++ b/web/packages/contacts/legacy/types.ts@@ -42,46 +42,30 @@ export interface LegacySuggestedUser {email: string;}-export interface LegacyOperations<Session> {- getInfo(session: Session): Promise<LegacyInfo>;- publicKey(session: Session, email: string): Promise<string | undefined>;+export interface LegacyOperations {+ getInfo(): Promise<LegacyInfo>;+ publicKey(email: string): Promise<string | undefined>;verificationID(publicKeyB64: string): Promise<string>;- addContact(- session: Session,- email: string,- recoveryNoticeInDays?: number,- ): Promise<void>;+ addContact(email: string, recoveryNoticeInDays?: number): Promise<void>;updateContact(- session: Session,userID: number,emergencyContactID: number,state: LegacyContactRecord["state"],): Promise<void>;updateRecoveryNotice(- session: Session,emergencyContactID: number,recoveryNoticeInDays: number,): Promise<void>;- startRecovery(- session: Session,- userID: number,- emergencyContactID: number,- ): Promise<void>;+ startRecovery(userID: number, emergencyContactID: number): Promise<void>;stopRecovery(- session: Session,recoveryID: string,userID: number,emergencyContactID: number,): Promise<void>;rejectRecovery(- session: Session,recoveryID: string,userID: number,emergencyContactID: number,): Promise<void>;- changePassword(- session: Session,- recoveryID: string,- newPassword: string,- ): Promise<void>;+ changePassword(recoveryID: string, newPassword: string): Promise<void>;}