From 69a98a8465f910d58911456dfe840a7b829ccc65 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 13 Sep 2023 18:50:42 +0300 Subject: SL-20278 Disconnect saving MFA from saving password --- indra/newview/llfloaterforgetuser.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterforgetuser.cpp') diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp index 97b022699f..05e0b07584 100644 --- a/indra/newview/llfloaterforgetuser.cpp +++ b/indra/newview/llfloaterforgetuser.cpp @@ -229,6 +229,7 @@ void LLFloaterForgetUser::forgetUser(const std::string &userid, const std::strin { // Remove creds gSecAPIHandler->removeFromCredentialMap("login_list", grid, userid); + gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, userid); LLPointer cred = gSecAPIHandler->loadCredential(grid); if (cred.notNull() && cred->userID() == userid) -- cgit v1.2.3 From 1057880d2fc70fafce4053415a879372a8719b1e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 18 Sep 2023 21:17:53 +0300 Subject: SL-20308 Clearing user's data should clear mfa --- indra/newview/llfloaterforgetuser.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterforgetuser.cpp') diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp index 05e0b07584..7f168df0c5 100644 --- a/indra/newview/llfloaterforgetuser.cpp +++ b/indra/newview/llfloaterforgetuser.cpp @@ -228,8 +228,13 @@ void LLFloaterForgetUser::processForgetUser() void LLFloaterForgetUser::forgetUser(const std::string &userid, const std::string &fav_id, const std::string &grid, bool delete_data) { // Remove creds - gSecAPIHandler->removeFromCredentialMap("login_list", grid, userid); - gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, userid); + std::string grid_id = LLGridManager::getInstance()->getGridId(grid); + if (grid_id.empty()) + { + grid_id = grid; + } + gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid_id, userid); // doesn't write + gSecAPIHandler->removeFromCredentialMap("login_list", grid, userid); // write operation LLPointer cred = gSecAPIHandler->loadCredential(grid); if (cred.notNull() && cred->userID() == userid) -- cgit v1.2.3 From b88f0e40a584e3a0d9ff3fe11b1eda41fb89a29a Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 20 Sep 2023 21:14:30 +0300 Subject: SL-20308 Clearing user's data should clear mfa #2 --- indra/newview/llfloaterforgetuser.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llfloaterforgetuser.cpp') diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp index 7f168df0c5..f576ce7a76 100644 --- a/indra/newview/llfloaterforgetuser.cpp +++ b/indra/newview/llfloaterforgetuser.cpp @@ -164,6 +164,12 @@ bool LLFloaterForgetUser::onConfirmLogout(const LLSD& notification, const LLSD& if (option == 0) { // Remove creds + std::string grid_id = LLGridManager::getInstance()->getGridId(grid); + if (grid_id.empty()) + { + grid_id = grid; + } + gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid_id, LLStartUp::getUserId()); // doesn't write gSecAPIHandler->removeFromCredentialMap("login_list", grid, LLStartUp::getUserId()); LLPointer cred = gSecAPIHandler->loadCredential(grid); -- cgit v1.2.3