Page MenuHomePhabricator
Differential D13854

[keyserver] return threadInfo in fetchAllCommunityInfosWithNames
ClosedPublic
Actions

Authored by varun on Oct 31 2024, 10:48 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 8:37 PM
Unknown Object (File)
Sat, Mar 15, 6:50 AM
Unknown Object (File)
Tue, Mar 11, 6:05 AM
Unknown Object (File)
Mon, Mar 10, 8:53 AM
Unknown Object (File)
Sat, Mar 8, 7:14 PM
Unknown Object (File)
Fri, Mar 7, 4:50 PM
Unknown Object (File)
Mon, Mar 3, 6:19 AM
Unknown Object (File)
Wed, Feb 26, 1:48 PM
View All 65 Files
Subscribers
tomek

Details

Reviewers
ashoat
Commits
rCOMM183ac09a25b3: [keyserver] return threadInfo in fetchAllCommunityInfosWithNames
Summary

Depends on D13853

we return threadInfos here so that we can populate the community directory on clients using the ThreadList component

Test Plan

tested in next diff by calling fetchAllCommunityInfosWithNames and getting a working modal with the ThreadList correctly populated

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

varun created this revision.Oct 31 2024, 10:48 PM
Herald added a subscriber: tomek. · View Herald TranscriptOct 31 2024, 10:48 PM
varun added a child revision: D13493: [native] scaffolding for CommunityJoinerModal.Oct 31 2024, 10:49 PM
varun published this revision for review.Oct 31 2024, 11:11 PM
varun planned changes to this revision.
Harbormaster completed remote builds in B32506: Diff 45570.Oct 31 2024, 11:12 PM
ashoat requested changes to this revision.Nov 1 2024, 8:37 AM
ashoat added inline comments.
lib/types/community-types.js
50 ↗(On Diff #45570)

Should this be narrowed? It doesn't appear possible for the server to return undefined

58 ↗(On Diff #45570)

I might be missing something, but this validator appears to only be used on the client. Why are you using mixedRawThreadInfoValidator?

varun updated this revision to Diff 45892.Nov 19 2024, 9:24 PM

address feedback

varun added inline comments.Nov 19 2024, 9:27 PM
keyserver/src/fetchers/community-fetchers.js
103 ↗(On Diff #45892)

I had to add an explicit type here because flow was confused by result being any-typed

Harbormaster completed remote builds in B32720: Diff 45892.Nov 20 2024, 3:30 AM
ashoat accepted this revision.Nov 20 2024, 4:15 AM
This revision is now accepted and ready to land.Nov 20 2024, 4:15 AM
Closed by commit rCOMM183ac09a25b3: [keyserver] return threadInfo in fetchAllCommunityInfosWithNames (authored by varun). · Explain WhyNov 20 2024, 5:20 AM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMM183ac09a25b3: [keyserver] return threadInfo in fetchAllCommunityInfosWithNames.

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
26 lines
responders/
7 lines
scripts/
3 lines
lib/
actions/
4 lines
types/
25 lines
4 lines
validators/
8 lines

Diff 45897

View Options

keyserver/src/fetchers/community-fetchers.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

keyserver/src/responders/community-responders.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

keyserver/src/scripts/delete-all-fc-channel-tags.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

lib/actions/community-actions.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

lib/types/community-types.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

lib/types/redux-types.js

Loading...
View Options

lib/types/validators/community-validators.js

Loading...