fix: merge SystemConfig and ConfigResolver

Author: DeepDiver1975

src/gui/creds/credentials.cpp

@@ -288,7 +288,8 @@ void Credentials::refreshAccessTokenInternal()
         return;
     // parent with nam to ensure we reset when the nam is reset
     // todo: #22 - the parenting here is highly questionable, as is the use of the shared account ptr
-    _oAuthJob = new AccountBasedOAuth(_account, this);
+    SystemConfig systemConfig;
+    _oAuthJob = new AccountBasedOAuth(_account, systemConfig.openIdConfig(), this);
     connect(_oAuthJob, &AccountBasedOAuth::refreshError, this, &Credentials::handleRefreshError);
     connect(_oAuthJob, &AccountBasedOAuth::refreshFinished, this, &Credentials::handleRefreshSuccess);
 

src/gui/creds/oauth.cpp

@@ -15,7 +15,7 @@
 #include "oauth.h"
 
 #include "accessmanager.h"
-#include "config/configresolver.h"
+#include "config/systemconfig.h"
 #include "creds/credentialssupport.h"
 #include "gui/networkadapters/userinfoadapter.h"
 #include "libsync/creds/credentialmanager.h"
@@ -478,8 +478,8 @@ void OAuth::openBrowser()
 // todo: I was contemplating how we can make sure the passed account isn't null before we use it
 // to seed the OAuth ctr, and really, I'm not sure this should be a subclass of oauth in the first place. Instead it could simply use an
 // oauth instance to complete the tasks it can't do itself -> this could possibly be a "has a" not an "is a" impl
-AccountBasedOAuth::AccountBasedOAuth(Account *account, QObject *parent)
-    : OAuth(account->url(), account->davUser(), ConfigResolver::openIdConfig(), account->accessManager(), parent)
+AccountBasedOAuth::AccountBasedOAuth(Account *account, const OpenIdConfig& openIdConfig, QObject *parent)
+    : OAuth(account->url(), account->davUser(), openIdConfig, account->accessManager(), parent)
     , _account(account)
 {
 }

src/gui/creds/oauth.h

@@ -146,7 +146,7 @@ class AccountBasedOAuth : public OAuth
     Q_OBJECT
 
 public:
-    explicit AccountBasedOAuth(Account *account, QObject *parent);
+    explicit AccountBasedOAuth(Account *account, const OpenIdConfig& openIdConfig, QObject *parent);
 
     void startAuthentication() override;
 

src/gui/creds/requestauthenticationcontroller.cpp

@@ -21,6 +21,8 @@
 #include "accountmodalwidget.h"
 #include "settingsdialog.h"
 
+#include <config/systemconfig.h>
+
 namespace OCC {
 
 /**
@@ -58,8 +60,9 @@ void RequestAuthenticationController::startAuthentication(Account *account)
         delete _oauth;
         _oauth = nullptr;
     }
+    SystemConfig systemConfig;
     _account = account;
-    _oauth = new AccountBasedOAuth(_account, this);
+    _oauth = new AccountBasedOAuth(_account, systemConfig.openIdConfig(), this);
     connect(_oauth, &OAuth::authorisationLinkChanged, this, &RequestAuthenticationController::authUrlReady);
     connect(_oauth, &OAuth::result, this, &RequestAuthenticationController::handleOAuthResult);
     if (_widget && _modalWidget == nullptr) { // first show of the gui

src/gui/newaccountwizard/oauthpagecontroller.cpp

@@ -15,7 +15,7 @@
 
 #include "accessmanager.h"
 #include "accountmanager.h"
-#include "config/configresolver.h"
+#include "config/systemconfig.h"
 #include "networkadapters/fetchcapabilitiesadapter.h"
 #include "networkadapters/userinfoadapter.h"
 #include "networkadapters/webfingerlookupadapter.h"
@@ -209,7 +209,8 @@ bool OAuthPageController::validate()
     _authEndpoint.clear();
     _urlField->clear();
 
-    _oauth = new OAuth(_authUrl, {}, ConfigResolver::openIdConfig(), _accessManager.get(), this);
+    SystemConfig systemConfig;
+    _oauth = new OAuth(_authUrl, {}, systemConfig.openIdConfig(), _accessManager.get(), this);
     // if we ever need to split out the auth link calculation, it's coming from fetchWellKnown which is a subset of
     // the "full" authentication routine in the oauth impl
     connect(_oauth, &OAuth::authorisationLinkChanged, this, &OAuthPageController::authUrlReady);

src/gui/newaccountwizard/urlpagecontroller.cpp

@@ -13,7 +13,6 @@
  */
 #include "urlpagecontroller.h"
 
-#include "../../libsync/config/configresolver.h"
 #include "../../libsync/config/systemconfig.h"
 #include "accessmanager.h"
 #include "configfile.h"
@@ -41,15 +40,16 @@ UrlPageController::UrlPageController(QWizardPage *page, AccessManager *accessMan
         return;
     }
 
-    QString serverUrl = ConfigResolver::serverUrl();
+    SystemConfig systemConfig;
+    QString serverUrl = systemConfig.serverUrl();
     // no server url was given by any means, so the user has to provide one
     if (serverUrl.isEmpty()) {
         return;
     }
     setUrl(serverUrl);
 
     // The system admin provides the url, don't let the user change it!
-    bool allowServerUrlChange = ConfigResolver::allowServerUrlChange();
+    bool allowServerUrlChange = systemConfig.allowServerUrlChange();
     if (!allowServerUrlChange) {
         _urlField->setEnabled(false);
         _instructionLabel->setText(tr("Your web browser will be opened to complete sign in."));

src/libsync/CMakeLists.txt

@@ -53,7 +53,6 @@ set(libsync_SRCS
 
     appprovider.cpp
     config/systemconfig.cpp
-    config/configresolver.cpp
     config/openidconfig.cpp
 )
 

src/libsync/config/configresolver.cpp

@@ -5,6 +5,10 @@
 
 namespace OCC {
 
+OpenIdConfig::OpenIdConfig()
+{
+}
+
 OpenIdConfig::OpenIdConfig(const QString &clientId, const QString &clientSecret, const QList<quint16> &ports, const QString &scopes, const QString &prompt)
     : _clientId(clientId)
     , _clientSecret(clientSecret)