Page MenuHomePhabricator
Files F3403266

D10302.id35622.diff
No OneTemporary
Actions

D10302.id35622.diff
View Options

diff --git a/services/identity/src/database.rs b/services/identity/src/database.rs
--- a/services/identity/src/database.rs
+++ b/services/identity/src/database.rs
@@ -545,6 +545,18 @@
notif_prekey: String,
notif_prekey_signature: String,
) -> Result<(), Error> {
+ // update new device list too
+ self
+ .update_device_prekeys(
+ user_id.clone(),
+ device_id.clone(),
+ content_prekey.clone(),
+ content_prekey_signature.clone(),
+ notif_prekey.clone(),
+ notif_prekey_signature.clone(),
+ )
+ .await?;
+
let notif_prekey_av = AttributeValue::S(notif_prekey);
let notif_prekey_signature_av = AttributeValue::S(notif_prekey_signature);
let content_prekey_av = AttributeValue::S(content_prekey);
diff --git a/services/identity/src/database/device_list.rs b/services/identity/src/database/device_list.rs
--- a/services/identity/src/database/device_list.rs
+++ b/services/identity/src/database/device_list.rs
@@ -441,6 +441,52 @@
.map_err(Error::from)
}
+ pub async fn update_device_prekeys(
+ &self,
+ user_id: impl Into<String>,
+ device_id: impl Into<String>,
+ content_prekey: String,
+ content_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ ) -> Result<(), Error> {
+ let content_prekey = PreKey {
+ pre_key: content_prekey,
+ pre_key_signature: content_prekey_signature,
+ };
+ let notif_prekey = PreKey {
+ pre_key: notif_prekey,
+ pre_key_signature: notif_prekey_signature,
+ };
+
+ self
+ .client
+ .update_item()
+ .table_name(devices_table::NAME)
+ .key(ATTR_USER_ID, AttributeValue::S(user_id.into()))
+ .key(ATTR_ITEM_ID, DeviceIDAttribute(device_id.into()).into())
+ .condition_expression(
+ "attribute_exists(#user_id) AND attribute_exists(#item_id)",
+ )
+ .update_expression(
+ "SET #content_prekey = :content_prekey, #notif_prekey = :notif_prekey",
+ )
+ .expression_attribute_names("#user_id", ATTR_USER_ID)
+ .expression_attribute_names("#item_id", ATTR_ITEM_ID)
+ .expression_attribute_names("#content_prekey", ATTR_CONTENT_PREKEY)
+ .expression_attribute_names("#notif_prekey", ATTR_NOTIF_PREKEY)
+ .expression_attribute_values(":content_prekey", content_prekey.into())
+ .expression_attribute_values(":notif_prekey", notif_prekey.into())
+ .send()
+ .await
+ .map_err(|e| {
+ error!("Failed to update device prekeys: {:?}", e);
+ Error::AwsSdk(e.into())
+ })?;
+
+ Ok(())
+ }
+
/// Checks if given device exists on user's current device list
pub async fn device_exists(
&self,

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 4, 2:42 AM (5 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2613052
Default Alt Text
D10302.id35622.diff (2 KB)

Event Timeline