π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use app User-Agent in native sessions
Manav Rathi111491cca751
diff --git a/mobile/apps/locker/lib/services/authenticated_session.dart b/mobile/apps/locker/lib/services/authenticated_session.dartindex f3ae4a61c7..131235cc8b 100644--- a/mobile/apps/locker/lib/services/authenticated_session.dart+++ b/mobile/apps/locker/lib/services/authenticated_session.dart@@ -1,3 +1,5 @@+import 'dart:io';+import 'package:locker/service_locator.dart';import 'package:locker/services/configuration.dart';import 'package:locker/src/rust/third_party/ente_frb_lib/session.dart';@@ -21,13 +23,15 @@ Session authenticatedSession() {return current;}- final packageInfo = ServiceLocator.instance.packageInfo;+ final services = ServiceLocator.instance;final opened = openSession(baseUrl: baseUrl,authToken: authToken,masterKey: masterKey,- clientPackage: packageInfo.packageName,- clientVersion: packageInfo.version,+ userAgent:+ services.enteDio.options.headers[HttpHeaders.userAgentHeader] as String,+ clientPackage: services.packageInfo.packageName,+ clientVersion: services.packageInfo.version,);clearAuthenticatedSession();_session = opened;diff --git a/mobile/apps/photos/lib/services/authenticated_session.dart b/mobile/apps/photos/lib/services/authenticated_session.dartindex de11c5dae8..8aa0e90114 100644--- a/mobile/apps/photos/lib/services/authenticated_session.dart+++ b/mobile/apps/photos/lib/services/authenticated_session.dart@@ -1,3 +1,5 @@+import 'dart:io';+import 'package:photos/core/configuration.dart';import 'package:photos/service_locator.dart';import 'package:photos/src/rust/third_party/ente_frb_lib/session.dart';@@ -21,13 +23,15 @@ Session authenticatedSession() {return current;}- final packageInfo = ServiceLocator.instance.packageInfo;+ final services = ServiceLocator.instance;final opened = openSession(baseUrl: baseUrl,authToken: authToken,masterKey: masterKey,- clientPackage: packageInfo.packageName,- clientVersion: packageInfo.version,+ userAgent:+ services.enteDio.options.headers[HttpHeaders.userAgentHeader] as String,+ clientPackage: services.packageInfo.packageName,+ clientVersion: services.packageInfo.version,);clearAuthenticatedSession();_session = opened;diff --git a/rust/bindings/wasm/legacy/src/lib.rs b/rust/bindings/wasm/legacy/src/lib.rsindex f1c250ad06..ef70927ec7 100644--- a/rust/bindings/wasm/legacy/src/lib.rs+++ b/rust/bindings/wasm/legacy/src/lib.rs@@ -169,7 +169,6 @@ struct OpenLegacyKitRecoveryInput {email: Option<String>,client_package: Option<String>,client_version: Option<String>,- user_agent: Option<String>,}#[wasm_bindgen]@@ -179,7 +178,7 @@ pub async fn legacy_kit_open_recovery(input: JsValue) -> Result<LegacyKitRecoverinput.base_url,input.client_package,input.client_version,- input.user_agent,+ None,)?;let handle = client.open_from_shares(&input.shares, input.email.as_deref())diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rsindex 272aeb0c40..6588a03b04 100644--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@ -63,7 +63,6 @@ struct OpenAccountSpaceCtxJsInput {space_root_key_b64: String,#[serde(default)]owned_spaces: Option<Vec<SpaceKeyResponse>>,- user_agent: Option<String>,client_package: Option<String>,client_version: Option<String>,}@@ -74,7 +73,6 @@ struct OpenSpaceLinkCtxJsInput {base_url: String,space_username: String,access_key: String,- user_agent: Option<String>,client_package: Option<String>,client_version: Option<String>,}@@ -647,7 +645,7 @@ pub async fn space_open_account_ctx(input: JsValue) -> Result<SpaceAccountCtxHanspace_session_token: input.space_session_token,space_root_key,initial_owned_spaces: input.owned_spaces,- user_agent: input.user_agent,+ user_agent: None,client_package: input.client_package,client_version: input.client_version,})?;@@ -661,7 +659,7 @@ pub async fn space_open_link_ctx(input: JsValue) -> Result<SpaceLinkCtxHandle, Ebase_url: input.base_url,space_slug: input.space_username,access_key: input.access_key,- user_agent: input.user_agent,+ user_agent: None,client_package: input.client_package,client_version: input.client_version,})diff --git a/web/apps/legacy/src/features/legacy-kit/recovery.ts b/web/apps/legacy/src/features/legacy-kit/recovery.tsindex 52544a3f57..800f3abf16 100644--- a/web/apps/legacy/src/features/legacy-kit/recovery.ts+++ b/web/apps/legacy/src/features/legacy-kit/recovery.ts@@ -34,8 +34,6 @@ export const openLegacyKitRecovery = async (email: email?.trim() || undefined,clientPackage: clientPackageName,clientVersion: isDesktop ? desktopAppVersion : undefined,- userAgent:- typeof navigator === "undefined" ? undefined : navigator.userAgent,});return {