π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Clean up Contacts and Legacy internals
Manav Rathi28333bafe090
diff --git a/rust/crates/contacts/src/lib.rs b/rust/crates/contacts/src/lib.rsindex 38caf82727..33245c0107 100644--- a/rust/crates/contacts/src/lib.rs+++ b/rust/crates/contacts/src/lib.rs@@ -1,8 +1,8 @@-pub mod client;+mod client;pub mod crypto;-pub mod error;-pub mod models;-pub mod transport;+mod error;+mod models;+mod transport;pub use client::{ContactsClient, OpenContactsInput, OpenContactsResult, RootKeySource};pub use error::{Error, Result};diff --git a/rust/crates/contacts/tests/contacts.rs b/rust/crates/contacts/tests/contacts.rsindex 7347c46329..08198f8a65 100644--- a/rust/crates/contacts/tests/contacts.rs+++ b/rust/crates/contacts/tests/contacts.rs@@ -2,7 +2,7 @@mod support;-use ente_contacts::models::ContactData;+use ente_contacts::ContactData;use ente_core::http;use ente_legacy::{LegacyContactState, LegacyKitRecoveryClient, LegacyKitRecoveryStatus, LegacyRecoveryStatus,diff --git a/rust/crates/contacts/tests/contacts_mock.rs b/rust/crates/contacts/tests/contacts_mock.rsindex 84fa6e78c5..fce15e6a20 100644--- a/rust/crates/contacts/tests/contacts_mock.rs+++ b/rust/crates/contacts/tests/contacts_mock.rs@@ -1,8 +1,10 @@use std::sync::Arc;-use ente_contacts::client::{ContactsClient, OpenContactsInput, OpenContactsResult, RootKeySource};use ente_contacts::crypto as contacts_crypto;-use ente_contacts::models::{AttachmentType, ContactData, WrappedRootContactKey};+use ente_contacts::{+ AttachmentType, ContactData, ContactsClient, OpenContactsInput, OpenContactsResult,+ RootKeySource, WrappedRootContactKey,+};use ente_core::{crypto::{Key, SecretVec},http::{Api, ApiConfig, Auth, Http},diff --git a/rust/crates/legacy/src/client.rs b/rust/crates/legacy/src/client.rsindex a5a7865446..cf3e3c71e9 100644--- a/rust/crates/legacy/src/client.rs+++ b/rust/crates/legacy/src/client.rs@@ -23,10 +23,10 @@ use crate::kit_transport::{use crate::models::{LegacyContactState, LegacyInfo, LegacyRecoveryBundle};use crate::transport::{LegacyAddContactRequest, LegacyChangePasswordRequest, LegacyChangePasswordResponse,- LegacyContactIdentifier, LegacyInfoResponse, LegacyInitChangePasswordRequest,- LegacyPublicKeyResponse, LegacyRecoveryIdentifier, LegacyRecoveryInfoResponse,- LegacySetupSrpRequest, LegacySetupSrpResponse, LegacyUpdateContactRequest,- LegacyUpdateRecoveryNoticeRequest, LegacyUpdateSrpAndKeysRequest, LegacyUpdatedKeyAttr,+ LegacyContactIdentifier, LegacyInitChangePasswordRequest, LegacyPublicKeyResponse,+ LegacyRecoveryIdentifier, LegacyRecoveryInfoResponse, LegacySetupSrpRequest,+ LegacySetupSrpResponse, LegacyUpdateContactRequest, LegacyUpdateRecoveryNoticeRequest,+ LegacyUpdateSrpAndKeysRequest, LegacyUpdatedKeyAttr,};pub struct LegacyClient {@@ -46,7 +46,7 @@ impl LegacyClient {.send().await?.error_for_status()?- .json::<LegacyInfoResponse>()+ .json::<LegacyInfo>().await?)}diff --git a/rust/crates/legacy/src/kit_transport.rs b/rust/crates/legacy/src/kit_transport.rsindex 6eb70b304b..20bf80a907 100644--- a/rust/crates/legacy/src/kit_transport.rs+++ b/rust/crates/legacy/src/kit_transport.rs@@ -68,10 +68,7 @@ pub struct LegacyKitChallengeRequest {#[derive(Debug, Clone, Deserialize)]#[serde(rename_all = "camelCase")]pub struct LegacyKitChallengeResponse {- #[serde(rename = "kitID")]- pub kit_id: String,pub encrypted_challenge: String,- pub expires_at: i64,}#[derive(Debug, Clone, Serialize)]@@ -187,49 +184,6 @@ pub struct LegacyKitChangePasswordRequest {#[derive(Debug, Clone, Deserialize)]#[serde(rename_all = "camelCase")]pub struct LegacyKitChangePasswordResponse {- #[serde(rename = "setupID")]- pub setup_id: String,#[serde(rename = "srpM2")]pub srp_m2: String,}--#[cfg(test)]-mod tests {- use super::*;-- #[test]- fn legacy_kit_record_response_requires_legacy_url() {- let response = serde_json::from_str::<LegacyKitRecordResponse>(- r#"{- "id":"kit-id",- "variant":1,- "noticePeriodInHours":168,- "encryptedOwnerBlob":"owner-blob",- "createdAt":1,- "updatedAt":2,- "activeRecoverySession":null- }"#,- );-- assert!(response.is_err());- }-- #[test]- fn legacy_kit_record_response_uses_configured_legacy_url() {- let response = serde_json::from_str::<LegacyKitRecordResponse>(- r#"{- "id":"kit-id",- "variant":1,- "noticePeriodInHours":168,- "legacyUrl":"http://localhost:3013",- "encryptedOwnerBlob":"owner-blob",- "createdAt":1,- "updatedAt":2,- "activeRecoverySession":null- }"#,- )- .unwrap();-- assert_eq!(response.legacy_url, "http://localhost:3013");- }-}diff --git a/rust/crates/legacy/src/lib.rs b/rust/crates/legacy/src/lib.rsindex feed19fa20..16a89318c9 100644--- a/rust/crates/legacy/src/lib.rs+++ b/rust/crates/legacy/src/lib.rs@@ -1,10 +1,10 @@-pub mod client;-pub mod error;-pub mod kit;-pub mod kit_models;-pub mod kit_transport;-pub mod models;-pub mod transport;+mod client;+mod error;+mod kit;+mod kit_models;+mod kit_transport;+mod models;+mod transport;pub use client::LegacyClient;pub use error::{Error, Result};diff --git a/rust/crates/legacy/src/transport.rs b/rust/crates/legacy/src/transport.rsindex d64dc5a911..209e271ad4 100644--- a/rust/crates/legacy/src/transport.rs+++ b/rust/crates/legacy/src/transport.rs@@ -1,7 +1,7 @@use ente_accounts::auth::KeyAttributes;use serde::{Deserialize, Serialize};-use crate::models::{LegacyContactState, LegacyInfo};+use crate::models::LegacyContactState;#[derive(Debug, Clone, Deserialize)]#[serde(rename_all = "camelCase")]@@ -124,130 +124,6 @@ pub struct LegacyChangePasswordRequest {#[derive(Debug, Clone, Deserialize)]#[serde(rename_all = "camelCase")]pub struct LegacyChangePasswordResponse {- #[serde(rename = "setupID")]- pub setup_id: String,#[serde(rename = "srpM2")]pub srp_m2: String,}--pub type LegacyInfoResponse = LegacyInfo;--#[cfg(test)]-mod tests {- use serde_json::{json, to_value};-- use super::*;-- #[test]- fn serializes_legacy_contact_identifiers_with_canonical_id_keys() {- let request = LegacyUpdateContactRequest {- user_id: 1,- emergency_contact_id: 2,- state: LegacyContactState::Accepted,- };- assert_eq!(- to_value(request).unwrap(),- json!({- "userID": 1,- "emergencyContactID": 2,- "state": "ACCEPTED",- })- );-- let request = LegacyUpdateRecoveryNoticeRequest {- emergency_contact_id: 2,- recovery_notice_in_days: 14,- };- assert_eq!(- to_value(request).unwrap(),- json!({- "emergencyContactID": 2,- "recoveryNoticeInDays": 14,- })- );-- let request = LegacyContactIdentifier {- user_id: 1,- emergency_contact_id: 2,- };- assert_eq!(- to_value(request).unwrap(),- json!({- "userID": 1,- "emergencyContactID": 2,- })- );-- let request = LegacyRecoveryIdentifier {- id: "session".to_string(),- user_id: 1,- emergency_contact_id: 2,- };- assert_eq!(- to_value(request).unwrap(),- json!({- "id": "session",- "userID": 1,- "emergencyContactID": 2,- })- );- }-- #[test]- fn serializes_legacy_password_reset_requests_with_recovery_id_keys() {- let setup = LegacySetupSrpRequest {- srp_user_id: "user".to_string(),- srp_salt: "salt".to_string(),- srp_verifier: "verifier".to_string(),- srp_a: "a".to_string(),- };- let request = LegacyInitChangePasswordRequest {- recovery_id: "session".to_string(),- setup_srp_request: setup,- };- assert_eq!(- to_value(request).unwrap(),- json!({- "recoveryID": "session",- "setupSRPRequest": {- "srpUserID": "user",- "srpSalt": "salt",- "srpVerifier": "verifier",- "srpA": "a",- },- })- );-- let request = LegacyChangePasswordRequest {- recovery_id: "session".to_string(),- update_srp_and_keys_request: LegacyUpdateSrpAndKeysRequest {- setup_id: "setup".to_string(),- srp_m1: "m1".to_string(),- updated_key_attr: LegacyUpdatedKeyAttr {- kek_salt: "kek".to_string(),- encrypted_key: "encrypted".to_string(),- key_decryption_nonce: "nonce".to_string(),- mem_limit: 1,- ops_limit: 2,- },- },- };- assert_eq!(- to_value(request).unwrap(),- json!({- "recoveryID": "session",- "updateSrpAndKeysRequest": {- "setupID": "setup",- "srpM1": "m1",- "updatedKeyAttr": {- "kekSalt": "kek",- "encryptedKey": "encrypted",- "keyDecryptionNonce": "nonce",- "memLimit": 1,- "opsLimit": 2,- },- },- })- );- }-}