Differential D22112 Diff 60710 src/ruqolacore/ddpapi/ddpclient.cpp

Changeset View

Standalone View

src/ruqolacore/ddpapi/ddpclient.cpp

Context not available.
886		886
887	void DDPClient::login()	887		void DDPClient::login()
888	{	888		{
889	if (!mRocketChatAccount->settings()->password().isEmpty()) {	889		if (!mRocketChatAccount->settings()->authToken().isEmpty() && !m_attemptedTokenLogin) {
		890		m_attemptedPasswordLogin = true;
		891		QJsonObject json;
		892		json[QStringLiteral("resume")] = mRocketChatAccount->settings()->authToken();
		893		m_loginJob = method(QStringLiteral("login"), QJsonDocument(json));
		894		} if (!mRocketChatAccount->settings()->password().isEmpty()) {
			mlaurentUnsubmitted Done else if (...) no ? mlaurent: else if (...) no ?
890	// If we have a password and we couldn't log in, let's stop here	895		// If we have a password and we couldn't log in, let's stop here
891	if (m_attemptedPasswordLogin) {	896		if (m_attemptedPasswordLogin) {
892	setLoginStatus(LoginFailed);	897		setLoginStatus(LoginFailed);
Context not available.
901	qCWarning(RUQOLA_DDPAPI_LOG) <<"No plugins loaded. Please verify your installation.";	906		qCWarning(RUQOLA_DDPAPI_LOG) <<"No plugins loaded. Please verify your installation.";
902	setLoginStatus(FailedToLoginPluginProblem);	907		setLoginStatus(FailedToLoginPluginProblem);
903	}	908		}
904	} else if (!mRocketChatAccount->settings()->authToken().isEmpty() && !m_attemptedTokenLogin) {
905	m_attemptedPasswordLogin = true;
906	QJsonObject json;
907	json[QStringLiteral("resume")] = mRocketChatAccount->settings()->authToken();
908	m_loginJob = method(QStringLiteral("login"), QJsonDocument(json));
909	} else {	909		} else {
910	setLoginStatus(LoginFailed);	910		setLoginStatus(LoginFailed);
911	}	911		}
Context not available.