💚 End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Move account deletion to shared Rust
Neeraj Gupta7b22437a370b
diff --git a/mobile/apps/auth/lib/core/configuration.dart b/mobile/apps/auth/lib/core/configuration.dartindex 9e9dccaaf3..6d3a25102c 100644--- a/mobile/apps/auth/lib/core/configuration.dart+++ b/mobile/apps/auth/lib/core/configuration.dart@@ -3,6 +3,8 @@ import 'dart:typed_data';import 'package:ente_account_deletion/account_deletion.dart';import 'package:ente_auth/services/authenticated_session.dart';+import 'package:ente_auth/src/rust/third_party/ente_frb_lib/deletion.dart'+ as deletion;import 'package:ente_base/models/database.dart';import 'package:ente_configuration/base_configuration.dart';import 'package:ente_crypto_api/ente_crypto_api.dart';@@ -84,6 +86,26 @@ class Configuration extends BaseConfigurationLockScreenSettings.password,];+ @override+ Future<AccountDeletionSummary?> getDeletionSummary() =>+ deletion.getDeletionSummary(session: authenticatedSession());++ @override+ Future<String> getDeleteChallenge() =>+ deletion.getDeleteChallenge(session: authenticatedSession());++ @override+ Future<void> deleteAccount({+ required String encryptedChallenge,+ required String reason,+ String? feedback,+ }) => deletion.deleteAccount(+ session: authenticatedSession(),+ encryptedChallenge: encryptedChallenge,+ reason: reason,+ feedback: feedback,+ );+@overrideFuture<void> logout({bool autoLogout = false}) async {clearAuthenticatedSession();diff --git a/mobile/apps/auth/lib/main.dart b/mobile/apps/auth/lib/main.dartindex 299b76ff1a..c802952e72 100644--- a/mobile/apps/auth/lib/main.dart+++ b/mobile/apps/auth/lib/main.dart@@ -224,10 +224,7 @@ Future<void> _init() async {if (shouldAllowAuthScreenCapture) {await LockScreenSettings.instance.setHideAppContent(false, persist: false);}- AccountDeletionSettings.instance.init(- host: Configuration.instance,- enteDio: Network.instance.enteDio,- );+ AccountDeletionSettings.instance.init(host: Configuration.instance);await LocalBackupService.instance.init(hasOptedForOfflineMode: Configuration.instance.hasOptedForOfflineMode(),);diff --git a/mobile/apps/auth/pubspec.yaml b/mobile/apps/auth/pubspec.yamlindex 7b1e8a580b..5fd85aa469 100644--- a/mobile/apps/auth/pubspec.yaml+++ b/mobile/apps/auth/pubspec.yaml@@ -43,6 +43,8 @@ dependencies:path: ../../packages/ente_crypto_dart_adapterente_events:path: ../../packages/events+ ente_frb:+ path: ../../packages/frbente_lock_screen:path: ../../packages/lock_screenente_logging:diff --git a/mobile/apps/locker/lib/main.dart b/mobile/apps/locker/lib/main.dartindex 072bdad2c7..f68b0b06e8 100644--- a/mobile/apps/locker/lib/main.dart+++ b/mobile/apps/locker/lib/main.dart@@ -200,10 +200,7 @@ Future<void> _init(bool bool, {String? via}) async {Configuration.instance,hideAppContentDefault: true,);- AccountDeletionSettings.instance.init(- host: Configuration.instance,- enteDio: Network.instance.enteDio,- );+ AccountDeletionSettings.instance.init(host: Configuration.instance);await CollectionApiClient.instance.init();await CollectionService.instance.init(preferences);await FavoritesService.instance.init();diff --git a/mobile/apps/locker/lib/services/configuration.dart b/mobile/apps/locker/lib/services/configuration.dartindex c7b557ab76..abc3c92215 100644--- a/mobile/apps/locker/lib/services/configuration.dart+++ b/mobile/apps/locker/lib/services/configuration.dart@@ -7,12 +7,15 @@ import 'package:locker/services/authenticated_session.dart';import 'package:locker/services/collections/collections_service.dart';import 'package:locker/services/favorites_service.dart';import 'package:locker/services/files/offline/offline_file_storage.dart';+import 'package:locker/src/rust/third_party/ente_frb_lib/deletion.dart'+ as deletion;import 'package:logging/logging.dart';import 'package:shared_preferences/shared_preferences.dart';class Configuration extends BaseConfigurationimplements LockScreenHost, AccountDeletionHost {Configuration._privateConstructor();+static final Configuration instance = Configuration._privateConstructor();final _logger = Logger('Configuration');@@ -45,6 +48,26 @@ class Configuration extends BaseConfigurationLockScreenSettings.password,];+ @override+ Future<AccountDeletionSummary?> getDeletionSummary() =>+ deletion.getDeletionSummary(session: authenticatedSession());++ @override+ Future<String> getDeleteChallenge() =>+ deletion.getDeleteChallenge(session: authenticatedSession());++ @override+ Future<void> deleteAccount({+ required String encryptedChallenge,+ required String reason,+ String? feedback,+ }) => deletion.deleteAccount(+ session: authenticatedSession(),+ encryptedChallenge: encryptedChallenge,+ reason: reason,+ feedback: feedback,+ );+@overrideFuture<void> logout({bool autoLogout = false}) async {CollectionService.instance.clearCache();diff --git a/mobile/apps/photos/lib/core/configuration.dart b/mobile/apps/photos/lib/core/configuration.dartindex 801f69acd4..8a21486063 100644--- a/mobile/apps/photos/lib/core/configuration.dart+++ b/mobile/apps/photos/lib/core/configuration.dart@@ -56,6 +56,8 @@ import 'package:photos/services/photos_contacts_service.dart';import 'package:photos/services/search_service.dart';import 'package:photos/services/sync/sync_service.dart';import 'package:photos/services/video_preview_service.dart';+import 'package:photos/src/rust/third_party/ente_frb_lib/deletion.dart'+ as deletion;import 'package:photos/utils/validator_util.dart';import 'package:shared_preferences/shared_preferences.dart';import "package:tuple/tuple.dart";@@ -581,14 +583,24 @@ class Configuration implements LockScreenHost, AccountDeletionHost {}@override- String decryptDeleteChallenge(String encryptedChallenge) {- final challenge = CryptoUtil.openSealSync(- CryptoUtil.base642bin(encryptedChallenge),- CryptoUtil.base642bin(getKeyAttributes()!.publicKey),- getSecretKey()!,- );- return utf8.decode(challenge);- }+ Future<AccountDeletionSummary?> getDeletionSummary() =>+ deletion.getDeletionSummary(session: authenticatedSession());++ @override+ Future<String> getDeleteChallenge() =>+ deletion.getDeleteChallenge(session: authenticatedSession());++ @override+ Future<void> deleteAccount({+ required String encryptedChallenge,+ required String reason,+ String? feedback,+ }) => deletion.deleteAccount(+ session: authenticatedSession(),+ encryptedChallenge: encryptedChallenge,+ reason: reason,+ feedback: feedback,+ );Future<void> setKey(String? key) async {_key = key;diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex bcab20cbf9..4164e8da5b 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -512,10 +512,7 @@ Future<void> _init(appLogoAsset: 'assets/ente-branding.svg',appLogoHeight: 18,);- AccountDeletionSettings.instance.init(- host: Configuration.instance,- enteDio: NetworkClient.instance.enteDio,- );+ AccountDeletionSettings.instance.init(host: Configuration.instance);await MemoryShareService.instance.init();diff --git a/mobile/packages/account_deletion/lib/account_deletion.dart b/mobile/packages/account_deletion/lib/account_deletion.dartindex bb52994423..837ddf0a19 100644--- a/mobile/packages/account_deletion/lib/account_deletion.dart+++ b/mobile/packages/account_deletion/lib/account_deletion.dart@@ -1,3 +1,5 @@+export 'package:ente_frb/deletion.dart';+export 'src/account_deletion_host.dart';export 'src/account_deletion_settings.dart';export 'src/ui/delete_account_page.dart';diff --git a/mobile/packages/account_deletion/lib/src/account_deletion_host.dart b/mobile/packages/account_deletion/lib/src/account_deletion_host.dartindex 4208727ca2..c8a59b4f6f 100644--- a/mobile/packages/account_deletion/lib/src/account_deletion_host.dart+++ b/mobile/packages/account_deletion/lib/src/account_deletion_host.dart@@ -1,5 +1,15 @@+import 'package:ente_frb/deletion.dart';+abstract class AccountDeletionHost {- String decryptDeleteChallenge(String encryptedChallenge);+ Future<AccountDeletionSummary?> getDeletionSummary();++ Future<String> getDeleteChallenge();++ Future<void> deleteAccount({+ required String encryptedChallenge,+ required String reason,+ String? feedback,+ });Future<void> logout();}diff --git a/mobile/packages/account_deletion/lib/src/account_deletion_settings.dart b/mobile/packages/account_deletion/lib/src/account_deletion_settings.dartindex 09a6acef1b..00d080824b 100644--- a/mobile/packages/account_deletion/lib/src/account_deletion_settings.dart+++ b/mobile/packages/account_deletion/lib/src/account_deletion_settings.dart@@ -1,6 +1,4 @@-import 'package:dio/dio.dart';import 'package:ente_account_deletion/src/account_deletion_host.dart';-import 'package:ente_account_deletion/src/services/account_deletion_service.dart';class AccountDeletionSettings {AccountDeletionSettings._privateConstructor();@@ -9,11 +7,9 @@ class AccountDeletionSettings {AccountDeletionSettings._privateConstructor();AccountDeletionHost? _host;- AccountDeletionService? _service;- void init({required AccountDeletionHost host, required Dio enteDio}) {+ void init({required AccountDeletionHost host}) {_host = host;- _service = AccountDeletionService(enteDio);}AccountDeletionHost get host {@@ -23,12 +19,4 @@ class AccountDeletionSettings {}return host;}-- AccountDeletionService get service {- final service = _service;- if (service == null) {- throw StateError('AccountDeletionSettings.init must be called first');- }- return service;- }}diff --git a/mobile/packages/account_deletion/lib/src/models/account_deletion_summary.dart b/mobile/packages/account_deletion/lib/src/models/account_deletion_summary.dartdeleted file mode 100644index 6c19f2b869..0000000000--- a/mobile/packages/account_deletion/lib/src/models/account_deletion_summary.dart+++ /dev/null@@ -1,29 +0,0 @@-class AccountDeletionSummary {- const AccountDeletionSummary({- required this.photosAndVideosCount,- required this.authenticatorCodesCount,- required this.lockerRecordsCount,- });-- factory AccountDeletionSummary.fromJson(Map<String, dynamic> json) {- return AccountDeletionSummary(- photosAndVideosCount: _countFromJson(json['photosAndVideosCount']),- authenticatorCodesCount: _countFromJson(json['authenticatorCodesCount']),- lockerRecordsCount: _countFromJson(json['lockerRecordsCount']),- );- }-- final int photosAndVideosCount;- final int authenticatorCodesCount;- final int lockerRecordsCount;-}--int _countFromJson(Object? value) {- if (value is int) {- return value;- }- if (value is num) {- return value.toInt();- }- throw const FormatException('Expected account deletion summary count');-}diff --git a/mobile/packages/account_deletion/lib/src/services/account_deletion_service.dart b/mobile/packages/account_deletion/lib/src/services/account_deletion_service.dartdeleted file mode 100644index d347ef4ea2..0000000000--- a/mobile/packages/account_deletion/lib/src/services/account_deletion_service.dart+++ /dev/null@@ -1,40 +0,0 @@-import 'package:dio/dio.dart';-import 'package:ente_account_deletion/src/models/account_deletion_summary.dart';--class AccountDeletionService {- AccountDeletionService(this._enteDio);-- final Dio _enteDio;-- Future<String> getDeleteChallenge() async {- final response = await _enteDio.get('/users/delete-challenge');- final data = response.data as Map<String, dynamic>;- final encryptedChallenge = data['encryptedChallenge'];- if (encryptedChallenge is! String || encryptedChallenge.isEmpty) {- throw StateError('Account deletion is not available');- }- return encryptedChallenge;- }-- Future<void> deleteAccount({- required String challenge,- required String reasonCategory,- String? feedback,- }) async {- final data = <String, dynamic>{- 'challenge': challenge,- 'reasonCategory': reasonCategory,- };- if (feedback != null && feedback.isNotEmpty) {- data['feedback'] = feedback;- }- await _enteDio.delete('/users/delete', data: data);- }-- Future<AccountDeletionSummary> getDeletionSummary() async {- final response = await _enteDio.get('/users/deletion-summary');- return AccountDeletionSummary.fromJson(- response.data as Map<String, dynamic>,- );- }-}diff --git a/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dart b/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dartindex c58165abe3..a806af96e0 100644--- a/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dart+++ b/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dart@@ -1,5 +1,5 @@-import 'package:ente_account_deletion/src/models/account_deletion_summary.dart';import 'package:ente_components/ente_components.dart';+import 'package:ente_frb/deletion.dart';import 'package:ente_strings/ente_strings.dart';import 'package:flutter/material.dart';import 'package:hugeicons/hugeicons.dart';diff --git a/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dart b/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dartindex 91fe2608fd..924e2348e8 100644--- a/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dart+++ b/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dart@@ -1,12 +1,11 @@import 'dart:async';-import 'package:dio/dio.dart';import 'package:ente_account_deletion/src/account_deletion_settings.dart';-import 'package:ente_account_deletion/src/models/account_deletion_summary.dart';import 'package:ente_account_deletion/src/ui/delete_account_bottom_actions.dart';import 'package:ente_account_deletion/src/ui/delete_account_confirmation_step.dart';import 'package:ente_account_deletion/src/ui/delete_account_reason_step.dart';import 'package:ente_components/ente_components.dart';+import 'package:ente_frb/deletion.dart';import 'package:ente_strings/ente_strings.dart';import 'package:flutter/material.dart';import 'package:logging/logging.dart';@@ -119,27 +118,23 @@ class _DeleteAccountPageState extends State<DeleteAccountPage> {_summaryLoading = true;});try {- final summary = await _settings.service.getDeletionSummary();+ final summary = await _settings.host.getDeletionSummary();if (!mounted) {return;}setState(() {_summary = summary;- _summaryUnsupported = false;+ _summaryUnsupported = summary == null;_summaryLoading = false;});} catch (e, s) {- final summaryUnsupported =- e is DioException && e.response?.statusCode == 404;- if (!summaryUnsupported) {- _logger.warning('Failed to load account deletion summary', e, s);- }+ _logger.warning('Failed to load account deletion summary', e, s);if (!mounted) {return;}setState(() {_summary = null;- _summaryUnsupported = summaryUnsupported;+ _summaryUnsupported = false;_summaryLoading = false;});}@@ -149,13 +144,10 @@ class _DeleteAccountPageState extends State<DeleteAccountPage> {final reason = _selectedReason!;try {setState(() => _isDeleting = true);- final encryptedChallenge = await _settings.service.getDeleteChallenge();- final challenge = _settings.host.decryptDeleteChallenge(- encryptedChallenge,- );- await _settings.service.deleteAccount(- challenge: challenge,- reasonCategory: reason.apiValue,+ final encryptedChallenge = await _settings.host.getDeleteChallenge();+ await _settings.host.deleteAccount(+ encryptedChallenge: encryptedChallenge,+ reason: reason.apiValue,feedback: _optionalFeedback,);await _settings.host.logout();diff --git a/mobile/packages/account_deletion/pubspec.yaml b/mobile/packages/account_deletion/pubspec.yamlindex 928563f5b5..fb892367c2 100644--- a/mobile/packages/account_deletion/pubspec.yaml+++ b/mobile/packages/account_deletion/pubspec.yaml@@ -9,13 +9,12 @@ environment:flutter: ">=3.32.0"dependencies:- dio: 5.9.2ente_components:path: ../ente_components+ ente_frb:+ path: ../frbente_strings:path: ../strings- ente_ui:- path: ../uiflutter:sdk: flutterhugeicons: 1.1.7diff --git a/mobile/packages/configuration/lib/base_configuration.dart b/mobile/packages/configuration/lib/base_configuration.dartindex f4e3848ba4..45b66636a4 100644--- a/mobile/packages/configuration/lib/base_configuration.dart+++ b/mobile/packages/configuration/lib/base_configuration.dart@@ -371,15 +371,6 @@ abstract class BaseConfiguration {return _secretKey == null ? null : CryptoUtil.base642bin(_secretKey!);}- String decryptDeleteChallenge(String encryptedChallenge) {- final challenge = CryptoUtil.openSealSync(- CryptoUtil.base642bin(encryptedChallenge),- CryptoUtil.base642bin(getKeyAttributes()!.publicKey),- getSecretKey()!,- );- return utf8.decode(challenge);- }-Uint8List getRecoveryKey() {final keyAttributes = getKeyAttributes()!;return CryptoUtil.decryptSync(diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex fc6d8f3b76..a10103296f 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2703,6 +2703,7 @@ dependencies = [name = "ente-frb-lib"version = "0.0.0"dependencies = [+ "ente-accounts","ente-contacts","ente-core","ente-legacy",diff --git a/rust/bindings/frb/lib/Cargo.toml b/rust/bindings/frb/lib/Cargo.tomlindex f68f68fdd1..175f3fe801 100644--- a/rust/bindings/frb/lib/Cargo.toml+++ b/rust/bindings/frb/lib/Cargo.toml@@ -8,6 +8,7 @@ legacy = ["dep:ente-legacy"]locker = ["dep:ente-locker"][dependencies]+ente-accounts.workspace = trueente-contacts = { workspace = true, optional = true }ente-core.workspace = trueente-legacy = { workspace = true, optional = true }diff --git a/rust/bindings/frb/lib/src/deletion.rs b/rust/bindings/frb/lib/src/deletion.rsnew file mode 100644index 0000000000..2e95e8aab6--- /dev/null+++ b/rust/bindings/frb/lib/src/deletion.rs@@ -0,0 +1,37 @@+use crate::session::{Session, SessionError};+use ente_accounts::deletion;++pub mod types;+pub use types::AccountDeletionSummary;++pub async fn get_deletion_summary(+ session: &Session,+) -> Result<Option<AccountDeletionSummary>, SessionError> {+ Ok(deletion::get_deletion_summary(session.as_ref())+ .await?+ .map(|summary| AccountDeletionSummary {+ photos_and_videos_count: summary.photos_and_videos_count,+ authenticator_codes_count: summary.authenticator_codes_count,+ locker_records_count: summary.locker_records_count,+ }))+}++pub async fn get_delete_challenge(session: &Session) -> Result<String, SessionError> {+ Ok(deletion::get_delete_challenge(session.as_ref()).await?)+}++pub async fn delete_account(+ session: &Session,+ encrypted_challenge: String,+ reason: String,+ feedback: Option<String>,+) -> Result<(), SessionError> {+ deletion::delete_account(+ session.as_ref(),+ &encrypted_challenge,+ &reason,+ feedback.as_deref(),+ )+ .await+ .map_err(Into::into)+}diff --git a/rust/bindings/frb/lib/src/deletion/types.rs b/rust/bindings/frb/lib/src/deletion/types.rsnew file mode 100644index 0000000000..0e6b45bf79--- /dev/null+++ b/rust/bindings/frb/lib/src/deletion/types.rs@@ -0,0 +1,8 @@+use flutter_rust_bridge::frb;++#[frb(non_opaque)]+pub struct AccountDeletionSummary {+ pub photos_and_videos_count: i64,+ pub authenticator_codes_count: i64,+ pub locker_records_count: i64,+}diff --git a/rust/bindings/frb/lib/src/lib.rs b/rust/bindings/frb/lib/src/lib.rsindex a22f07adb4..528bc538d8 100644--- a/rust/bindings/frb/lib/src/lib.rs+++ b/rust/bindings/frb/lib/src/lib.rs@@ -1,5 +1,6 @@#[cfg(feature = "contacts")]pub mod contacts;+pub mod deletion;#[cfg(feature = "legacy")]pub mod legacy;#[cfg(feature = "locker")]diff --git a/rust/bindings/wasm/lib/Cargo.toml b/rust/bindings/wasm/lib/Cargo.tomlindex 12896f45f6..8b69ade111 100644--- a/rust/bindings/wasm/lib/Cargo.toml+++ b/rust/bindings/wasm/lib/Cargo.toml@@ -3,6 +3,7 @@ name = "ente-wasm-lib"edition.workspace = true[features]+account-deletion = ["session", "dep:wasm-bindgen-futures"]accounts = ["dep:ente-accounts", "dep:serde", "dep:serde-wasm-bindgen", "dep:tsify"]cast = ["dep:ente-cast", "dep:serde", "dep:serde-wasm-bindgen", "dep:tsify"]collections = ["session", "dep:ente-collections"]diff --git a/rust/bindings/wasm/lib/src/deletion.rs b/rust/bindings/wasm/lib/src/deletion.rsnew file mode 100644index 0000000000..32f5a71df3--- /dev/null+++ b/rust/bindings/wasm/lib/src/deletion.rs@@ -0,0 +1,54 @@+use ente_accounts::deletion;+use serde::Serialize;+use tsify::Tsify;+use wasm_bindgen::prelude::*;++use crate::session::{Error, Session};++#[derive(Serialize, Tsify)]+#[serde(rename_all = "camelCase")]+pub struct AccountDeletionSummary {+ photos_and_videos_count: i64,+ authenticator_codes_count: i64,+ locker_records_count: i64,+}++#[wasm_bindgen(js_name = getAccountDeletionSummary)]+pub async fn get_account_deletion_summary(+ session: &Session,+) -> Result<Option<<AccountDeletionSummary as Tsify>::JsType>, Error> {+ deletion::get_deletion_summary(session.inner())+ .await?+ .map(|summary| {+ AccountDeletionSummary {+ photos_and_videos_count: summary.photos_and_videos_count,+ authenticator_codes_count: summary.authenticator_codes_count,+ locker_records_count: summary.locker_records_count,+ }+ .into_js()+ })+ .transpose()+ .map_err(Into::into)+}++#[wasm_bindgen(js_name = getAccountDeleteChallenge)]+pub async fn get_account_delete_challenge(session: &Session) -> Result<String, Error> {+ Ok(deletion::get_delete_challenge(session.inner()).await?)+}++#[wasm_bindgen(js_name = deleteAccount)]+pub async fn delete_account(+ session: &Session,+ encrypted_challenge: &str,+ reason: &str,+ feedback: Option<String>,+) -> Result<(), Error> {+ deletion::delete_account(+ session.inner(),+ encrypted_challenge,+ reason,+ feedback.as_deref(),+ )+ .await+ .map_err(Into::into)+}diff --git a/rust/bindings/wasm/lib/src/lib.rs b/rust/bindings/wasm/lib/src/lib.rsindex fef175c64f..8450fdabec 100644--- a/rust/bindings/wasm/lib/src/lib.rs+++ b/rust/bindings/wasm/lib/src/lib.rs@@ -8,6 +8,8 @@ pub mod collections;pub mod contacts;#[cfg(feature = "crypto")]pub mod crypto;+#[cfg(feature = "account-deletion")]+pub mod deletion;#[cfg(feature = "legacy")]pub mod legacy;#[cfg(feature = "location")]diff --git a/rust/bindings/wasm/photos/Cargo.toml b/rust/bindings/wasm/photos/Cargo.tomlindex 4f18be74f5..00faeb76ba 100644--- a/rust/bindings/wasm/photos/Cargo.toml+++ b/rust/bindings/wasm/photos/Cargo.toml@@ -6,7 +6,7 @@ edition.workspace = truecrate-type = ["cdylib"][dependencies]-ente-wasm-lib = { workspace = true, features = ["cast", "collections", "contacts", "crypto", "location"] }+ente-wasm-lib = { workspace = true, features = ["account-deletion", "cast", "collections", "contacts", "crypto", "location"] }[lints]workspace = truediff --git a/rust/crates/accounts/src/deletion.rs b/rust/crates/accounts/src/deletion.rsnew file mode 100644index 0000000000..41cc4926bf--- /dev/null+++ b/rust/crates/accounts/src/deletion.rs@@ -0,0 +1,71 @@+use ente_core::{Session, b64, crypto::sealed, http};+use serde::{Deserialize, Serialize};++use crate::{Error, Result};++#[derive(Debug, Deserialize)]+#[serde(rename_all = "camelCase")]+pub struct AccountDeletionSummary {+ pub photos_and_videos_count: i64,+ pub authenticator_codes_count: i64,+ pub locker_records_count: i64,+}++pub async fn get_deletion_summary(session: &Session) -> Result<Option<AccountDeletionSummary>> {+ let response = send_request(session.api.get("/users/deletion-summary")).await;+ match response {+ Ok(response) => Ok(Some(response.json().await?)),+ Err(error) if error.status_code() == Some(404) => Ok(None),+ Err(error) => Err(error.into()),+ }+}++pub async fn get_delete_challenge(session: &Session) -> Result<String> {+ #[derive(Deserialize)]+ #[serde(rename_all = "camelCase")]+ struct Response {+ encrypted_challenge: String,+ }++ let response: Response = send_request(session.api.get("/users/delete-challenge"))+ .await?+ .json()+ .await?;+ Ok(response.encrypted_challenge)+}++pub async fn delete_account(+ session: &Session,+ encrypted_challenge: &str,+ reason: &str,+ feedback: Option<&str>,+) -> Result<()> {+ #[derive(Serialize)]+ #[serde(rename_all = "camelCase")]+ struct Request<'a> {+ challenge: String,+ reason_category: &'a str,+ #[serde(skip_serializing_if = "Option::is_none")]+ feedback: Option<&'a str>,+ }++ let challenge = sealed::open(+ &b64::decode(encrypted_challenge)?,+ &session.secret_key.public_key(),+ &session.secret_key,+ )?;+ let challenge = String::from_utf8(challenge).map_err(|e| Error::Decode(e.to_string()))?;+ send_request(session.api.delete("/users/delete").json(&Request {+ challenge,+ reason_category: reason,+ feedback: feedback.filter(|value| !value.is_empty()),+ }))+ .await?;+ Ok(())+}++async fn send_request(+ request: http::RequestBuilder,+) -> std::result::Result<http::SuccessResponse, http::Error> {+ request.send().await?.error_for_code().await+}diff --git a/rust/crates/accounts/src/lib.rs b/rust/crates/accounts/src/lib.rsindex 9519e41269..2104112ee2 100644--- a/rust/crates/accounts/src/lib.rs+++ b/rust/crates/accounts/src/lib.rs@@ -1,6 +1,7 @@pub mod admin;pub mod auth;pub mod client;+pub mod deletion;pub mod error;pub mod lifecycle;pub mod login;diff --git a/rust/tools/codegen/src/main.rs b/rust/tools/codegen/src/main.rsindex d2adde7b92..ef40154f45 100644--- a/rust/tools/codegen/src/main.rs+++ b/rust/tools/codegen/src/main.rs@@ -183,10 +183,10 @@ fn generate_frb(target: FrbTarget) -> Result<(), DynError> {fs::remove_dir_all(&generated_dir)?;}generate_frb_package(&package_dir)?;- if *app == "auth" {- continue;- }- for name in ["contacts", "legacy"] {+ for name in ["contacts", "deletion", "legacy"] {+ if *app == "auth" && name != "deletion" {+ continue;+ }let types_path = package_dir.join("lib/src/rust/third_party/ente_frb_lib").join(format!("{name}/types.dart"));diff --git a/web/apps/photos/src/components/sidebar/account/DeleteAccount.tsx b/web/apps/photos/src/components/sidebar/account/DeleteAccount.tsxindex 5bfe2f8fff..eef4ff54e5 100644--- a/web/apps/photos/src/components/sidebar/account/DeleteAccount.tsx+++ b/web/apps/photos/src/components/sidebar/account/DeleteAccount.tsx@@ -1,3 +1,4 @@+import { ensureAuthenticatedSession } from "@/services/authenticated-session";import ArrowBackIcon from "@mui/icons-material/ArrowBack";import ErrorOutlinedIcon from "@mui/icons-material/ErrorOutlined";import {@@ -8,7 +9,6 @@ import {DialogTitle,FormControlLabel,IconButton,- Link,Stack,TextField,Typography,@@ -19,7 +19,6 @@ import { DialogCloseIconButton } from "ente-base/components/mui/DialogCloseIconBimport { LoadingButton } from "ente-base/components/mui/LoadingButton";import type { ModalVisibilityProps } from "ente-base/components/utils/modal";import { useBaseContext } from "ente-base/context";-import { isHTTPErrorWithStatus } from "ente-base/http";import log from "ente-base/log";import {uploadSheetMediaQuery,@@ -28,17 +27,14 @@ import {} from "ente-gallery/components/upload-progress/bottom-sheet";import { SlideUpTransition } from "ente-new/photos/components/mui/SlideUpTransition";import {- decryptDeleteAccountChallenge,deleteAccount,getAccountDeleteChallenge,getAccountDeletionSummary,type AccountDeletionSummary,-} from "ente-new/photos/services/user";-import { initiateEmail } from "ente-new/photos/utils/web";+} from "ente-photos-wasm";import { useFormik } from "formik";import { t } from "i18next";import React, { useState } from "react";-import { Trans } from "react-i18next";import { DropdownInput, type DropdownOption } from "../DropdownInput";import { EnteAuthIcon, EnteLockerIcon, EntePhotosIcon } from "../EnteAppIcon";@@ -107,7 +103,7 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({const DeleteAccountDialogContents: React.FC<Omit<DeleteAccountProps, "open">> = ({ onClose, onAuthenticateUser }) => {- const { logout, showMiniDialog, onGenericError } = useBaseContext();+ const { logout, onGenericError } = useBaseContext();const [step, setStep] = useState<"reason" | "confirmation">("reason");const [acceptDataDeletion, setAcceptDataDeletion] = useState(false);@@ -120,17 +116,16 @@ const DeleteAccountDialogContents: React.FC<const loadSummary = async () => {setSummaryPhase("loading");try {- setSummary(await getAccountDeletionSummary());+ setSummary(+ await getAccountDeletionSummary(+ await ensureAuthenticatedSession(),+ ),+ );setSummaryPhase("ready");} catch (e) {setSummary(undefined);- if (isHTTPErrorWithStatus(e, 404)) {- log.info("Account deletion summary is not supported by museum");- setSummaryPhase("ready");- } else {- log.warn("Failed to load account deletion summary", e);- setSummaryPhase("failed");- }+ log.warn("Failed to load account deletion summary", e);+ setSummaryPhase("failed");}};@@ -166,26 +161,21 @@ const DeleteAccountDialogContents: React.FC<try {setLoading(true);- const { allowDelete, encryptedChallenge } =- await getAccountDeleteChallenge();+ const encryptedChallenge = await getAccountDeleteChallenge(+ await ensureAuthenticatedSession(),+ );- if (allowDelete && encryptedChallenge) {- if (!(await onAuthenticateUser())) {- setLoading(false);- return;- }- const decryptedChallenge =- await decryptDeleteAccountChallenge(encryptedChallenge);- await deleteAccount(- decryptedChallenge,- reason,- feedback.trim(),- );- logout();- } else {+ if (!(await onAuthenticateUser())) {setLoading(false);- askToMailForDeletion();+ return;}+ await deleteAccount(+ await ensureAuthenticatedSession(),+ encryptedChallenge,+ reason,+ feedback.trim(),+ );+ logout();} catch (e) {onGenericError(e);setLoading(false);@@ -193,26 +183,6 @@ const DeleteAccountDialogContents: React.FC<},});- const askToMailForDeletion = () => {- const emailID = "[email protected]";-- showMiniDialog({- title: t("delete_account"),- message: (- <Trans- i18nKey="delete_account_manually_message"- components={{ a: <Link href={`mailto:${emailID}`} /> }}- values={{ emailID }}- />- ),- continue: {- text: t("delete"),- color: "critical",- action: () => initiateEmail(emailID),- },- });- };-const handleBack = () => {setAcceptDataDeletion(false);setStep("reason");diff --git a/web/packages/base/locales/af-ZA/translation.json b/web/packages/base/locales/af-ZA/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/af-ZA/translation.json+++ b/web/packages/base/locales/af-ZA/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.jsonindex 244e780ec0..ca8f915155 100644--- a/web/packages/base/locales/ar-SA/translation.json+++ b/web/packages/base/locales/ar-SA/translation.json@@ -336,7 +336,6 @@"logout_message": "هل أنت متأكد من أنك تريد تسجيل الخروج؟","delete_account": "حذف الحساب","delete_account_multi_app_warning": "",- "delete_account_manually_message": "<p>يرجى إرسال بريد إلكتروني إلى <a>{{emailID}}</a> من عنوان بريدك الإلكتروني المسجل.</p><p>ستتم معالجة طلبك خلال 72 ساعة.</p>","change_email": "تغيير البريد الإلكتروني","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.jsonindex 3f7551b684..0cab422ebf 100644--- a/web/packages/base/locales/be-BY/translation.json+++ b/web/packages/base/locales/be-BY/translation.json@@ -336,7 +336,6 @@"logout_message": "Вы сапраўды хочаце выйсці?","delete_account": "Выдаліць уліковы запіс","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "Змяніць электронную пошту","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.jsonindex 0ea0f7be0a..cb98a1545b 100644--- a/web/packages/base/locales/bg-BG/translation.json+++ b/web/packages/base/locales/bg-BG/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.jsonindex 0f7ba35d2d..d51032492d 100644--- a/web/packages/base/locales/ca-ES/translation.json+++ b/web/packages/base/locales/ca-ES/translation.json@@ -336,7 +336,6 @@"logout_message": "Estàs segur que vols tancar la sessió?","delete_account": "Esborra el compte","delete_account_multi_app_warning": "Això esborrarà el teu compte d'Ente Auth, Ente Photos i Ente Locker.",- "delete_account_manually_message": "<p>Si us plau, envia un correu a <a>{{emailID}}</a> des de la teva adreça de correu registrada.</p><p>La teva sol·licitud es processarà en un termini de 72 hores.</p>","change_email": "Canvia el correu","active_sessions": "Sessions actives","active_sessions_hint": "Aquests són els dispositius on actualment tens la sessió iniciada",diff --git a/web/packages/base/locales/ckb-IR/translation.json b/web/packages/base/locales/ckb-IR/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ckb-IR/translation.json+++ b/web/packages/base/locales/ckb-IR/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.jsonindex e6effc83b5..d88ac72101 100644--- a/web/packages/base/locales/cs-CZ/translation.json+++ b/web/packages/base/locales/cs-CZ/translation.json@@ -336,7 +336,6 @@"logout_message": "Opravdu se chcete odhlásit?","delete_account": "Smazat účet","delete_account_multi_app_warning": "Tímto smažete Váš účet Ente Auth, Ente Photos a Ente Locker.",- "delete_account_manually_message": "<p>Pošlete prosím e-mail na <a>{{emailID}}</a> z vaší registrované e-mailové adresy.</p><p>Váš požadavek bude zpracován do 72 hodin.</p>","change_email": "Změnit e-mail","active_sessions": "Aktivní relace","active_sessions_hint": "Toto jsou zařízení, ve kterých jste aktuálně přihlášeni",diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.jsonindex 87132d454b..d65f259831 100644--- a/web/packages/base/locales/da-DK/translation.json+++ b/web/packages/base/locales/da-DK/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.jsonindex 86996cf6ce..10ad5ce377 100644--- a/web/packages/base/locales/de-DE/translation.json+++ b/web/packages/base/locales/de-DE/translation.json@@ -336,7 +336,6 @@"logout_message": "Sind sie sicher, dass sie sich ausloggen möchten?","delete_account": "Konto löschen","delete_account_multi_app_warning": "Dies wird Ihren Ente Auth, Ente Photos und Ente Locker Account löschen.",- "delete_account_manually_message": "<p>Bitte sende eine E-Mail an <a>{{emailID}}</a> mit deiner registrierten E-Mail-Adresse.</p><p>Deine Anfrage wird innerhalb von 72 Stunden bearbeitet.</p>","change_email": "E-Mail-Adresse ändern","active_sessions": "Aktive Sitzungen","active_sessions_hint": "Dies sind die Geräte, auf denen Sie derzeit angemeldet sind",diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.jsonindex 659bbc915f..2f3c4205aa 100644--- a/web/packages/base/locales/el-GR/translation.json+++ b/web/packages/base/locales/el-GR/translation.json@@ -336,7 +336,6 @@"logout_message": "Θέλετε σίγουρα να αποσυνδεθείτε;","delete_account": "Διαγραφή λογαριασμού","delete_account_multi_app_warning": "Αυτό θα διαγράψει τους λογαριασμούς σας σε Ente Auth, Ente Photos και Ente Locker.",- "delete_account_manually_message": "<p>Παρακαλώ στείλτε ένα μήνυμα ηλ. ταχυδρομείου στο <a>{{emailID}}</a> από την καταχωρημένη διεύθυνσή σας.</p><p>Θα επεξεργαστούμε το αίτημά σας εντός 72 ωρών.</p>","change_email": "Αλλαγή διεύθυνσης ηλ. ταχυδρομείου","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.jsonindex 73ae2aa5cc..518e670e42 100644--- a/web/packages/base/locales/en-US/translation.json+++ b/web/packages/base/locales/en-US/translation.json@@ -336,7 +336,6 @@"logout_message": "Are you sure you want to logout?","delete_account": "Delete account","delete_account_multi_app_warning": "This will delete your Ente Auth, Ente Photos and Ente Locker account.",- "delete_account_manually_message": "<p>Please send an email to <a>{{emailID}}</a> from your registered email address.</p><p>Your request will be processed within 72 hours.</p>","change_email": "Change email","active_sessions": "Active sessions","active_sessions_hint": "These are the devices where you are currently logged in",diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.jsonindex 0781bc40af..a82ad9c14c 100644--- a/web/packages/base/locales/es-ES/translation.json+++ b/web/packages/base/locales/es-ES/translation.json@@ -336,7 +336,6 @@"logout_message": "Seguro que quiere cerrar la sesión?","delete_account": "Eliminar cuenta","delete_account_multi_app_warning": "Esto eliminará su cuenta de Ente Auth, Ente Fotos y Ente Locker.",- "delete_account_manually_message": "<p>Por favor, envíe un correo electrónico a <a>{{emailID}}</a> desde la dirección de correo electrónico que usó para registrarse</p><p>Su solicitud será procesada en 72 horas.</p>","change_email": "Cambiar correo electrónico","active_sessions": "Sesiones activas","active_sessions_hint": "Estos son los dispositivos en los que estás conectado actualmente",diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/et-EE/translation.json+++ b/web/packages/base/locales/et-EE/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.jsonindex 0b18de373b..9ad92cd3d1 100644--- a/web/packages/base/locales/fa-IR/translation.json+++ b/web/packages/base/locales/fa-IR/translation.json@@ -336,7 +336,6 @@"logout_message": "آیا برای خروج، مطمئن هستید؟","delete_account": "حذف حساب کاربری","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.jsonindex 5478b92a06..68dbedbbb7 100644--- a/web/packages/base/locales/fi-FI/translation.json+++ b/web/packages/base/locales/fi-FI/translation.json@@ -336,7 +336,6 @@"logout_message": "Oletko varma, että haluat kirjautua ulos?","delete_account": "Poista tili","delete_account_multi_app_warning": "",- "delete_account_manually_message": "<p>Ole hyvä ja lähetä sähköpostia osoitteeseen <a>{{emailID}}</a> omasta rekisteröidystä sähköpostiosoitteestasi.</p><p>Pyyntösi käsitellään 72 tunnin kuluessa.</p>","change_email": "Vaihda sähköpostiosoite","active_sessions": "Aktiiviset istunnot","active_sessions_hint": "",diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.jsonindex 1f9f135674..03a9f23c3b 100644--- a/web/packages/base/locales/fr-FR/translation.json+++ b/web/packages/base/locales/fr-FR/translation.json@@ -336,7 +336,6 @@"logout_message": "Voulez-vous vraiment vous déconnecter?","delete_account": "Supprimer le compte","delete_account_multi_app_warning": "Ceci supprimera votre compte Ente Auth, Ente Photos et Ente Locker.",- "delete_account_manually_message": "<p>Veuillez envoyer un e-mail à <a>{{emailID}}</a>depuis Votre adresse enregistrée.</p><p>Votre demande sera traitée dans les 72 heures.</p>","change_email": "Modifier l'e-mail","active_sessions": "Sessions actives","active_sessions_hint": "Ce sont les appareils où vous êtes actuellement connecté",diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/gu-IN/translation.json+++ b/web/packages/base/locales/gu-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/hi-IN/translation.json+++ b/web/packages/base/locales/hi-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.jsonindex 5d20894c50..879c4f2209 100644--- a/web/packages/base/locales/hu-HU/translation.json+++ b/web/packages/base/locales/hu-HU/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.jsonindex a6604b2bf4..ddb35e8180 100644--- a/web/packages/base/locales/id-ID/translation.json+++ b/web/packages/base/locales/id-ID/translation.json@@ -336,7 +336,6 @@"logout_message": "Apakah kamu yakin ingin keluar akun?","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "Ubah email","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.jsonindex e0b2908a40..8ff1f3ed45 100644--- a/web/packages/base/locales/is-IS/translation.json+++ b/web/packages/base/locales/is-IS/translation.json@@ -336,7 +336,6 @@"logout_message": "Ertu viss um að þú viljir skrá þig út?","delete_account": "Eyða aðgangi","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "Breyta netfangi","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.jsonindex 42e1fb9da6..51b24091c1 100644--- a/web/packages/base/locales/it-IT/translation.json+++ b/web/packages/base/locales/it-IT/translation.json@@ -336,7 +336,6 @@"logout_message": "Sei sicuro di volerti disconnettere?","delete_account": "Elimina account","delete_account_multi_app_warning": "Questa operazione eliminerà il tuo account Ente Auth, Ente Photos e Ente Locker.",- "delete_account_manually_message": "<p>Per favore invia una email a <a>{{emailID}}</a> dal tuo indirizzo email registrato.</p><p>La tua richiesta verrà elaborata entro 72 ore.</p>","change_email": "Cambia email","active_sessions": "Sessioni attive","active_sessions_hint": "Questi sono i dispositivi da cui sei attualmente connesso",diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.jsonindex 5bccf74834..20be246cc0 100644--- a/web/packages/base/locales/ja-JP/translation.json+++ b/web/packages/base/locales/ja-JP/translation.json@@ -336,7 +336,6 @@"logout_message": "本当にログアウトしてよろしいですか?","delete_account": "アカウント削除","delete_account_multi_app_warning": "",- "delete_account_manually_message": "<p>ご登録のメールアドレスから <a>{{emailID}}</a> にメールを送信してください。</p><p>あなたのリクエストは72時間以内に処理されます。</p>","change_email": "メールアドレスを変更","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/km-KH/translation.json+++ b/web/packages/base/locales/km-KH/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/kn-IN/translation.json b/web/packages/base/locales/kn-IN/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/kn-IN/translation.json+++ b/web/packages/base/locales/kn-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.jsonindex bf935fe181..40e3671786 100644--- a/web/packages/base/locales/ko-KR/translation.json+++ b/web/packages/base/locales/ko-KR/translation.json@@ -336,7 +336,6 @@"logout_message": "정말로 로그아웃 하시겠습니까?","delete_account": "계정 삭제","delete_account_multi_app_warning": "",- "delete_account_manually_message": "<p>회원가입에 사용한 이메일을 통해 <a>{{emailID}}</a> (으)로 메일을 보내주세요.</p><p>귀하의 요청은 72시간 내로 처리됩니다.</p>","change_email": "이메일 주소 변경","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.jsonindex 86e61e594e..2540ca3029 100644--- a/web/packages/base/locales/lt-LT/translation.json+++ b/web/packages/base/locales/lt-LT/translation.json@@ -336,7 +336,6 @@"logout_message": "Ar tikrai norite atsijungti?","delete_account": "Ištrinti paskyrą","delete_account_multi_app_warning": "Tai ištrins jūsų „Ente Auth“, „Ente“ nuotraukos“ ir „Ente“ spintelės“ paskyras.",- "delete_account_manually_message": "<p>Iš savo registruoto el. pašto adreso siųskite el. laišką adresu <a>{{emailID}}</a>.</p><p>Jūsų prašymas bus apdorotas per 72 valandas.</p>","change_email": "Keisti el. paštą","active_sessions": "Aktyvūs seansai","active_sessions_hint": "Tai – įrenginiai, kuriuose šiuo metu esate prisijungę.",diff --git a/web/packages/base/locales/lv-LV/translation.json b/web/packages/base/locales/lv-LV/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/lv-LV/translation.json+++ b/web/packages/base/locales/lv-LV/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ml-IN/translation.json+++ b/web/packages/base/locales/ml-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ms-BN/translation.json b/web/packages/base/locales/ms-BN/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ms-BN/translation.json+++ b/web/packages/base/locales/ms-BN/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ms-MY/translation.json b/web/packages/base/locales/ms-MY/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ms-MY/translation.json+++ b/web/packages/base/locales/ms-MY/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.jsonindex eb07dc0b78..9a467aee3e 100644--- a/web/packages/base/locales/nl-NL/translation.json+++ b/web/packages/base/locales/nl-NL/translation.json@@ -336,7 +336,6 @@"logout_message": "Weet u zeker dat u wilt uitloggen?","delete_account": "Account verwijderen","delete_account_multi_app_warning": "Dit verwijdert uw Ente Auth, Ente Photos en Ente Locker account.",- "delete_account_manually_message": "<p>Stuur een e-mail naar <a>{{emailID}}</a> vanaf uw geregistreerde e-mailadres.</p><p>Uw aanvraag wordt binnen 72 uur verwerkt.</p>","change_email": "E-mail wijzigen","active_sessions": "Actieve sessies","active_sessions_hint": "Dit zijn de apparaten waarop u momenteel bent ingelogd",diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.jsonindex 88b16e9824..0e05178ff9 100644--- a/web/packages/base/locales/pl-PL/translation.json+++ b/web/packages/base/locales/pl-PL/translation.json@@ -336,7 +336,6 @@"logout_message": "Czy na pewno chcesz się wylogować?","delete_account": "Usuń konto","delete_account_multi_app_warning": "",- "delete_account_manually_message": "<p>Prosimy wysłać wiadomość e-mail na <a>{{emailID}}</a> z Twojego zarejestrowanego adresu e-mail. </p><p>Twoja prośba zostanie przetworzona w ciągu 72 godzin.</p>","change_email": "Zmień adres e-mail","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.jsonindex 8c8b266796..fde164f8a6 100644--- a/web/packages/base/locales/pt-BR/translation.json+++ b/web/packages/base/locales/pt-BR/translation.json@@ -336,7 +336,6 @@"logout_message": "Deseja mesmo encerrar sessão?","delete_account": "Excluir conta","delete_account_multi_app_warning": "Isso excluirá sua conta do Ente Auth, Ente Fotos e Ente Locker.",- "delete_account_manually_message": "<p>Por favor, envie um e-mail para <a>{{emailID}}</a>através do seu e-mail registrado.</p><p>Seu pedido será processado em 72 horas.</p>","change_email": "Alterar e-mail","active_sessions": "Sessões ativas","active_sessions_hint": "Estes são os dispositivos que você está registrado no momento",diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.jsonindex 1b8c992a32..e725856b73 100644--- a/web/packages/base/locales/pt-PT/translation.json+++ b/web/packages/base/locales/pt-PT/translation.json@@ -336,7 +336,6 @@"logout_message": "Tem certeza que deseja terminar a sessão?","delete_account": "Eliminar conta","delete_account_multi_app_warning": "Isto irá apagar a sua conta de Ente Auth, Ente Photos e Ente Locker",- "delete_account_manually_message": "<p>Por favor, envie um e-mail para <a>{{emailID}}</a> a partir do seu endereço de e-mail registrado.</p><p>Seu pedido será processado dentro de 72 horas.</p>","change_email": "Alterar e-mail","active_sessions": "Sessões ativas","active_sessions_hint": "Estes são os dispositivos onde está atualmente conectado ",diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ro-RO/translation.json+++ b/web/packages/base/locales/ro-RO/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.jsonindex d17a2efccd..d7e37e74de 100644--- a/web/packages/base/locales/ru-RU/translation.json+++ b/web/packages/base/locales/ru-RU/translation.json@@ -336,7 +336,6 @@"logout_message": "Вы уверены, что хотите выйти?","delete_account": "Удалить аккаунт","delete_account_multi_app_warning": "Это приведет к удалению ваших аккаунтов в Ente Auth, Ente Photos и Ente Locker.",- "delete_account_manually_message": "<p>Пожалуйста, отправьте письмо по адресу <a>{{emailID}}</a> с вашего зарегистрированного адреса электронной почты.</p><p>Ваш запрос будет обработан в течение 72 часов</p>","change_email": "Изменить адрес электронной почты","active_sessions": "Активные сессии","active_sessions_hint": "Устройства, на которых вы авторизованы",diff --git a/web/packages/base/locales/sk-SK/translation.json b/web/packages/base/locales/sk-SK/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/sk-SK/translation.json+++ b/web/packages/base/locales/sk-SK/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/sl-SI/translation.json+++ b/web/packages/base/locales/sl-SI/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/sr-SP/translation.json b/web/packages/base/locales/sr-SP/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/sr-SP/translation.json+++ b/web/packages/base/locales/sr-SP/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.jsonindex c64cecb9ee..32671c8e27 100644--- a/web/packages/base/locales/sv-SE/translation.json+++ b/web/packages/base/locales/sv-SE/translation.json@@ -336,7 +336,6 @@"logout_message": "Är du säker på att du vill logga ut?","delete_account": "Radera konto","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "Ändra e-postadress","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ta-IN/translation.json+++ b/web/packages/base/locales/ta-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.jsonindex 6631ca0192..a134e94565 100644--- a/web/packages/base/locales/te-IN/translation.json+++ b/web/packages/base/locales/te-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "మీరు నిజంగా లాగ్ అవుట్ కావాలనుకుంటున్నారా?","delete_account": "ఖాతాను తొలగించండి","delete_account_multi_app_warning": "ఇది మీ Ente Auth, Ente Photos మరియు Ente Locker ఖాతాను తొలగిస్తుంది.",- "delete_account_manually_message": "<p>దయచేసి మీ నమోదైన ఇమెయిల్ చిరునామా నుండి <a>{{emailID}}</a>కు ఒక ఇమెయిల్ పంపండి.</p><p>మీ అభ్యర్థన 72 గంటల్లో ప్రాసెస్ చేయబడుతుంది.</p>","change_email": "ఇమెయిల్ను మార్చండి","active_sessions": "క్రియాశీల సెషన్లు","active_sessions_hint": "మీరు ప్రస్తుతం లాగిన్ అయి ఉన్న పరికరాలు ఇవి",diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.jsonindex d87c71ae30..574eb82dde 100644--- a/web/packages/base/locales/th-TH/translation.json+++ b/web/packages/base/locales/th-TH/translation.json@@ -336,7 +336,6 @@"logout_message": "คุณแน่ใจไหมว่าจะออกจากระบบ?","delete_account": "บัญชี","delete_account_multi_app_warning": "การกระทำนี้จะลบบัญชี Ente Auth, Ente Photos และ Ente Locker ของคุณ",- "delete_account_manually_message": "","change_email": "เปลี่ยนอีเมล","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.jsonindex dee113946d..a1fc703dfe 100644--- a/web/packages/base/locales/ti-ER/translation.json+++ b/web/packages/base/locales/ti-ER/translation.json@@ -336,7 +336,6 @@"logout_message": "","delete_account": "","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.jsonindex 7581f84ce2..06566f7d6f 100644--- a/web/packages/base/locales/tr-TR/translation.json+++ b/web/packages/base/locales/tr-TR/translation.json@@ -336,7 +336,6 @@"logout_message": "Çıkış yapmak istediğine emin misin?","delete_account": "Hesabı sil","delete_account_multi_app_warning": "",- "delete_account_manually_message": "<p>Lütfen kaydolduğun e-posta adresinden <a>{{emailID}}</a> adresine bir e-posta gönder.</p><p>İsteğin 72 saat içinde işleme alınacaktır.</p>","change_email": "E-posta adresini değiştir","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/tt-RU/translation.json b/web/packages/base/locales/tt-RU/translation.jsonindex 6408a66c8e..9424777b8c 100644--- a/web/packages/base/locales/tt-RU/translation.json+++ b/web/packages/base/locales/tt-RU/translation.json@@ -336,7 +336,6 @@"logout_message": "Чыгарга теләвегезне раслыйсызмы?","delete_account": "Аккаунтны бетерү","delete_account_multi_app_warning": "Бу сезнең Ente Auth, Ente Photos һәм Ente Locker аккаунтыгызны бетерәчәк.",- "delete_account_manually_message": "<p>Зинһар, теркәлгән email адресыгыздан <a>{{emailID}}</a> адресына хат җибәрегез.</p><p>Соравыгыз 72 сәгать эчендә каралачак.</p>","change_email": "Email адресын үзгәртү","active_sessions": "Актив сессияләр","active_sessions_hint": "Болар — сез хәзерге вакытта кергән җайланмалар",diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.jsonindex e34f06777f..5a5ebc46e0 100644--- a/web/packages/base/locales/uk-UA/translation.json+++ b/web/packages/base/locales/uk-UA/translation.json@@ -336,7 +336,6 @@"logout_message": "Ви впевнені, що хочете вийти з облікового запису?","delete_account": "Видалити обліковий запис","delete_account_multi_app_warning": "Це видалить ваші облікові записи Ente Auth, Ente Photos та Ente Locker.",- "delete_account_manually_message": "<p>Надішліть листа на <a>{{emailID}}</a> з вашої зареєстрованої поштової адреси.</p><p>Ваш запит буде оброблено протягом 72 годин.</p>","change_email": "Змінити поштову адресу","active_sessions": "Активні сеанси","active_sessions_hint": "Це пристрої, на яких ви зараз увійшли",diff --git a/web/packages/base/locales/ur-IN/translation.json b/web/packages/base/locales/ur-IN/translation.jsonindex 525af8d548..5bf92c3785 100644--- a/web/packages/base/locales/ur-IN/translation.json+++ b/web/packages/base/locales/ur-IN/translation.json@@ -336,7 +336,6 @@"logout_message": "کیا آپ واقعی لاگ آؤٹ کرنا چاہتے ہیں؟","delete_account": "اکاؤنٹ حذف کریں","delete_account_multi_app_warning": "یہ آپ کا Ente Auth، Ente Photos اور Ente Locker اکاؤنٹ حذف کر دے گا۔",- "delete_account_manually_message": "<p>براہ مہربانی اپنے رجسٹرڈ ای میل سے <a>{{emailID}}</a> پر ای میل بھیجیں۔</p><p>آپ کی درخواست 72 گھنٹوں میں پروسیس کر دی جائے گی۔</p>","change_email": "ای میل تبدیل کریں","active_sessions": "فعال سیشنز","active_sessions_hint": "یہ وہ ڈیوائسز ہیں جہاں آپ فی الحال لاگ ان ہیں",diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.jsonindex 2d0ad2c924..2f407d009c 100644--- a/web/packages/base/locales/vi-VN/translation.json+++ b/web/packages/base/locales/vi-VN/translation.json@@ -336,7 +336,6 @@"logout_message": "Bạn có chắc muốn đăng xuất không?","delete_account": "Xóa tài khoản","delete_account_multi_app_warning": "Việc này sẽ xóa Ente Auth, Ente Photos và tài khoản Ente Locker của bạn.",- "delete_account_manually_message": "<p>Vui lòng gửi email đến <a>{{emailID}}</a> từ địa chỉ email đã đăng ký của bạn.</p><p>Yêu cầu của bạn sẽ được xử lý trong vòng 72 giờ.</p>","change_email": "Đổi email","active_sessions": "Phiên hoạt động","active_sessions_hint": "Đây là những thiết bị mà bạn đăng nhập gần đây",diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.jsonindex 0c40a1fe8c..05df81d6d0 100644--- a/web/packages/base/locales/zh-CN/translation.json+++ b/web/packages/base/locales/zh-CN/translation.json@@ -336,7 +336,6 @@"logout_message": "您确定要退出登录吗?","delete_account": "删除账户","delete_account_multi_app_warning": "这将删除您的 Ente Auth、Ente Photos 和 Ente Locker 账户。",- "delete_account_manually_message": "<p>请从您注册的电子邮箱向 <a>{{emailID}}</a> 发送一封电子邮件。</p><p>您的请求将在 72 小时内处理。</p>","change_email": "更改电子邮件","active_sessions": "活跃会话","active_sessions_hint": "以下是您当前登录的设备",diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.jsonindex d7b81703c8..41f600ba62 100644--- a/web/packages/base/locales/zh-HK/translation.json+++ b/web/packages/base/locales/zh-HK/translation.json@@ -336,7 +336,6 @@"logout_message": "確定要登出嗎?","delete_account": "刪除帳戶","delete_account_multi_app_warning": "",- "delete_account_manually_message": "","change_email": "更改電子郵件","active_sessions": "","active_sessions_hint": "",diff --git a/web/packages/base/locales/zh-TW/translation.json b/web/packages/base/locales/zh-TW/translation.jsonindex a6e92e6e04..a97ee93828 100644--- a/web/packages/base/locales/zh-TW/translation.json+++ b/web/packages/base/locales/zh-TW/translation.json@@ -336,7 +336,6 @@"logout_message": "確定要登出嗎?","delete_account": "刪除帳戶","delete_account_multi_app_warning": "這將刪除您的 Ente Auth、Ente Photos 與 Ente Locker 帳戶。",- "delete_account_manually_message": "<p>請使用您註冊的電子郵件地址寄信至 <a>{{emailID}}</a>。</p><p>您的申請將在 72 小時內處理。</p>","change_email": "更改電子郵件","active_sessions": "已登入的裝置","active_sessions_hint": "以下為您目前登入的裝置",diff --git a/web/packages/new/photos/services/user.ts b/web/packages/new/photos/services/user.tsindex d017f56e24..329f0688bc 100644--- a/web/packages/new/photos/services/user.ts+++ b/web/packages/new/photos/services/user.ts@@ -1,22 +1,7 @@-import { ensureSavedKeyAttributes } from "ente-accounts/services/user";-import { boxSealOpenBytes, decryptBox } from "ente-base/crypto";-import type { KeyPair } from "ente-base/crypto/types";import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";import { apiURL } from "ente-base/origins";-import { ensureMasterKeyFromSession } from "ente-new/photos/services/account-keys";-import { nullToUndefined } from "ente-utils/transform";import { z } from "zod";-const ensureUserKeyPair = async (): Promise<KeyPair> => {- const { encryptedSecretKey, secretKeyDecryptionNonce, publicKey } =- ensureSavedKeyAttributes();- const privateKey = await decryptBox(- { encryptedData: encryptedSecretKey, nonce: secretKeyDecryptionNonce },- await ensureMasterKeyFromSession(),- );- return { publicKey, privateKey };-};-export const getPublicKey = async (email: string) => {const res = await fetch(await apiURL("/users/public-key", { email }), {headers: await authenticatedRequestHeaders(),@@ -41,57 +26,3 @@ export const disable2FA = async () =>headers: await authenticatedRequestHeaders(),}),);--const DeleteChallengeResponse = z.object({- allowDelete: z.boolean(),- encryptedChallenge: z.string().nullish().transform(nullToUndefined),-});--export interface AccountDeletionSummary {- photosAndVideosCount: number;- authenticatorCodesCount: number;- lockerRecordsCount: number;-}--const AccountDeletionSummary = z.object({- photosAndVideosCount: z.number().int(),- authenticatorCodesCount: z.number().int(),- lockerRecordsCount: z.number().int(),-});--export const getAccountDeletionSummary =- async (): Promise<AccountDeletionSummary> => {- const res = await fetch(await apiURL("/users/deletion-summary"), {- headers: await authenticatedRequestHeaders(),- });- ensureOk(res);- return AccountDeletionSummary.parse(await res.json());- };--export const getAccountDeleteChallenge = async () => {- const res = await fetch(await apiURL("/users/delete-challenge"), {- headers: await authenticatedRequestHeaders(),- });- ensureOk(res);- return DeleteChallengeResponse.parse(await res.json());-};--export const decryptDeleteAccountChallenge = async (- encryptedChallenge: string,-) =>- new TextDecoder().decode(- await boxSealOpenBytes(encryptedChallenge, await ensureUserKeyPair()),- );--export const deleteAccount = async (- challenge: string,- reason: string,- feedback: string,-) =>- ensureOk(- await fetch(await apiURL("/users/delete"), {- method: "DELETE",- headers: await authenticatedRequestHeaders(),- body: JSON.stringify({ challenge, reason, feedback }),- }),- );diff --git a/web/packages/wasm/photos/index.ts b/web/packages/wasm/photos/index.tsindex 8ac5fb66c9..e691f74a57 100644--- a/web/packages/wasm/photos/index.ts+++ b/web/packages/wasm/photos/index.ts@@ -7,6 +7,7 @@ import type {} from "./pkg/ente_photos_wasm";export type {+ AccountDeletionSummary,LocationCityGroup,OpenSessionInput,Session,@@ -23,6 +24,20 @@ export const createLocationIndex = async (export const openSession = async (input: OpenSessionInput): Promise<Session> =>(await wasm()).openSession(input);+export const getAccountDeletionSummary = async (session: Session) =>+ (await wasm()).getAccountDeletionSummary(session);++export const getAccountDeleteChallenge = async (session: Session) =>+ (await wasm()).getAccountDeleteChallenge(session);++export const deleteAccount = async (+ session: Session,+ encryptedChallenge: string,+ reason: string,+ feedback?: string,+) =>+ (await wasm()).deleteAccount(session, encryptedChallenge, reason, feedback);+export const recoveryKeyMnemonic = async (session: Session) =>(await wasm()).authRecoveryKeyMnemonic(session);diff --git a/web/packages/wasm/tests/bindings.test.ts b/web/packages/wasm/tests/bindings.test.tsindex 7144d0b906..499ca870d4 100644--- a/web/packages/wasm/tests/bindings.test.ts+++ b/web/packages/wasm/tests/bindings.test.ts@@ -10,10 +10,82 @@ import {generateKeyPair,} from "ente-prelogin-wasm";import { afterEach, describe, expect, test, vi } from "vitest";-import { lockerPrepareFileLinkPayload } from "../locker/pkg/ente_locker_wasm";+import {+ cryptoBoxSeal,+ lockerPrepareFileLinkPayload,+} from "../locker/pkg/ente_locker_wasm";afterEach(() => vi.unstubAllGlobals());+test("Photos deletion keeps summary fallback and decrypts the challenge in Rust", async () => {+ const masterKey = await generateKey();+ const input = await sessionKeyAttributes(masterKey);+ const encryptedChallenge = cryptoBoxSeal(+ Buffer.from("deletion-jwt").toString("base64"),+ input.keyAttributes.publicKey,+ );+ const summary = {+ photosAndVideosCount: 12,+ authenticatorCodesCount: 3,+ lockerRecordsCount: 4,+ };+ let summaryStatus = 404;+ let feedback: string | undefined;+ let deletions = 0;+ mockFetch(async (request) => {+ expect(request.headers.get("X-Auth-Token")).toBe("test-token");+ switch (new URL(request.url).pathname) {+ case "/users/deletion-summary":+ return summaryStatus == 200+ ? Response.json(summary)+ : new Response(null, { status: summaryStatus });+ case "/users/delete-challenge":+ return Response.json({ encryptedChallenge });+ case "/users/delete":+ expect(request.method).toBe("DELETE");+ expect(await request.json()).toStrictEqual({+ challenge: "deletion-jwt",+ reasonCategory: "not_listed",+ ...(feedback && { feedback }),+ });+ deletions++;+ return Response.json({});+ default:+ throw new Error(`Unexpected request: ${request.url}`);+ }+ });+ const session = await photos.openSession({+ baseUrl: "http://localhost",+ authToken: "test-token",+ masterKeyB64: masterKey,+ ...input,+ });+ try {+ expect(await photos.getAccountDeletionSummary(session)).toBeUndefined();+ summaryStatus = 200;+ expect(await photos.getAccountDeletionSummary(session)).toStrictEqual(+ summary,+ );+ summaryStatus = 500;+ await expect(photos.getAccountDeletionSummary(session)).rejects.toThrow(+ "HTTP 500",+ );+ const challenge = await photos.getAccountDeleteChallenge(session);+ expect(challenge).toBe(encryptedChallenge);+ for (feedback of ["Feedback", undefined]) {+ await photos.deleteAccount(+ session,+ challenge,+ "not_listed",+ feedback,+ );+ }+ expect(deletions).toBe(2);+ } finally {+ session.free();+ }+});+test.each(["classical", "post-quantum"])("Photos %s Cast payloads round-trip and enforce safe collection IDs",async (encryption) => {