From ebb38cd33043004bf3a7d4c453e5e904406d8994 Mon Sep 17 00:00:00 2001
From: Devon Hudson <devonhudson@librem.one>
Date: Sat, 16 Jan 2021 14:48:24 -0700
Subject: [PATCH] improvement: respect logout_devices param on password change
Move logout devices comment next to relevant loop
remove unnecessary log
---
src/client_server/account.rs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index f48543e2b..3d6498f3c 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -572,16 +572,16 @@ pub async fn change_password_route(
db.users.set_password(&sender_user, &body.new_password)?;
- // TODO: Read logout_devices field when it's available and respect that, currently not supported in Ruma
- // See: https://github.com/ruma/ruma/issues/107
- // Logout all devices except the current one
- for id in db
- .users
- .all_device_ids(&sender_user)
- .filter_map(|id| id.ok())
- .filter(|id| id != sender_device)
- {
- db.users.remove_device(&sender_user, &id)?;
+ if body.logout_devices {
+ // Logout all devices except the current one
+ for id in db
+ .users
+ .all_device_ids(&sender_user)
+ .filter_map(|id| id.ok())
+ .filter(|id| id != sender_device)
+ {
+ db.users.remove_device(&sender_user, &id)?;
+ }
}
db.flush().await?;
--
GitLab