Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Pass Legacy bindings and session access into shared UI

Manav Rathi6935d14f0106
diff --git a/rust/bindings/wasm/lib/src/session.rs b/rust/bindings/wasm/lib/src/session.rs
index f64b438797..d38c3733e5 100644
--- a/rust/bindings/wasm/lib/src/session.rs
+++ b/rust/bindings/wasm/lib/src/session.rs
@@ -134,27 +134,27 @@ impl Session {
#[wasm_bindgen]
impl Session {
- #[wasm_bindgen(js_name = encryptWithRecoveryKey)]
- pub fn encrypt_with_recovery_key(
- &self,
- data_b64: &str,
- ) -> Result<<EncryptedBox as Tsify>::JsType, Error> {
- EncryptedBox::from(crypto::secretbox::encrypt(
- &b64::decode(data_b64)?,
- &self.0.recovery_key,
- ))
- .into_js()
- .map_err(Into::into)
- }
-
- #[wasm_bindgen(js_name = recoveryKeyMnemonic)]
- pub fn recovery_key_mnemonic(&self) -> Result<String, Error> {
- ente_accounts::auth::recovery_key_to_mnemonic(self.0.recovery_key.as_bytes())
- .map_err(Into::into)
- }
-
#[wasm_bindgen(js_name = updateAuthToken)]
pub fn update_auth_token(&self, auth_token: String) {
self.0.api.set_auth(Some(Auth::User(auth_token)));
}
}
+
+#[wasm_bindgen(js_name = authEncryptWithRecoveryKey)]
+pub fn auth_encrypt_with_recovery_key(
+ session: &Session,
+ data_b64: &str,
+) -> Result<<EncryptedBox as Tsify>::JsType, Error> {
+ EncryptedBox::from(crypto::secretbox::encrypt(
+ &b64::decode(data_b64)?,
+ &session.inner().recovery_key,
+ ))
+ .into_js()
+ .map_err(Into::into)
+}
+
+#[wasm_bindgen(js_name = authRecoveryKeyMnemonic)]
+pub fn auth_recovery_key_mnemonic(session: &Session) -> Result<String, Error> {
+ ente_accounts::auth::recovery_key_to_mnemonic(session.inner().recovery_key.as_bytes())
+ .map_err(Into::into)
+}
diff --git a/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx b/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx
index 26937b64d2..ced7016a7e 100644
--- a/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx
+++ b/web/apps/locker/src/components/sidebar/LockerLegacyDrawer.tsx
@@ -1,10 +1,11 @@
-import * as legacy from "@/services/legacy";
+import { ensureAuthenticatedSession } from "@/services/authenticated-session";
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";
@@ -26,7 +27,8 @@ export const LockerLegacyDrawer: React.FC<
intro={t("legacy_intro")}
open={open}
suggestedUsers={suggestedUsers}
- operations={legacy}
+ getSession={ensureAuthenticatedSession}
+ legacy={legacy}
renderAddContactButton={({ onClick, disabled, loading }) => (
<LockerSidebarCardButton
icon={UserAdd01Icon}
diff --git a/web/apps/locker/src/services/legacy.ts b/web/apps/locker/src/services/legacy.ts
deleted file mode 100644
index 3bc0475e41..0000000000
--- a/web/apps/locker/src/services/legacy.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-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/apps/locker/src/services/recovery-key.ts b/web/apps/locker/src/services/recovery-key.ts
index 2c7987c8ec..350f8e00f2 100644
--- a/web/apps/locker/src/services/recovery-key.ts
+++ b/web/apps/locker/src/services/recovery-key.ts
@@ -1,5 +1,9 @@
import { createAuthenticatedRecoveryKeyOps } from "ente-accounts/services/authenticated-recovery-key";
-import { encryptBoxWithRecoveryKey, generateKey } from "ente-locker-wasm";
+import {
+ encryptBoxWithRecoveryKey,
+ generateKey,
+ recoveryKeyMnemonic as getMnemonic,
+} from "ente-locker-wasm";
import { ensureAuthenticatedSession } from "./authenticated-session";
export const {
@@ -10,4 +14,5 @@ export const {
ensureSession: ensureAuthenticatedSession,
encryptBox: encryptBoxWithRecoveryKey,
generateKey,
+ getMnemonic,
});
diff --git a/web/apps/locker/tests/authenticated-session.test.ts b/web/apps/locker/tests/authenticated-session.test.ts
index 21dc5bb20b..4f6a6b760e 100644
--- a/web/apps/locker/tests/authenticated-session.test.ts
+++ b/web/apps/locker/tests/authenticated-session.test.ts
@@ -175,9 +175,7 @@ test("failed opens can be retried and account changes replace the cached session
const mockSession = () =>
({
- encryptWithRecoveryKey: vi.fn(),
free: vi.fn(),
- recoveryKeyMnemonic: vi.fn(),
updateAuthToken: vi.fn(),
[Symbol.dispose]: vi.fn(),
}) satisfies Session;
diff --git a/web/apps/photos/src/services/recovery-key.ts b/web/apps/photos/src/services/recovery-key.ts
index 59fbc24d8c..29371828ad 100644
--- a/web/apps/photos/src/services/recovery-key.ts
+++ b/web/apps/photos/src/services/recovery-key.ts
@@ -1,5 +1,9 @@
import { createAuthenticatedRecoveryKeyOps } from "ente-accounts/services/authenticated-recovery-key";
-import { encryptBoxWithRecoveryKey, generateKey } from "ente-photos-wasm";
+import {
+ encryptBoxWithRecoveryKey,
+ generateKey,
+ recoveryKeyMnemonic as getMnemonic,
+} from "ente-photos-wasm";
import { ensureAuthenticatedSession } from "./authenticated-session";
export const {
@@ -10,4 +14,5 @@ export const {
ensureSession: ensureAuthenticatedSession,
encryptBox: encryptBoxWithRecoveryKey,
generateKey,
+ getMnemonic,
});
diff --git a/web/apps/photos/tests/authenticated-session.test.ts b/web/apps/photos/tests/authenticated-session.test.ts
index 311806d753..5c7c072406 100644
--- a/web/apps/photos/tests/authenticated-session.test.ts
+++ b/web/apps/photos/tests/authenticated-session.test.ts
@@ -74,9 +74,7 @@ beforeEach(async () => {
const mockSession = () =>
({
- encryptWithRecoveryKey: vi.fn(),
free: vi.fn(),
- recoveryKeyMnemonic: vi.fn(),
updateAuthToken: vi.fn(),
[Symbol.dispose]: vi.fn(),
}) satisfies Session;
diff --git a/web/checks/wasm-exports/exports.mjs b/web/checks/wasm-exports/exports.mjs
index 1ff88c9720..87416cb4dd 100644
--- a/web/checks/wasm-exports/exports.mjs
+++ b/web/checks/wasm-exports/exports.mjs
@@ -205,6 +205,13 @@ export function unusedExports(files, projects, rustOrigins = new Map()) {
ts.isPropertyAccessExpression(node.parent))
) {
reference(checker.getSymbolAtLocation(node));
+ const context = checker.getContextualType(node);
+ if (context) {
+ const type = checker.getTypeAtLocation(node);
+ for (const property of context.getProperties()) {
+ reference(type.getProperty(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.mjs
index 9086960c28..7d003ff634 100644
--- a/web/checks/wasm-exports/test.mjs
+++ b/web/checks/wasm-exports/test.mjs
@@ -121,6 +121,61 @@ test("production references cross lazy loaders, aliases, destructuring and worke
}
});
+test("module arguments and props reference only the receiving contract", () => {
+ const directory = mkdtempSync(join(tmpdir(), "wasm-module-exports-"));
+ const bindings = join(directory, "bindings.ts");
+ const entry = join(directory, "entry.tsx");
+ try {
+ writeFileSync(
+ bindings,
+ `
+ export const getInfo = (_session: number) => {};
+ export const publicKey = () => "key";
+ export const unused = () => {};
+ `,
+ );
+ const consumers = `
+ import * as legacy from "./bindings";
+ function Panel<Session>({ session, legacy }: {
+ session: Session;
+ legacy: { getInfo(session: Session): void };
+ }) {
+ legacy.getInfo(session);
+ return null;
+ }
+ function verify(api: { publicKey(): string }) {
+ return api.publicKey();
+ }
+ verify(legacy);
+ `;
+ const check = () =>
+ unusedExports(
+ [bindings],
+ [
+ {
+ entryFiles: [entry],
+ options: {
+ jsx: ts.JsxEmit.Preserve,
+ module: ts.ModuleKind.ESNext,
+ moduleResolution: ts.ModuleResolutionKind.Bundler,
+ },
+ },
+ ],
+ ).map(({ name }) => name);
+
+ writeFileSync(
+ entry,
+ consumers + "<Panel session={42} legacy={legacy} />;",
+ );
+ assert.deepEqual(check(), ["unused"]);
+
+ writeFileSync(entry, consumers);
+ assert.deepEqual(check(), ["getInfo", "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/accounts/services/authenticated-recovery-key.ts b/web/packages/accounts/services/authenticated-recovery-key.ts
index 94ae2f90b5..10070be7e4 100644
--- a/web/packages/accounts/services/authenticated-recovery-key.ts
+++ b/web/packages/accounts/services/authenticated-recovery-key.ts
@@ -3,22 +3,18 @@ interface EncryptedBox {
nonce: string;
}
-export const createAuthenticatedRecoveryKeyOps = <
- Session extends { recoveryKeyMnemonic: () => string },
->({
+export const createAuthenticatedRecoveryKeyOps = <Session>({
ensureSession,
generateKey,
encryptBox,
+ getMnemonic,
}: {
ensureSession: () => Promise<Session>;
generateKey: () => Promise<string>;
- encryptBox: (
- session: Session,
- data: string,
- ) => EncryptedBox | Promise<EncryptedBox>;
+ getMnemonic: (session: Session) => Promise<string>;
+ encryptBox: (session: Session, data: string) => Promise<EncryptedBox>;
}) => {
- const recoveryKeyMnemonic = async () =>
- (await ensureSession()).recoveryKeyMnemonic();
+ const recoveryKeyMnemonic = async () => getMnemonic(await ensureSession());
const encryptWithRecoveryKey = async (data: string) => {
const session = await ensureSession();
diff --git a/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx b/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx
index b0c83abb0a..1366ac92bc 100644
--- a/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx
+++ b/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx
@@ -10,18 +10,19 @@ import {
import { ensureLocalUser } from "ente-accounts/services/user";
import { useBaseContext } from "ente-base/context";
import { isNamedError } from "ente-base/error";
-import React, { useMemo, useState } from "react";
-import type { LegacyOperations, LegacySuggestedUser } from "..";
+import { useMemo, useState } from "react";
import { contactsDisplaySnapshot } from "../..";
import { resolveContactDisplayFromSnapshot } from "../../resolver";
+import type { LegacyModule, LegacySuggestedUser } from "../types";
import { ActionButton } from "./ActionButton";
import { LegacyIdentityRow } from "./LegacyIdentityRow";
import { LegacyRecoveryDayPicker } from "./LegacyRecoveryDayPicker";
const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-interface LegacyAddContactContentProps {
- operations: LegacyOperations;
+interface LegacyAddContactContentProps<Session> {
+ getSession: () => Promise<Session>;
+ legacy: LegacyModule<Session>;
existingEmails: string[];
onAdded: () => Promise<void>;
suggestedUsers: LegacySuggestedUser[];
@@ -33,15 +34,14 @@ 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: React.FC<
- LegacyAddContactContentProps
-> = ({
- operations,
+export const LegacyAddContactContent = <Session,>({
+ getSession,
+ legacy,
existingEmails,
onAdded,
suggestedUsers,
variant = "page",
-}) => {
+}: LegacyAddContactContentProps<Session>) => {
const { showMiniDialog, onGenericError } = useBaseContext();
const currentUser = ensureLocalUser();
const [email, setEmail] = useState("");
@@ -104,9 +104,12 @@ export const LegacyAddContactContent: React.FC<
return;
}
try {
- const key = await operations.publicKey(normalizedEmail);
+ const key = await legacy.publicKey(
+ await getSession(),
+ normalizedEmail,
+ );
const verificationID = key
- ? await operations.verificationID(key)
+ ? await legacy.verificationID(key)
: undefined;
if (!verificationID) {
showMiniDialog({
@@ -161,7 +164,10 @@ export const LegacyAddContactContent: React.FC<
void (async () => {
try {
- const key = await operations.publicKey(normalizedEmail);
+ const key = await legacy.publicKey(
+ await getSession(),
+ normalizedEmail,
+ );
if (!key) {
showMiniDialog(nonEnteDialogAttributes(normalizedEmail));
return;
@@ -192,7 +198,8 @@ export const LegacyAddContactContent: React.FC<
text: "Add trusted contact",
action: async () => {
try {
- await operations.addContact(
+ await legacy.addContact(
+ await getSession(),
normalizedEmail,
selectedRecoveryDays,
);
diff --git a/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx b/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx
index 2131f7b4cf..13815798af 100644
--- a/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx
+++ b/web/packages/contacts/legacy/components/LegacyDrawerContent.tsx
@@ -7,14 +7,14 @@ import { isNamedError } from "ente-base/error";
import log from "ente-base/log";
import { t } from "i18next";
import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { mergeLegacySuggestedUsers } from "../suggestions";
import type {
LegacyContactRecord,
LegacyInfo,
- LegacyOperations,
+ LegacyModule,
LegacyRecoverySession,
LegacySuggestedUser,
-} from "..";
-import { mergeLegacySuggestedUsers } from "../suggestions";
+} from "../types";
import { ActionButton } from "./ActionButton";
import { LegacyActionSheet } from "./LegacyActionSheet";
import { LegacyAddContactContent } from "./LegacyAddContactContent";
@@ -146,7 +146,7 @@ const warningBannerSx = {
backgroundColor: "rgba(255, 82, 82, 0.14)",
};
-interface LegacyDrawerContentProps {
+interface LegacyDrawerContentProps<Session> {
intro?: React.ReactNode;
renderAddContactButton?: (props: {
onClick: () => void;
@@ -154,7 +154,8 @@ interface LegacyDrawerContentProps {
loading: boolean;
}) => React.ReactNode;
open: boolean;
- operations: LegacyOperations;
+ getSession: () => Promise<Session>;
+ legacy: LegacyModule<Session>;
suggestedUsers?: LegacySuggestedUser[];
}
@@ -166,13 +167,14 @@ interface ConfirmActionDialogInput {
action: () => Promise<void>;
}
-export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
+export const LegacyDrawerContent = <Session,>({
intro,
open,
- operations,
+ getSession,
+ legacy,
suggestedUsers = [],
renderAddContactButton,
-}) => {
+}: LegacyDrawerContentProps<Session>) => {
const { showMiniDialog, onGenericError } = useBaseContext();
const [info, setInfo] = useState<LegacyInfo | undefined>();
const [isLoading, setIsLoading] = useState(false);
@@ -185,7 +187,7 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
async (reportErrors: boolean) => {
setIsLoading(true);
try {
- setInfo(await operations.getInfo());
+ setInfo(await legacy.getInfo(await getSession()));
return true;
} catch (error) {
if (reportErrors) {
@@ -201,7 +203,7 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
setIsLoading(false);
}
},
- [operations, onGenericError],
+ [getSession, legacy, onGenericError],
);
const refresh = useCallback(async () => {
@@ -336,7 +338,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
}
setIsSubmitting(true);
try {
- await operations.updateRecoveryNotice(
+ await legacy.updateRecoveryNotice(
+ await getSession(),
selectedOwnerContact.emergencyContact.id,
selectedOwnerDays,
);
@@ -356,7 +359,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
setIsSubmitting(false);
}
}, [
- operations,
+ getSession,
+ legacy,
onGenericError,
refreshAfterMutation,
selectedOwnerContact,
@@ -386,7 +390,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
continueText: "Start recovery",
continueColor: "accent",
action: async () => {
- await operations.startRecovery(
+ await legacy.startRecovery(
+ await getSession(),
selectedTrustedContact.user.id,
selectedTrustedContact.emergencyContact.id,
);
@@ -412,7 +417,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
message: `Are you sure you want to cancel recovery of ${selectedTrustedContact.user.email}'s account?`,
continueText: "Cancel recovery",
action: async () => {
- await operations.stopRecovery(
+ await legacy.stopRecovery(
+ await getSession(),
selectedTrustedRecovery.id,
selectedTrustedRecovery.user.id,
selectedTrustedRecovery.emergencyContact.id,
@@ -426,7 +432,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
message: `If you remove yourself as a trusted contact, you'll lose access to ${selectedTrustedContact.user.email}'s account after their inactivity period.`,
continueText: "Remove contact",
action: async () => {
- await operations.updateContact(
+ await legacy.updateContact(
+ await getSession(),
selectedTrustedContact.user.id,
selectedTrustedContact.emergencyContact.id,
"CONTACT_LEFT",
@@ -449,7 +456,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
onSubmit={async (password) => {
setIsSubmitting(true);
try {
- await operations.changePassword(
+ await legacy.changePassword(
+ await getSession(),
resetPasswordPage.session.id,
password,
);
@@ -742,7 +750,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
onClose={() => setActiveSheet(undefined)}
>
<LegacyAddContactContent
- operations={operations}
+ getSession={getSession}
+ legacy={legacy}
variant="sheet"
suggestedUsers={addScreenSuggestedUsers}
existingEmails={existingEmails}
@@ -804,7 +813,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
? "Revoke invite"
: "Remove contact",
action: async () => {
- await operations.updateContact(
+ await legacy.updateContact(
+ await getSession(),
selectedOwnerContact.user.id,
selectedOwnerContact
.emergencyContact.id,
@@ -842,8 +852,9 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
loading={isSubmitting}
onClick={() =>
void runAction(
- () =>
- operations.updateContact(
+ async () =>
+ legacy.updateContact(
+ await getSession(),
selectedTrustedInvite.user.id,
selectedTrustedInvite
.emergencyContact.id,
@@ -859,8 +870,9 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
buttonType="tertiaryCritical"
onClick={() =>
void runAction(
- () =>
- operations.updateContact(
+ async () =>
+ legacy.updateContact(
+ await getSession(),
selectedTrustedInvite.user.id,
selectedTrustedInvite
.emergencyContact.id,
@@ -899,7 +911,8 @@ export const LegacyDrawerContent: React.FC<LegacyDrawerContentProps> = ({
),
continueText: "Reject recovery",
action: async () => {
- await operations.rejectRecovery(
+ await legacy.rejectRecovery(
+ await getSession(),
selectedRecoveryAttempt.id,
selectedRecoveryAttempt.user.id,
selectedRecoveryAttempt.emergencyContact
diff --git a/web/packages/contacts/legacy/index.ts b/web/packages/contacts/legacy/index.ts
index e179b397b7..a5fdbf2b66 100644
--- a/web/packages/contacts/legacy/index.ts
+++ b/web/packages/contacts/legacy/index.ts
@@ -3,7 +3,6 @@ export { mergeLegacySuggestedUsers } from "./suggestions";
export type {
LegacyContactRecord,
LegacyInfo,
- LegacyOperations,
LegacyRecoverySession,
LegacySuggestedUser,
} from "./types";
diff --git a/web/packages/contacts/legacy/types.ts b/web/packages/contacts/legacy/types.ts
index 70cef5713e..b3250f92ce 100644
--- a/web/packages/contacts/legacy/types.ts
+++ b/web/packages/contacts/legacy/types.ts
@@ -42,30 +42,46 @@ export interface LegacySuggestedUser {
email: string;
}
-export interface LegacyOperations {
- getInfo(): Promise<LegacyInfo>;
- publicKey(email: string): Promise<string | undefined>;
- verificationID(publicKeyB64: string): Promise<string>;
- addContact(email: string, recoveryNoticeInDays?: number): Promise<void>;
- updateContact(
+export interface LegacyModule<Session> {
+ getInfo: (session: Session) => Promise<LegacyInfo>;
+ publicKey: (session: Session, email: string) => Promise<string | undefined>;
+ verificationID: (publicKeyB64: string) => Promise<string>;
+ addContact: (
+ session: Session,
+ email: string,
+ recoveryNoticeInDays?: number,
+ ) => Promise<void>;
+ updateContact: (
+ session: Session,
userID: number,
emergencyContactID: number,
state: LegacyContactRecord["state"],
- ): Promise<void>;
- updateRecoveryNotice(
+ ) => Promise<void>;
+ updateRecoveryNotice: (
+ session: Session,
emergencyContactID: number,
recoveryNoticeInDays: number,
- ): Promise<void>;
- startRecovery(userID: number, emergencyContactID: number): Promise<void>;
- stopRecovery(
+ ) => Promise<void>;
+ startRecovery: (
+ session: Session,
+ userID: number,
+ emergencyContactID: number,
+ ) => Promise<void>;
+ stopRecovery: (
+ session: Session,
recoveryID: string,
userID: number,
emergencyContactID: number,
- ): Promise<void>;
- rejectRecovery(
+ ) => Promise<void>;
+ rejectRecovery: (
+ session: Session,
recoveryID: string,
userID: number,
emergencyContactID: number,
- ): Promise<void>;
- changePassword(recoveryID: string, newPassword: string): Promise<void>;
+ ) => Promise<void>;
+ changePassword: (
+ session: Session,
+ recoveryID: string,
+ newPassword: string,
+ ) => Promise<void>;
}
diff --git a/web/packages/wasm/auth/index.ts b/web/packages/wasm/auth/index.ts
index 9b10e8901f..79e7c2118f 100644
--- a/web/packages/wasm/auth/index.ts
+++ b/web/packages/wasm/auth/index.ts
@@ -12,8 +12,10 @@ const wasm = () => import("./pkg/ente_auth_wasm");
export const openSession = async (input: OpenSessionInput): Promise<Session> =>
(await wasm()).openSession(input);
-export const encryptBoxWithRecoveryKey = (session: Session, dataB64: string) =>
- session.encryptWithRecoveryKey(dataB64);
+export const encryptBoxWithRecoveryKey = async (
+ session: Session,
+ dataB64: string,
+) => (await wasm()).authEncryptWithRecoveryKey(session, dataB64);
export const decryptBox = async (box: EncryptedBox, keyB64: string) =>
(await wasm()).cryptoDecryptBox(box.encryptedData, box.nonce, keyB64);
diff --git a/web/packages/wasm/locker/index.ts b/web/packages/wasm/locker/index.ts
index 4550d72f08..ca0b5f1993 100644
--- a/web/packages/wasm/locker/index.ts
+++ b/web/packages/wasm/locker/index.ts
@@ -16,8 +16,13 @@ const wasm = () => import("./pkg/ente_locker_wasm");
export const openSession = async (input: OpenSessionInput): Promise<Session> =>
(await wasm()).openSession(input);
-export const encryptBoxWithRecoveryKey = (session: Session, dataB64: string) =>
- session.encryptWithRecoveryKey(dataB64);
+export const recoveryKeyMnemonic = async (session: Session) =>
+ (await wasm()).authRecoveryKeyMnemonic(session);
+
+export const encryptBoxWithRecoveryKey = async (
+ session: Session,
+ dataB64: string,
+) => (await wasm()).authEncryptWithRecoveryKey(session, dataB64);
export const openCollectionKey = async (
session: Session,
diff --git a/web/packages/wasm/photos/index.ts b/web/packages/wasm/photos/index.ts
index 76bad9a0d6..9d36c83830 100644
--- a/web/packages/wasm/photos/index.ts
+++ b/web/packages/wasm/photos/index.ts
@@ -12,8 +12,13 @@ const wasm = () => import("./pkg/ente_photos_wasm");
export const openSession = async (input: OpenSessionInput): Promise<Session> =>
(await wasm()).openSession(input);
-export const encryptBoxWithRecoveryKey = (session: Session, dataB64: string) =>
- session.encryptWithRecoveryKey(dataB64);
+export const recoveryKeyMnemonic = async (session: Session) =>
+ (await wasm()).authRecoveryKeyMnemonic(session);
+
+export const encryptBoxWithRecoveryKey = async (
+ session: Session,
+ dataB64: string,
+) => (await wasm()).authEncryptWithRecoveryKey(session, dataB64);
export const generateKey = async () => (await wasm()).cryptoGenerateKey();