From f130e39cbc66efac0d48dee34e894ab0b1abd6ae Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Thu, 31 Oct 2024 16:28:32 +0100 Subject: [PATCH] Rename vars: _am => _networkAccessManager, a => newAccountData. Signed-off-by: Camila Ayres --- src/gui/accountmanager.cpp | 14 ++--- src/gui/accountmanager.h | 4 +- src/libsync/account.cpp | 107 +++++++++++++++++++------------------ src/libsync/account.h | 2 +- 4 files changed, 65 insertions(+), 62 deletions(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 67927066a..d03614979 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -123,7 +123,7 @@ AccountManager::AccountsRestoreResult AccountManager::restore(const bool alsoRes if (const auto acc = loadAccountHelper(*settings)) { acc->_id = accountId; const auto accState = new AccountState(acc); - const auto jar = qobject_cast(acc->_am->cookieJar()); + const auto jar = qobject_cast(acc->_networkAccessManager->cookieJar()); Q_ASSERT(jar); if (jar) { jar->restore(acc->cookieJarPath()); @@ -305,12 +305,12 @@ void AccountManager::save(bool saveCredentials) qCInfo(lcAccountManager) << "Saved all account settings, status:" << settings->status(); } -void AccountManager::saveAccount(Account *a) +void AccountManager::saveAccount(Account *newAccountData) { - qCDebug(lcAccountManager) << "Saving account" << a->url().toString(); + qCDebug(lcAccountManager) << "Saving account" << newAccountData->url().toString(); const auto settings = ConfigFile::settingsWithGroup(QLatin1String(accountsC)); - settings->beginGroup(a->id()); - saveAccountHelper(a, *settings, false); // don't save credentials they might not have been loaded yet + settings->beginGroup(newAccountData->id()); + saveAccountHelper(newAccountData, *settings, false); // don't save credentials they might not have been loaded yet settings->endGroup(); settings->sync(); @@ -424,8 +424,8 @@ void AccountManager::saveAccountHelper(Account *acc, QSettings &settings, bool s settings.endGroup(); // Save cookies. - if (acc->_am) { - auto *jar = qobject_cast(acc->_am->cookieJar()); + if (acc->_networkAccessManager) { + auto *jar = qobject_cast(acc->_networkAccessManager->cookieJar()); if (jar) { qCInfo(lcAccountManager) << "Saving cookies." << acc->cookieJarPath(); if (!jar->save(acc->cookieJarPath())) diff --git a/src/gui/accountmanager.h b/src/gui/accountmanager.h index 85a244ced..ceb357f09 100644 --- a/src/gui/accountmanager.h +++ b/src/gui/accountmanager.h @@ -91,8 +91,8 @@ public: static void backwardMigrationSettingsKeys(QStringList *deleteKeys, QStringList *ignoreKeys); public slots: - /// Saves account data, not including the credentials - void saveAccount(OCC::Account *a); + /// Saves account data when adding user, when updating e.g. dav user, not including the credentials + void saveAccount(OCC::Account *newAccountData); /// Saves account state data, not including the account void saveAccountState(OCC::AccountState *a); diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 855eab03e..03d2d2f93 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -135,9 +135,12 @@ QString Account::davUser() const void Account::setDavUser(const QString &newDavUser) { - if (_davUser == newDavUser) + if (_davUser == newDavUser) { return; + } + _davUser = newDavUser; + emit wantsAccountSaved(this); emit prettyNameChanged(); } @@ -253,14 +256,14 @@ void Account::setCredentials(AbstractCredentials *cred) QNetworkCookieJar *jar = nullptr; QNetworkProxy proxy; - if (_am) { - jar = _am->cookieJar(); + if (_networkAccessManager) { + jar = _networkAccessManager->cookieJar(); jar->setParent(nullptr); // Remember proxy (issue #2108) - proxy = _am->proxy(); + proxy = _networkAccessManager->proxy(); - _am = QSharedPointer(); + _networkAccessManager = QSharedPointer(); } // The order for these two is important! Reading the credential's @@ -271,17 +274,17 @@ void Account::setCredentials(AbstractCredentials *cred) // Note: This way the QNAM can outlive the Account and Credentials. // This is necessary to avoid issues with the QNAM being deleted while // processing slotHandleSslErrors(). - _am = QSharedPointer(_credentials->createQNAM(), &QObject::deleteLater); + _networkAccessManager = QSharedPointer(_credentials->createQNAM(), &QObject::deleteLater); if (jar) { - _am->setCookieJar(jar); + _networkAccessManager->setCookieJar(jar); } if (proxy.type() != QNetworkProxy::DefaultProxy) { - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } - connect(_am.data(), &QNetworkAccessManager::sslErrors, + connect(_networkAccessManager.data(), &QNetworkAccessManager::sslErrors, this, &Account::slotHandleSslErrors); - connect(_am.data(), &QNetworkAccessManager::proxyAuthenticationRequired, + connect(_networkAccessManager.data(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &Account::proxyAuthenticationRequired); connect(_credentials.data(), &AbstractCredentials::fetched, this, &Account::slotCredentialsFetched); @@ -368,7 +371,7 @@ QUrl Account::deprecatedPrivateLinkUrl(const QByteArray &numericFileId) const */ void Account::clearCookieJar() { - const auto jar = qobject_cast(_am->cookieJar()); + const auto jar = qobject_cast(_networkAccessManager->cookieJar()); ASSERT(jar); jar->setAllCookies(QList()); } @@ -378,7 +381,7 @@ void Account::clearCookieJar() of not losing its ownership. */ void Account::lendCookieJarTo(QNetworkAccessManager *guest) { - auto jar = _am->cookieJar(); + auto jar = _networkAccessManager->cookieJar(); auto oldParent = jar->parent(); guest->setCookieJar(jar); // takes ownership of our precious cookie jar jar->setParent(oldParent); // takes it back @@ -391,35 +394,35 @@ QString Account::cookieJarPath() void Account::resetNetworkAccessManager() { - if (!_credentials || !_am) { + if (!_credentials || !_networkAccessManager) { return; } qCDebug(lcAccount) << "Resetting QNAM"; - QNetworkCookieJar *jar = _am->cookieJar(); - QNetworkProxy proxy = _am->proxy(); + QNetworkCookieJar *jar = _networkAccessManager->cookieJar(); + QNetworkProxy proxy = _networkAccessManager->proxy(); // Use a QSharedPointer to allow locking the life of the QNAM on the stack. // Make it call deleteLater to make sure that we can return to any QNAM stack frames safely. - _am = QSharedPointer(_credentials->createQNAM(), &QObject::deleteLater); + _networkAccessManager = QSharedPointer(_credentials->createQNAM(), &QObject::deleteLater); - _am->setCookieJar(jar); // takes ownership of the old cookie jar - _am->setProxy(proxy); // Remember proxy (issue #2108) + _networkAccessManager->setCookieJar(jar); // takes ownership of the old cookie jar + _networkAccessManager->setProxy(proxy); // Remember proxy (issue #2108) - connect(_am.data(), &QNetworkAccessManager::sslErrors, + connect(_networkAccessManager.data(), &QNetworkAccessManager::sslErrors, this, &Account::slotHandleSslErrors); - connect(_am.data(), &QNetworkAccessManager::proxyAuthenticationRequired, + connect(_networkAccessManager.data(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &Account::proxyAuthenticationRequired); } QNetworkAccessManager *Account::networkAccessManager() { - return _am.data(); + return _networkAccessManager.data(); } QSharedPointer Account::sharedNetworkAccessManager() { - return _am; + return _networkAccessManager; } QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data) @@ -427,17 +430,17 @@ QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, req.setUrl(url); req.setSslConfiguration(this->getOrCreateSslConfig()); if (verb == "HEAD" && !data) { - return _am->head(req); + return _networkAccessManager->head(req); } else if (verb == "GET" && !data) { - return _am->get(req); + return _networkAccessManager->get(req); } else if (verb == "POST") { - return _am->post(req, data); + return _networkAccessManager->post(req, data); } else if (verb == "PUT") { - return _am->put(req, data); + return _networkAccessManager->put(req, data); } else if (verb == "DELETE" && !data) { - return _am->deleteResource(req); + return _networkAccessManager->deleteResource(req); } - return _am->sendCustomRequest(req, verb, data); + return _networkAccessManager->sendCustomRequest(req, verb, data); } QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, const QByteArray &data) @@ -445,17 +448,17 @@ QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, req.setUrl(url); req.setSslConfiguration(this->getOrCreateSslConfig()); if (verb == "HEAD" && data.isEmpty()) { - return _am->head(req); + return _networkAccessManager->head(req); } else if (verb == "GET" && data.isEmpty()) { - return _am->get(req); + return _networkAccessManager->get(req); } else if (verb == "POST") { - return _am->post(req, data); + return _networkAccessManager->post(req, data); } else if (verb == "PUT") { - return _am->put(req, data); + return _networkAccessManager->put(req, data); } else if (verb == "DELETE" && data.isEmpty()) { - return _am->deleteResource(req); + return _networkAccessManager->deleteResource(req); } - return _am->sendCustomRequest(req, verb, data); + return _networkAccessManager->sendCustomRequest(req, verb, data); } QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QHttpMultiPart *data) @@ -463,11 +466,11 @@ QNetworkReply *Account::sendRawRequest(const QByteArray &verb, const QUrl &url, req.setUrl(url); req.setSslConfiguration(this->getOrCreateSslConfig()); if (verb == "PUT") { - return _am->put(req, data); + return _networkAccessManager->put(req, data); } else if (verb == "POST") { - return _am->post(req, data); + return _networkAccessManager->post(req, data); } - return _am->sendCustomRequest(req, verb, data); + return _networkAccessManager->sendCustomRequest(req, verb, data); } SimpleNetworkJob *Account::sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data) @@ -595,7 +598,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply, QList errors) // the deleteLater() of the QNAM before we have the chance of unwinding our stack. // Keep a ref here on our stackframe to make sure that it doesn't get deleted before // handleErrors returns. - QSharedPointer qnamLock = _am; + QSharedPointer qnamLock = _networkAccessManager; QPointer guard = reply; if (_sslErrorHandler->handleErrors(errors, reply->sslConfiguration(), &approvedCerts, sharedFromThis())) { @@ -671,7 +674,7 @@ void Account::handleInvalidCredentials() void Account::clearQNAMCache() { - _am->clearAccessCache(); + _networkAccessManager->clearAccessCache(); } const Capabilities &Account::capabilities() const @@ -1130,16 +1133,16 @@ void Account::setNetworkProxySetting(const AccountNetworkProxySetting setting) _networkProxySetting = setting; if (setting == AccountNetworkProxySetting::AccountSpecificProxy) { - auto proxy = _am->proxy(); + auto proxy = _networkAccessManager->proxy(); proxy.setType(proxyType()); proxy.setHostName(proxyHostName()); proxy.setPort(proxyPort()); proxy.setUser(proxyUser()); proxy.setPassword(proxyPassword()); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } else { const auto proxy = QNetworkProxy::applicationProxy(); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); setProxyType(proxy.type()); setProxyHostName(proxy.hostName()); setProxyPort(proxy.port()); @@ -1163,9 +1166,9 @@ void Account::setProxyType(QNetworkProxy::ProxyType proxyType) _proxyType = proxyType; if (networkProxySetting() == AccountNetworkProxySetting::AccountSpecificProxy) { - auto proxy = _am->proxy(); + auto proxy = _networkAccessManager->proxy(); proxy.setType(proxyType); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } emit proxyTypeChanged(); @@ -1185,9 +1188,9 @@ void Account::setProxyHostName(const QString &hostName) _proxyHostName = hostName; if (networkProxySetting() == AccountNetworkProxySetting::AccountSpecificProxy) { - auto proxy = _am->proxy(); + auto proxy = _networkAccessManager->proxy(); proxy.setHostName(hostName); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } emit proxyHostNameChanged(); @@ -1207,9 +1210,9 @@ void Account::setProxyPort(const int port) _proxyPort = port; if (networkProxySetting() == AccountNetworkProxySetting::AccountSpecificProxy) { - auto proxy = _am->proxy(); + auto proxy = _networkAccessManager->proxy(); proxy.setPort(port); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } emit proxyPortChanged(); @@ -1244,9 +1247,9 @@ void Account::setProxyUser(const QString &user) _proxyUser = user; if (networkProxySetting() == AccountNetworkProxySetting::AccountSpecificProxy) { - auto proxy = _am->proxy(); + auto proxy = _networkAccessManager->proxy(); proxy.setUser(user); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } emit proxyUserChanged(); @@ -1266,9 +1269,9 @@ void Account::setProxyPassword(const QString &password) _proxyPassword = password; if (networkProxySetting() == AccountNetworkProxySetting::AccountSpecificProxy) { - auto proxy = _am->proxy(); + auto proxy = _networkAccessManager->proxy(); proxy.setPassword(password); - _am->setProxy(proxy); + _networkAccessManager->setProxy(proxy); } emit proxyPasswordChanged(); diff --git a/src/libsync/account.h b/src/libsync/account.h index b280a767b..a991daed9 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -519,7 +519,7 @@ private: QColor _serverTextColor = QColorConstants::White; bool _skipE2eeMetadataChecksumValidation = false; QScopedPointer _sslErrorHandler; - QSharedPointer _am; + QSharedPointer _networkAccessManager; QScopedPointer _credentials; bool _http2Supported = false; -- 2.30.2