From c82a90f05477aa9fb68aa1fbe81535e79b6babce Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Mon, 5 Jul 2021 19:42:35 -0700 Subject: [PATCH] :bug: switched conditional oops --- src/user_filter.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/user_filter.cpp b/src/user_filter.cpp index caf22ad..66326b8 100644 --- a/src/user_filter.cpp +++ b/src/user_filter.cpp @@ -31,6 +31,18 @@ void UserFilter::doFilter(const HttpRequestPtr &re base64_result[middle] = '\0'; const std::string &username(results_view.substr(0, middle).data()); if constexpr (require_admin) + { + if (bank.AdminVerifyAccount(username)) + { + base64_result[new_sz] = '\0'; + if (bank.VerifyPassword(std::move(username), results_view.substr(middle + 1))) + { + fccb(); + return; + } + } + } + else { base64_result[new_sz] = '\0'; if (bank.VerifyPassword(username, results_view.substr(middle + 1))) @@ -43,19 +55,6 @@ void UserFilter::doFilter(const HttpRequestPtr &re return; } } - else - { - - if (bank.AdminVerifyAccount(username)) - { - base64_result[new_sz] = '\0'; - if (bank.VerifyPassword(std::move(username), results_view.substr(middle + 1))) - { - fccb(); - return; - } - } - } } } }