Page MenuHomePhabricator
Files F3516298

D8402.id28449.diff
No OneTemporary
Actions

D8402.id28449.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
@@ -15,7 +15,9 @@
use serde::{Deserialize, Serialize};
use tracing::{debug, error, info, warn};
-use crate::client_service::{FlattenedDeviceKeyUpload, UserRegistrationInfo};
+use crate::client_service::{
+ handle_db_error, FlattenedDeviceKeyUpload, UserRegistrationInfo,
+};
use crate::config::CONFIG;
use crate::constants::{
ACCESS_TOKEN_SORT_KEY, ACCESS_TOKEN_TABLE,
@@ -523,7 +525,21 @@
);
}
let first_item = items[0].clone();
- Ok(Some(first_item))
+ let user_id = first_item
+ .get(USERS_TABLE_PARTITION_KEY)
+ .ok_or(DBItemError {
+ attribute_name: USERS_TABLE_PARTITION_KEY,
+ attribute_value: None,
+ attribute_error: DBItemAttributeError::Missing,
+ })?
+ .as_s()
+ .map_err(|_| DBItemError {
+ attribute_name: USERS_TABLE_PARTITION_KEY,
+ attribute_value: first_item.get(USERS_TABLE_PARTITION_KEY).cloned(),
+ attribute_error: DBItemAttributeError::IncorrectType,
+ })?;
+ let result = self.get_item_from_users_table(user_id).await?;
+ Ok(result.item)
}
Ok(_) => {
info!(

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 1:32 PM (19 h, 14 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2694793
Default Alt Text
D8402.id28449.diff (1 KB)

Event Timeline