Page MenuHomePhorge
Files F32555860

D14501.1767209139.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D14501.1767209139.diff
View Options

diff --git a/services/identity/src/client_service.rs b/services/identity/src/client_service.rs
--- a/services/identity/src/client_service.rs
+++ b/services/identity/src/client_service.rs
@@ -1352,20 +1352,26 @@
maybe_keyserver_device_id.as_ref(),
)?;
+ let excluded_device_ids =
+ maybe_keyserver_device_id.iter().collect::<Vec<_>>();
+
debug!(user_id, "Attempting to revoke user's old access tokens");
- self.client.delete_all_tokens_for_user(&user_id).await?;
- // We must delete the one-time keys first because doing so requires device
- // IDs from the devices table
- debug!(user_id, "Attempting to delete user's old one-time keys");
self
.client
- .delete_otks_table_rows_for_user(&user_id)
+ .delete_tokens_for_user_excluding(&user_id, &excluded_device_ids)
.await?;
debug!(user_id, "Attempting to delete user's old devices");
- let old_device_ids =
- self.client.delete_devices_data_for_user(&user_id).await?;
+ let removed_device_ids = self
+ .client
+ .delete_user_devices_data_excluding(&user_id, &excluded_device_ids)
+ .await?;
+ debug!(user_id, "Attempting to delete user's old one-time keys");
+ self
+ .client
+ .delete_otks_table_rows_for_user_devices(&user_id, &removed_device_ids)
+ .await?;
- spawn_force_close_tb_session_task(old_device_ids);
+ spawn_force_close_tb_session_task(removed_device_ids);
// Reset device list (perform update)
let login_time = chrono::Utc::now();
diff --git a/services/identity/src/grpc_services/authenticated.rs b/services/identity/src/grpc_services/authenticated.rs
--- a/services/identity/src/grpc_services/authenticated.rs
+++ b/services/identity/src/grpc_services/authenticated.rs
@@ -588,25 +588,27 @@
)
.await?;
- debug!(user_id, "Attempting to delete user's access tokens");
- self.db_client.delete_all_tokens_for_user(&user_id).await?;
+ let excluded_device_ids =
+ maybe_keyserver_device_id.iter().collect::<Vec<_>>();
- // We must delete the one-time keys first because doing so requires device
- // IDs from the devices table
- debug!(user_id, "Attempting to delete user's one-time keys");
+ debug!(user_id, "Attempting to delete user's access tokens");
self
.db_client
- .delete_otks_table_rows_for_user(&user_id)
+ .delete_tokens_for_user_excluding(&user_id, &excluded_device_ids)
.await?;
-
debug!(user_id, "Attempting to delete user's devices");
- let device_ids = self
+ let removed_device_ids = self
+ .db_client
+ .delete_user_devices_data_excluding(&user_id, &excluded_device_ids)
+ .await?;
+ debug!(user_id, "Attempting to delete user's one-time keys");
+ self
.db_client
- .delete_devices_data_for_user(&user_id)
+ .delete_otks_table_rows_for_user_devices(&user_id, &removed_device_ids)
.await?;
let blob_client = self.authenticated_blob_client().await?;
- spawn_delete_devices_services_data_task(&blob_client, device_ids);
+ spawn_delete_devices_services_data_task(&blob_client, removed_device_ids);
let response = Empty {};
Ok(Response::new(response))

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 7:25 PM (21 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5874325
Default Alt Text
D14501.1767209139.diff (3 KB)

Event Timeline