prevent nextcloud connector's attempt to read a password when no user…

…name has been set
PhilInTheGaps · Jan 5, 2025 · 2436f79 · 2436f79
1 parent eb4e3ae
commit 2436f79
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/src/common/settings/settingsmanager.cpp b/src/common/settings/settingsmanager.cpp
@@ -133,7 +133,17 @@ auto SettingsManager::getPassword(const QString &username, const QString &servic
 
     if (job->error())
     {
-        qCCritical(gmSettings) << "Could not read password:" << job->error() << job->errorString();
+        if (username.isEmpty())
+        {
+            qCCritical(gmSettings) << "Could not read password for service" << service
+                                   << "(no username):" << job->error() << job->errorString();
+        }
+        else
+        {
+            qCCritical(gmSettings) << "Could not read password for service" << service << ":" << job->error()
+                                   << job->errorString();
+        }
+
         return u""_s;
     }
 

diff --git a/src/services/nextcloud/nextcloudconnector.cpp b/src/services/nextcloud/nextcloudconnector.cpp
@@ -32,20 +32,23 @@ NextCloudConnector::NextCloudConnector(NextCloud *nc, QObject *parent)
     connect(this, &NextCloudConnector::stateChanged, this, &NextCloudConnector::onStateChanged);
     state(State::Connecting);
 
-    QTimer::singleShot(0, this, [this]() {
-        m_appPassword = SettingsManager::getPassword(m_nc->loginName(), m_nc->serviceName());
-
-        if (m_nc->loginName().isEmpty() || m_appPassword.isEmpty() || m_nc->serverUrl().isEmpty())
-        {
-            state(State::Disconnected);
-        }
-        else
-        {
-            qCDebug(gmNcConnector()) << "Connected to Nextcloud as user" << m_nc->loginName() << "on server"
-                                     << m_nc->serverUrl();
-            state(State::Connected);
-        }
-    });
+    if (!m_nc->loginName().isEmpty())
+    {
+        QTimer::singleShot(0, this, [this]() {
+            m_appPassword = SettingsManager::getPassword(m_nc->loginName(), m_nc->serviceName());
+
+            if (m_nc->loginName().isEmpty() || m_appPassword.isEmpty() || m_nc->serverUrl().isEmpty())
+            {
+                state(State::Disconnected);
+            }
+            else
+            {
+                qCDebug(gmNcConnector()) << "Connected to Nextcloud as user" << m_nc->loginName() << "on server"
+                                         << m_nc->serverUrl();
+                state(State::Connected);
+            }
+        });
+    }
 }
 
 void NextCloudConnector::grantAccess()