projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Authenticator code cleanup as per review
[quassel.git]
/
src
/
client
/
clientauthhandler.cpp
diff --git
a/src/client/clientauthhandler.cpp
b/src/client/clientauthhandler.cpp
index
c8ed735
..
4a99890
100644
(file)
--- a/
src/client/clientauthhandler.cpp
+++ b/
src/client/clientauthhandler.cpp
@@
-303,6
+303,7
@@
void ClientAuthHandler::handle(const ClientRegistered &msg)
{
_coreConfigured = msg.coreConfigured;
_backendInfo = msg.backendInfo;
{
_coreConfigured = msg.coreConfigured;
_backendInfo = msg.backendInfo;
+ _authenticatorInfo = msg.authenticatorInfo;
Client::setCoreFeatures(static_cast<Quassel::Features>(msg.coreFeatures));
Client::setCoreFeatures(static_cast<Quassel::Features>(msg.coreFeatures));
@@
-321,7
+322,7
@@
void ClientAuthHandler::onConnectionReady()
if (!_coreConfigured) {
// start wizard
if (!_coreConfigured) {
// start wizard
- emit startCoreSetup(_backendInfo);
+ emit startCoreSetup(_backendInfo
, _authenticatorInfo
);
}
else // TODO: check if we need LoginEnabled
login();
}
else // TODO: check if we need LoginEnabled
login();
@@
-487,7
+488,7
@@
void ClientAuthHandler::onSslErrors()
default:
qWarning() << "Certificate digest version" << QString(knownDigestVersion) << "is not supported";
}
default:
qWarning() << "Certificate digest version" << QString(knownDigestVersion) << "is not supported";
}
-
+
if (knownDigest != calculatedDigest) {
bool accepted = false;
bool permanently = false;
if (knownDigest != calculatedDigest) {
bool accepted = false;
bool permanently = false;