π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Move Space friend actors into ente-space
Manav Rathi8cc10ec57694
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rsindex a6f960ffc2..fde44c9ddc 100644--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@ -54,10 +54,6 @@ impl Error {fn message(&self) -> String {ente_core::error::chain(self)}-- fn is_content_error(&self) -> bool {- matches!(self, Self::Space(error) if error.is_content_error())- }}impl From<Error> for JsValue {@@ -237,6 +233,19 @@ struct SpaceActorResponse {avatar: Option<ProfileAvatarResponse>,}+impl From<ente_space::SpaceActorResponse> for SpaceActorResponse {+ fn from(actor: ente_space::SpaceActorResponse) -> Self {+ Self {+ space_id: actor.space_id,+ space_slug: actor.space_slug,+ public_key: actor.public_key,+ key_version: actor.key_version,+ profile: None,+ avatar: actor.avatar.map(Into::into),+ }+ }+}+#[derive(Serialize, Tsify)]#[serde(rename_all = "camelCase")]pub struct PostResponse {@@ -353,6 +362,16 @@ pub struct SpaceFriendRequestResponse {created_at: String,}+impl From<ente_space::SpaceFriendRequestResponse> for SpaceFriendRequestResponse {+ fn from(request: ente_space::SpaceFriendRequestResponse) -> Self {+ Self {+ request_id: request.request_id,+ requester: request.requester.into(),+ created_at: request.created_at,+ }+ }+}+#[derive(Serialize, Tsify)]#[serde(rename_all = "camelCase")]pub struct SpaceSentFriendRequestResponse {@@ -361,6 +380,16 @@ pub struct SpaceSentFriendRequestResponse {created_at: String,}+impl From<ente_space::SpaceSentFriendRequestResponse> for SpaceSentFriendRequestResponse {+ fn from(request: ente_space::SpaceSentFriendRequestResponse) -> Self {+ Self {+ request_id: request.request_id,+ target: request.target.into(),+ created_at: request.created_at,+ }+ }+}+#[derive(Serialize, Tsify)]#[serde(rename_all = "camelCase")]pub struct SpaceLookupResponse {@@ -474,10 +503,15 @@ fn profile_to_js(value: ente_space::DecryptedSpaceProfile) -> DecryptedSpaceProf}}-fn actor_to_js(- actor: ente_space::SpaceActorResponse,- profile: Option<ente_space::SpaceProfile>,-) -> SpaceActorResponse {+fn actor_to_js(actor: ente_space::SpaceActor) -> SpaceActorResponse {+ let profile = actor.profile.unwrap_or_else(|error| {+ log::warn!(+ "Space profile {} fell back to public fields: {}",+ actor.space_id,+ ente_core::error::chain(&error)+ );+ None+ });SpaceActorResponse {space_id: actor.space_id,space_slug: actor.space_slug,@@ -488,28 +522,14 @@ fn actor_to_js(}}-async fn account_actor_to_js(- ctx: &AccountSpaceCtx,- actor: ente_space::SpaceActorResponse,-) -> Result<SpaceActorResponse, Error> {- match ctx.decrypt_actor_profile(&actor).await.map_err(Error::from) {- Ok(profile) => Ok(actor_to_js(actor, profile)),- Err(error) if error.is_content_error() => {- log::warn!(- "Space profile {} fell back to public fields: {}",- actor.space_id,- error.message()- );- Ok(public_actor_to_js(actor))- }- Err(error) => Err(error),+fn friend_to_js(friend: ente_space::SpaceFriend) -> SpaceFriendResponse {+ SpaceFriendResponse {+ friend: actor_to_js(friend.friend),+ share_key_version: friend.share_key_version,+ created_at: friend.created_at,}}-fn public_actor_to_js(actor: ente_space::SpaceActorResponse) -> SpaceActorResponse {- actor_to_js(actor, None)-}-fn post_to_js(post: ente_space::Post) -> PostResponse {let (caption, photos, is_unavailable) = match post.content {Ok(content) => (@@ -526,26 +546,11 @@ fn post_to_js(post: ente_space::Post) -> PostResponse {(None, Vec::new(), true)}};- let profile = post.author.profile.unwrap_or_else(|error| {- log::warn!(- "Space profile {} fell back to public fields: {}",- post.author.space_id,- ente_core::error::chain(&error)- );- None- });PostResponse {post_id: post.post_id,space_id: post.space_id,space_slug: post.space_slug,- author: SpaceActorResponse {- space_id: post.author.space_id,- space_slug: post.author.space_slug,- public_key: post.author.public_key,- key_version: post.author.key_version,- profile: profile.map(Into::into),- avatar: post.author.avatar.map(Into::into),- },+ author: actor_to_js(post.author),caption,photos,is_unavailable,@@ -658,9 +663,7 @@ fn message_to_js(message: ente_space::Message) -> MessageResponse {}}-fn message_activity_to_js(- activity: ente_space::MessageActivity,-) -> MessageConversationActivity {+fn message_activity_to_js(activity: ente_space::MessageActivity) -> MessageConversationActivity {let (text, reply_object_key, is_unavailable) = match activity.content {Ok(Some(content)) => (Some(content.text), content.reply_object_key, false),Ok(None) => (None, None, false),@@ -1253,23 +1256,13 @@ impl SpaceAccountCtxHandle {space_id: String,) -> Result<<ConversationsResponse as Tsify>::JsType, Error> {let response = self.inner.list_conversations(&space_id).await?;- let mut friends = Vec::with_capacity(response.friends.len());- for friend in response.friends {- friends.push(SpaceFriendResponse {- friend: account_actor_to_js(&self.inner, friend.friend).await?,- share_key_version: friend.share_key_version,- created_at: friend.created_at,- });- }+ let friends = response.friends.into_iter().map(friend_to_js).collect();- let mut pending_requests = Vec::with_capacity(response.pending_requests.len());- for request in response.pending_requests {- pending_requests.push(SpaceFriendRequestResponse {- request_id: request.request_id,- requester: public_actor_to_js(request.requester),- created_at: request.created_at,- });- }+ let pending_requests = response+ .pending_requests+ .into_iter()+ .map(Into::into)+ .collect();let mut chat_summaries = BTreeMap::new();for (friend_space_id, summary) in response.chat_summaries {@@ -1343,18 +1336,10 @@ impl SpaceAccountCtxHandle {space_id: String,) -> Result<Vec<<SpaceFriendResponse as Tsify>::JsType>, Error> {let friends = self.inner.list_space_friends(&space_id).await?;- let mut items = Vec::with_capacity(friends.len());- for friend in friends {- items.push(- SpaceFriendResponse {- friend: account_actor_to_js(&self.inner, friend.friend).await?,- share_key_version: friend.share_key_version,- created_at: friend.created_at,- }- .into_js()?,- );- }- Ok(items)+ friends+ .into_iter()+ .map(|friend| friend_to_js(friend).into_js().map_err(Into::into))+ .collect()}#[wasm_bindgen(js_name = listFriendRequests)]@@ -1363,18 +1348,14 @@ impl SpaceAccountCtxHandle {space_id: String,) -> Result<Vec<<SpaceFriendRequestResponse as Tsify>::JsType>, Error> {let requests = self.inner.list_friend_requests(&space_id).await?;- let mut items = Vec::with_capacity(requests.len());- for request in requests {- items.push(- SpaceFriendRequestResponse {- request_id: request.request_id,- requester: public_actor_to_js(request.requester),- created_at: request.created_at,- }- .into_js()?,- );- }- Ok(items)+ requests+ .into_iter()+ .map(|request| {+ SpaceFriendRequestResponse::from(request)+ .into_js()+ .map_err(Into::into)+ })+ .collect()}#[wasm_bindgen(js_name = listSentFriendRequests)]@@ -1383,18 +1364,14 @@ impl SpaceAccountCtxHandle {space_id: String,) -> Result<Vec<<SpaceSentFriendRequestResponse as Tsify>::JsType>, Error> {let requests = self.inner.list_sent_friend_requests(&space_id).await?;- let mut items = Vec::with_capacity(requests.len());- for request in requests {- items.push(- SpaceSentFriendRequestResponse {- request_id: request.request_id,- target: public_actor_to_js(request.target),- created_at: request.created_at,- }- .into_js()?,- );- }- Ok(items)+ requests+ .into_iter()+ .map(|request| {+ SpaceSentFriendRequestResponse::from(request)+ .into_js()+ .map_err(Into::into)+ })+ .collect()}#[wasm_bindgen(js_name = confirmFriendRequest)]@@ -1436,18 +1413,3 @@ impl SpaceAccountCtxHandle {.map_err(Into::into)}}--#[cfg(test)]-mod tests {- use super::*;-- #[test]- fn http_errors_are_not_content_errors() {- let error = Error::from(ente_space::Error::Http(ente_core::http::Error::Http {- status: 500,- path: "/space".into(),- }));-- assert!(!error.is_content_error());- }-}diff --git a/rust/crates/space/src/client/friends.rs b/rust/crates/space/src/client/friends.rsindex 787eb6e8db..866537469d 100644--- a/rust/crates/space/src/client/friends.rs+++ b/rust/crates/space/src/client/friends.rs@@ -1,10 +1,12 @@-use super::AccountSpaceCtx;+use super::{AccountSpaceCtx, retain_content_error};use crate::crypto::seal_with_public_key;use crate::error::{Error, Result};+use crate::models::{SpaceActor, SpaceFriend};use crate::transport::{AddFriendPayload, ConfirmFriendRequestPayload, FriendRelationshipResponse,FriendStatusResponse, FriendTargetPayload, RefreshFriendSharesRequest, ShareUpdatePayload,- SpaceFriendRequestResponse, SpaceFriendResponse, SpaceSentFriendRequestResponse,+ SpaceActorResponse, SpaceFriendRequestResponse, SpaceFriendResponse,+ SpaceSentFriendRequestResponse,};use ente_core::b64;use ente_core::http;@@ -195,7 +197,19 @@ impl AccountSpaceCtx {Ok(())}- pub async fn list_space_friends(&self, space_id: &str) -> Result<Vec<SpaceFriendResponse>> {+ pub async fn list_space_friends(&self, space_id: &str) -> Result<Vec<SpaceFriend>> {+ let friends = self.list_space_friends_raw(space_id).await?;+ let mut items = Vec::with_capacity(friends.len());+ for friend in friends {+ items.push(self.open_friend(friend).await?);+ }+ Ok(items)+ }++ pub(super) async fn list_space_friends_raw(+ &self,+ space_id: &str,+ ) -> Result<Vec<SpaceFriendResponse>> {let path = format!("/spaces/{space_id}/friends");Ok(self.api()@@ -207,6 +221,19 @@ impl AccountSpaceCtx {.await?)}+ pub(super) async fn open_friend(&self, friend: SpaceFriendResponse) -> Result<SpaceFriend> {+ Ok(SpaceFriend {+ friend: self.open_friend_actor(friend.friend).await?,+ share_key_version: friend.share_key_version,+ created_at: friend.created_at,+ })+ }++ async fn open_friend_actor(&self, actor: SpaceActorResponse) -> Result<SpaceActor> {+ let profile = retain_content_error(self.decrypt_actor_profile(&actor).await)?;+ Ok(SpaceActor::from_response(actor, profile))+ }+pub async fn get_relationship(&self,space_id: &str,@@ -232,7 +259,7 @@ impl AccountSpaceCtx {.ok_or_else(|| {Error::InvalidInput(format!("space {space_id} is not owned by the account"))})?;- let friends = self.list_space_friends(space_id).await?;+ let friends = self.list_space_friends_raw(space_id).await?;let mut updates = Vec::new();for friend in friends {if friend.share_key_version == access.key_version {diff --git a/rust/crates/space/src/client/messages.rs b/rust/crates/space/src/client/messages.rsindex 1f28376882..24737fb64f 100644--- a/rust/crates/space/src/client/messages.rs+++ b/rust/crates/space/src/client/messages.rs@@ -32,6 +32,10 @@ impl AccountSpaceCtx {.error_for_status()?.json().await?;+ let mut friends = Vec::with_capacity(response.friends.len());+ for friend in response.friends {+ friends.push(self.open_friend(friend).await?);+ }let mut chat_summaries = std::collections::BTreeMap::new();for (friend_space_id, summary) in response.chat_summaries {chat_summaries.insert(@@ -40,7 +44,7 @@ impl AccountSpaceCtx {);}Ok(Conversations {- friends: response.friends,+ friends,pending_requests: response.pending_requests,chat_summaries,latest_post_created_at: response.latest_post_created_at,@@ -469,7 +473,7 @@ impl AccountSpaceCtx {sender_space_id: &str,space_id: &str,) -> Result<SpaceActorResponse> {- let friends = self.list_space_friends(sender_space_id).await?;+ let friends = self.list_space_friends_raw(sender_space_id).await?;friends.into_iter().map(|value| value.friend)diff --git a/rust/crates/space/src/client/mod.rs b/rust/crates/space/src/client/mod.rsindex 4c8e6a745e..0f1799102d 100644--- a/rust/crates/space/src/client/mod.rs+++ b/rust/crates/space/src/client/mod.rs@@ -46,6 +46,7 @@ const MESSAGE_KIND_REGULAR: &str = "regular";const MESSAGE_KIND_POKE: &str = "poke";const MESSAGE_KIND_POST_REPLY: &str = "post_reply";const ONLY_PHOTOS_UPLOAD_MESSAGE: &str = "only photos can be uploaded";+pub const MAX_SPACE_POST_UPLOAD_BYTES: usize = 5 * 1024 * 1024;pub const MAX_SPACE_AVATAR_UPLOAD_BYTES: usize = 2 * 1024 * 1024;pub const MAX_SPACE_COVER_UPLOAD_BYTES: usize = 2 * 1024 * 1024;@@ -61,6 +62,13 @@ pub const MAX_SPACE_MESSAGE_CIPHER_DECODED_BYTES: usize = 6 * 1024;pub const MAX_SPACE_MESSAGE_PAYLOAD_BYTES: usize =MAX_SPACE_MESSAGE_CIPHER_DECODED_BYTES - SECRETBOX_PAYLOAD_OVERHEAD_BYTES;+fn retain_content_error<T>(result: Result<T>) -> Result<Result<T>> {+ match result {+ Err(error) if !error.is_content_error() => Err(error),+ result => Ok(result),+ }+}+#[derive(Debug, Clone, Default)]pub struct PostPhotoAssetOptions {pub width: Option<i32>,diff --git a/rust/crates/space/src/client/posts.rs b/rust/crates/space/src/client/posts.rsindex d8974f7ff9..64571aacc9 100644--- a/rust/crates/space/src/client/posts.rs+++ b/rust/crates/space/src/client/posts.rs@@ -1,4 +1,7 @@-use super::{AccountSpaceCtx, decrypt_post_object_metadata, ensure_post_objects_are_photos};+use super::{+ AccountSpaceCtx, decrypt_post_object_metadata, ensure_post_objects_are_photos,+ retain_content_error,+};use crate::crypto::{decrypt_secretbox_payload, encrypt_secretbox_payload, generate_key};use crate::error::{Error, Result};use crate::models::{@@ -421,13 +424,6 @@ fn utf8_field(bytes: Vec<u8>, field: &str) -> Result<String> {.map_err(|error| Error::InvalidInput(format!("invalid {field} utf8: {error}")))}-fn retain_content_error<T>(result: Result<T>) -> Result<Result<T>> {- match result {- Err(error) if !error.is_content_error() => Err(error),- result => Ok(result),- }-}-pub(super) fn open_post_content(post: &mut PostResponse,decrypted: Result<DecryptedPost>,@@ -472,14 +468,7 @@ pub(super) fn opened_post(post_id: post.post_id,space_id: post.space_id,space_slug: post.space_slug,- author: SpaceActor {- space_id: post.author.space_id,- space_slug: post.author.space_slug,- public_key: post.author.public_key,- key_version: post.author.key_version,- profile,- avatar: post.author.avatar,- },+ author: SpaceActor::from_response(post.author, profile),content,created_at: post.created_at,viewer_liked: post.viewer_liked,diff --git a/rust/crates/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rsindex d556ff7da2..0b2f287a01 100644--- a/rust/crates/space/src/client/tests.rs+++ b/rust/crates/space/src/client/tests.rs@@ -4,7 +4,7 @@ use crate::crypto::{encrypt_asset_payload, seal_with_public_key};use crate::transport::{ConversationChatSummaryResponse, EntityKeyPayload, MessageConversationActivity,MessagePageResponse, MessageResponse, ProfileAvatarPayload, ProfileCoverPayload,- SpaceActorResponse,+ SpaceActorResponse, SpaceFriendResponse,};use mockito::{Matcher, Server};@@ -371,7 +371,6 @@ async fn account_space_key_resolution_is_cached_within_context() {encrypted_profile,..Default::default()};-let first = ctx.decrypt_actor_profile(&actor).await@@ -383,6 +382,40 @@ async fn account_space_key_resolution_is_cached_within_context() {assert_eq!(first.unwrap().full_name.as_deref(), Some("Friend"));assert_eq!(second.unwrap().full_name.as_deref(), Some("Friend"));+ let opened = ctx+ .open_friend(SpaceFriendResponse {+ friend: actor.clone(),+ share_key_version: 1,+ created_at: "2026-04-16T00:00:00Z".into(),+ })+ .await+ .unwrap();+ assert_eq!(+ opened+ .friend+ .profile+ .as_ref()+ .unwrap()+ .as_ref()+ .unwrap()+ .full_name+ .as_deref(),+ Some("Friend")+ );+ let mut corrupt_actor = actor;+ corrupt_actor.encrypted_profile = "not-base64".into();+ let opened = ctx+ .open_friend(SpaceFriendResponse {+ friend: corrupt_actor,+ share_key_version: 1,+ created_at: "2026-04-16T00:00:00Z".into(),+ })+ .await+ .unwrap();+ assert!(matches!(+ &opened.friend.profile,+ Err(Error::Base64Decode(_))+ ));spaces.assert_async().await;shares.assert_async().await;}@@ -1922,8 +1955,7 @@ async fn list_space_friends_uses_space_friends_endpoint() {"spaceId": "space_friend","spaceSlug": "friend","publicKey": "friend-public-key",- "keyVersion": 2,- "encryptedProfile": "profile-cipher"+ "keyVersion": 2},"shareKeyVersion": 2,"createdAt": "2026-04-16T00:00:00Z"@@ -1940,6 +1972,7 @@ async fn list_space_friends_uses_space_friends_endpoint() {assert_eq!(response.len(), 1);assert_eq!(response[0].friend.space_id, "space_friend");+ assert!(response[0].friend.profile.as_ref().unwrap().is_none());assert_eq!(response[0].share_key_version, 2);friends.assert_async().await;}diff --git a/rust/crates/space/src/lib.rs b/rust/crates/space/src/lib.rsindex 3b2918f2c6..fcb10d4c7b 100644--- a/rust/crates/space/src/lib.rs+++ b/rust/crates/space/src/lib.rs@@ -16,7 +16,7 @@ pub use models::{ConversationChatSummary, Conversations, CreatedSpace, CreatedSpaceLink, DecryptedFriendShare,DecryptedSpaceProfile, HydratedKeys, Message, MessageActivity, MessageContent, MessagePage,MessagePayload, OpenAccountSpaceCtxInput, OpenSpaceLinkCtxInput, Post, PostAsset, PostContent,- PostObjectMetadata, PostPage, PostPhoto, SpaceActor, SpaceProfile,+ PostObjectMetadata, PostPage, PostPhoto, SpaceActor, SpaceFriend, SpaceProfile,};pub use transport::{ConversationChatSummaryResponse, ConversationsResponse, EntityKeyPayload,diff --git a/rust/crates/space/src/models.rs b/rust/crates/space/src/models.rsindex b8f52e9d82..d72200d6a2 100644--- a/rust/crates/space/src/models.rs+++ b/rust/crates/space/src/models.rs@@ -5,7 +5,7 @@ use zeroize::ZeroizeOnDrop;use crate::Result;use crate::transport::{- ProfileAvatarResponse, ProfileCoverResponse, SpaceFriendRequestResponse, SpaceFriendResponse,+ ProfileAvatarResponse, ProfileCoverResponse, SpaceActorResponse, SpaceFriendRequestResponse,SpaceKeyResponse,};@@ -78,6 +78,28 @@ pub struct SpaceActor {pub avatar: Option<ProfileAvatarResponse>,}+impl SpaceActor {+ pub(crate) fn from_response(+ actor: SpaceActorResponse,+ profile: Result<Option<SpaceProfile>>,+ ) -> Self {+ Self {+ space_id: actor.space_id,+ space_slug: actor.space_slug,+ public_key: actor.public_key,+ key_version: actor.key_version,+ profile,+ avatar: actor.avatar,+ }+ }+}++pub struct SpaceFriend {+ pub friend: SpaceActor,+ pub share_key_version: i32,+ pub created_at: String,+}+pub struct PostContent {pub caption: Option<String>,pub photos: Vec<PostPhoto>,@@ -177,7 +199,7 @@ pub struct ConversationChatSummary {}pub struct Conversations {- pub friends: Vec<SpaceFriendResponse>,+ pub friends: Vec<SpaceFriend>,pub pending_requests: Vec<SpaceFriendRequestResponse>,pub chat_summaries: BTreeMap<String, ConversationChatSummary>,pub latest_post_created_at: Option<String>,