From 4bc25ffb15d1e559417550a64ca8995ce894f8a8 Mon Sep 17 00:00:00 2001 From: d42 Date: Thu, 31 Dec 2020 16:09:42 +0100 Subject: find sso flow in all of the flows --- src/LoginPage.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/LoginPage.cpp') diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 05741cca..fc918359 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -315,10 +315,14 @@ LoginPage::checkHomeserverVersion() if (err || flows.flows.empty()) emit versionOkCb(LoginMethod::Password); - if (flows.flows[0].type == mtx::user_interactive::auth_types::sso) - emit versionOkCb(LoginMethod::SSO); - else - emit versionOkCb(LoginMethod::Password); + LoginMethod login_method = LoginMethod::Password; + for(const auto &flow : flows.flows) { + if (flow.type == mtx::user_interactive::auth_types::sso) { + login_method = LoginMethod::SSO; + break; + } + } + emit versionOk(login_method); }); }); } -- cgit 1.5.1 From b732ea432b8e759b06e221b6d15f1e8a8b1723a9 Mon Sep 17 00:00:00 2001 From: d42 Date: Thu, 31 Dec 2020 17:57:09 +0100 Subject: rename login_method -> loginMethod to fit the Nheko coding style --- src/LoginPage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/LoginPage.cpp') diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index fc918359..62498738 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -315,14 +315,14 @@ LoginPage::checkHomeserverVersion() if (err || flows.flows.empty()) emit versionOkCb(LoginMethod::Password); - LoginMethod login_method = LoginMethod::Password; + LoginMethod loginMethod = LoginMethod::Password; for(const auto &flow : flows.flows) { if (flow.type == mtx::user_interactive::auth_types::sso) { - login_method = LoginMethod::SSO; + loginMethod = LoginMethod::SSO; break; } } - emit versionOk(login_method); + emit versionOk(loginMethod); }); }); } -- cgit 1.5.1 From a13502b881528a13da644f1441ce7eaa99764938 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Fri, 1 Jan 2021 04:14:34 +0100 Subject: lint --- src/LoginPage.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/LoginPage.cpp') diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 62498738..39d0f9d6 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -316,11 +316,11 @@ LoginPage::checkHomeserverVersion() emit versionOkCb(LoginMethod::Password); LoginMethod loginMethod = LoginMethod::Password; - for(const auto &flow : flows.flows) { - if (flow.type == mtx::user_interactive::auth_types::sso) { - loginMethod = LoginMethod::SSO; - break; - } + for (const auto &flow : flows.flows) { + if (flow.type == mtx::user_interactive::auth_types::sso) { + loginMethod = LoginMethod::SSO; + break; + } } emit versionOk(loginMethod); }); -- cgit 1.5.1 From 0c0c69074df71187ec857dbad119fbdefa655501 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 Jan 2021 11:01:41 +0100 Subject: Fix shadowing in LoginPage.cpp --- src/LoginPage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/LoginPage.cpp') diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 39d0f9d6..dba5ba51 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -315,14 +315,14 @@ LoginPage::checkHomeserverVersion() if (err || flows.flows.empty()) emit versionOkCb(LoginMethod::Password); - LoginMethod loginMethod = LoginMethod::Password; + LoginMethod loginMethod_ = LoginMethod::Password; for (const auto &flow : flows.flows) { if (flow.type == mtx::user_interactive::auth_types::sso) { - loginMethod = LoginMethod::SSO; + loginMethod_ = LoginMethod::SSO; break; } } - emit versionOk(loginMethod); + emit versionOk(loginMethod_); }); }); } -- cgit 1.5.1