Merge pull request #364 from d42/d42/find-sso-flow

Try to find SSO flow in all of the server flows
This commit is contained in:
DeepBlueV7.X 2021-01-01 04:13:49 +01:00 committed by GitHub
commit aab7447d02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -315,10 +315,14 @@ LoginPage::checkHomeserverVersion()
if (err || flows.flows.empty()) if (err || flows.flows.empty())
emit versionOkCb(LoginMethod::Password); emit versionOkCb(LoginMethod::Password);
if (flows.flows[0].type == mtx::user_interactive::auth_types::sso) LoginMethod loginMethod = LoginMethod::Password;
emit versionOkCb(LoginMethod::SSO); for(const auto &flow : flows.flows) {
else if (flow.type == mtx::user_interactive::auth_types::sso) {
emit versionOkCb(LoginMethod::Password); loginMethod = LoginMethod::SSO;
break;
}
}
emit versionOk(loginMethod);
}); });
}); });
} }