Differential D22111 Diff 60709 src/ruqolacore/ddpapi/ddpclient.cpp

Changeset View

Standalone View

View Options

src/ruqolacore/ddpapi/ddpclient.cpp

Context not available.
670 670​
671quint64 DDPClient::login(const QString &username, const QString &password) 671​quint64 DDPClient::login(const QString &username, const QString &password)
672{ 672​{
673 const RocketChatMessage::RocketChatMessageResult result = mRocketChatMessage->login(username, password, m_uid); 673​ const RocketChatMessage::RocketChatMessageResult result = mRocketChatMessage->login(username, password, mRocketChatAccount->settings()->code(), m_uid);
674 return method(result, login_result, DDPClient::Ephemeral); 674​ return method(result, login_result, DDPClient::Ephemeral);
675} 675​}
676 676​
Context not available.
827 Q_EMIT result(id, QJsonDocument(root.value(QLatin1String("result")).toObject())); 827​ Q_EMIT result(id, QJsonDocument(root.value(QLatin1String("result")).toObject()));
828 828​
829 if (id == m_loginJob) { 829​ if (id == m_loginJob) {
830 if (root.value(QLatin1String("error")).toObject().value(QLatin1String("error")).toInt() == 403) { 830​ QJsonObject error(root.value(QLatin1String("error")).toObject());
mlaurentUnsubmitted
Done

const

mlaurent: const
831​ QJsonValue errorValue(error.value(QLatin1String("error")));
mlaurentUnsubmitted
Done

const

mlaurent: const
832​ if (errorValue.toInt() == 403) {
831 qCDebug(RUQOLA_DDPAPI_LOG) << "Wrong password or token expired"; 833​ qCDebug(RUQOLA_DDPAPI_LOG) << "Wrong password or token expired";
832 834​
833 login(); // Let's keep trying to log in 835​ login(); // Let's keep trying to log in
836​ } else if (errorValue.toString() == QLatin1String("totp-required")) {
837​ qCDebug(RUQOLA_DDPAPI_LOG) << "A 2FA code is required to login";
838​ setLoginStatus(LoginFailed);
839​ } else if (!error.isEmpty()) {
840​ qCDebug(RUQOLA_DDPAPI_LOG) << error.value(QLatin1String("message")).toString();
mlaurentUnsubmitted
Done

We don't failed when we have an error ?

mlaurent: We don't failed when we have an error ?
cdywanAuthorUnsubmitted
Not Done

Nice catch! We definitely should fail here!

cdywan: Nice catch! We definitely should fail here!
834 } else { 841​ } else {
835 const QString token = root.value(QLatin1String("result")).toObject().value(QLatin1String("token")).toString(); 842​ const QString token = root.value(QLatin1String("result")).toObject().value(QLatin1String("token")).toString();
836 mRocketChatAccount->settings()->setAuthToken(token); 843​ mRocketChatAccount->settings()->setAuthToken(token);
Context not available.