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

Changeset View

Standalone View

src/ruqolacore/ddpapi/ddpclient.cpp

Context not available.
665		665
666	quint64 DDPClient::login(const QString &username, const QString &password)	666		quint64 DDPClient::login(const QString &username, const QString &password)
667	{	667		{
668	const RocketChatMessage::RocketChatMessageResult result = mRocketChatMessage->login(username, password, m_uid);	668		const RocketChatMessage::RocketChatMessageResult result = mRocketChatMessage->login(username, password, mRocketChatAccount->settings()->twoFactorAuthenticationCode(), m_uid);
669	return method(result, login_result, DDPClient::Ephemeral);	669		return method(result, login_result, DDPClient::Ephemeral);
670	}	670		}
671		671
Context not available.
822	Q_EMIT result(id, QJsonDocument(root.value(QLatin1String("result")).toObject()));	822		Q_EMIT result(id, QJsonDocument(root.value(QLatin1String("result")).toObject()));
823		823
824	if (id == m_loginJob) {	824		if (id == m_loginJob) {
825	if (root.value(QLatin1String("error")).toObject().value(QLatin1String("error")).toInt() == 403) {	825		const QJsonObject error(root.value(QLatin1String("error")).toObject());
		826		const QJsonValue errorValue(error.value(QLatin1String("error")));
		827		if (errorValue.toInt() == 403) {
826	qCDebug(RUQOLA_DDPAPI_LOG) << "Wrong password or token expired";	828		qCDebug(RUQOLA_DDPAPI_LOG) << "Wrong password or token expired";
827		829
828	login(); // Let's keep trying to log in	830		login(); // Let's keep trying to log in
		831		} else if (errorValue.toString() == QLatin1String("totp-required") \|\| errorValue.toString() == QLatin1String("totp-invalid")) {
		832		qCDebug(RUQOLA_DDPAPI_LOG) << "A 2FA code or backup code is required to login";
		833		setLoginStatus(LoginCodeRequired);
		834		} else if (!error.isEmpty()) {
		835		qCDebug(RUQOLA_DDPAPI_LOG) << error.value(QLatin1String("message")).toString();
		836		setLoginStatus(LoginFailed);
829	} else {	837		} else {
830	const QString token = root.value(QLatin1String("result")).toObject().value(QLatin1String("token")).toString();	838		const QString token = root.value(QLatin1String("result")).toObject().value(QLatin1String("token")).toString();
			mlaurentUnsubmitted Done const mlaurent: const
831	mRocketChatAccount->settings()->setAuthToken(token);	839		mRocketChatAccount->settings()->setAuthToken(token);
Context not available.
			mlaurentUnsubmitted Done const mlaurent: const
			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!