Remove legacy values like webDavPath() and davUser()

Author: TheOneRing

src/common/utility.h

@@ -154,6 +154,14 @@ OCSYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
         return s.toString();
     }
 
+    inline auto stripLeadingSlash(QStringView s)
+    {
+        if (s.startsWith(QLatin1Char('/'))) {
+            s.slice(1);
+        }
+        return s.toString();
+    }
+
     inline QString ensureTrailingSlash(QStringView s)
     {
         if (!s.endsWith(QLatin1Char('/'))) {

src/gui/accountmanager.cpp

@@ -48,11 +48,6 @@ auto defaultSyncRootC()
     return QStringLiteral("default_sync_root");
 }
 
-const QString davUserC()
-{
-    return QStringLiteral("dav_user");
-}
-
 const QString davUserDisplyNameC()
 {
     return QStringLiteral("display-name");
@@ -139,7 +134,6 @@ void AccountManager::saveAccount(Account *account, bool saveCredentials)
     settings->beginGroup(account->id());
 
     settings->setValue(urlC(), account->_url.toString());
-    settings->setValue(davUserC(), account->_davUser);
     settings->setValue(davUserDisplyNameC(), account->_displayName);
     settings->setValue(userUUIDC(), account->uuid());
     if (account->hasCapabilities()) {
@@ -221,7 +215,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
 
     acc->setUrl(urlConfig.toUrl());
 
-    acc->_davUser = settings.value(davUserC()).toString();
     acc->_displayName = settings.value(davUserDisplyNameC()).toString();
     acc->setCapabilities({acc->url(), settings.value(capabilitesC()).value<QVariantMap>()});
     acc->setDefaultSyncRoot(settings.value(defaultSyncRootC()).toString());

src/gui/connectionvalidator.cpp

@@ -182,7 +182,7 @@ void ConnectionValidator::checkAuthentication()
     qCDebug(lcConnectionValidator) << "# Check whether authenticated propfind works.";
 
     // we explicitly use a legacy dav path here
-    auto *job = new PropfindJob(_account, _account->url(), Theme::instance()->webDavPath(), PropfindJob::Depth::Zero, this);
+    auto *job = new PropfindJob(_account, _account->url(), QStringLiteral("/remote.php/webdav/"), PropfindJob::Depth::Zero, this);
     job->setAuthenticationJob(true); // don't retry
     job->setTimeout(timeoutToUse());
     job->setProperties({ QByteArrayLiteral("getlastmodified") });

src/gui/creds/httpcredentialsgui.cpp

@@ -32,8 +32,8 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcHttpCredentialsGui, "sync.credentials.http.gui", QtInfoMsg)
 
-HttpCredentialsGui::HttpCredentialsGui(const QString &davUser, const QString &accessToken, const QString &refreshToken)
-    : HttpCredentials(davUser, accessToken)
+HttpCredentialsGui::HttpCredentialsGui(const QString &accessToken, const QString &refreshToken)
+    : HttpCredentials(accessToken)
 {
     _refreshToken = refreshToken;
 }

src/gui/creds/httpcredentialsgui.h

@@ -33,12 +33,8 @@ class HttpCredentialsGui : public HttpCredentials
 public:
     HttpCredentialsGui() = default;
 
-    HttpCredentialsGui(const QString &davUser, const QString &password, const QString &refreshToken);
+    HttpCredentialsGui(const QString &accessToken, const QString &refreshToken);
 
-    /**
-     * This will query the server and either uses OAuth via _asyncAuth->start()
-     * or call showDialog to ask the password
-     */
     void restartOauth() override;
 
 

src/gui/fetchserversettings.cpp

@@ -80,10 +80,6 @@ void FetchServerSettingsJob::start()
                     Q_EMIT finishedSignal(Result::InvalidCredentials);
                 } else if (userJob->ocsSuccess()) {
                     const auto userData = userJob->data().value(QStringLiteral("ocs")).toObject().value(QStringLiteral("data")).toObject();
-                    const QString user = userData.value(QStringLiteral("id")).toString();
-                    if (!user.isEmpty()) {
-                        _account->setDavUser(user);
-                    }
                     const QString displayName = userData.value(QStringLiteral("display-name")).toString();
                     if (!displayName.isEmpty()) {
                         _account->setDavDisplayName(displayName);

src/gui/newwizard/setupwizardaccountbuilder.cpp

@@ -24,15 +24,6 @@ namespace OCC::Wizard {
 
 AbstractAuthenticationStrategy::~AbstractAuthenticationStrategy() { }
 
-QString AbstractAuthenticationStrategy::davUser()
-{
-    return _davUser;
-}
-
-void AbstractAuthenticationStrategy::setDavUser(const QString &user)
-{
-    _davUser = user;
-}
 
 OAuth2AuthenticationStrategy::OAuth2AuthenticationStrategy(const QString &token, const QString &refreshToken)
     : _token(token)
@@ -43,12 +34,12 @@ OAuth2AuthenticationStrategy::OAuth2AuthenticationStrategy(const QString &token,
 HttpCredentialsGui *OAuth2AuthenticationStrategy::makeCreds()
 {
     Q_ASSERT(isValid());
-    return new HttpCredentialsGui(davUser(), _token, _refreshToken);
+    return new HttpCredentialsGui(_token, _refreshToken);
 }
 
 bool OAuth2AuthenticationStrategy::isValid()
 {
-    return !davUser().isEmpty() && !_token.isEmpty() && !_refreshToken.isEmpty();
+    return !_token.isEmpty() && !_refreshToken.isEmpty();
 }
 
 FetchUserInfoJobFactory OAuth2AuthenticationStrategy::makeFetchUserInfoJobFactory(QNetworkAccessManager *nam)
@@ -87,7 +78,6 @@ AccountPtr SetupWizardAccountBuilder::build()
     Q_ASSERT(hasValidCredentials());
 
     // TODO: perhaps _authenticationStrategy->setUpAccountPtr(...) would be more elegant? no need for getters then
-    newAccountPtr->setDavUser(_authenticationStrategy->davUser());
     newAccountPtr->setCredentials(_authenticationStrategy->makeCreds());
 
     newAccountPtr->setDavDisplayName(_displayName);

src/gui/newwizard/setupwizardaccountbuilder.h

@@ -43,13 +43,7 @@ class AbstractAuthenticationStrategy
      */
     virtual bool isValid() = 0;
 
-    [[deprecated("https://github.com/opencloud-eu/desktop/issues/76")]] QString davUser();
-    void setDavUser(const QString &user);
-
     virtual FetchUserInfoJobFactory makeFetchUserInfoJobFactory(QNetworkAccessManager *nam) = 0;
-
-private:
-    QString _davUser;
 };
 
 class OAuth2AuthenticationStrategy : public AbstractAuthenticationStrategy

src/gui/newwizard/setupwizardcontroller.cpp

@@ -151,7 +151,6 @@ void SetupWizardController::changeStateTo(SetupWizardState nextState, ChangeReas
                 if (fetchUserInfoJob->success()) {
                     auto result = fetchUserInfoJob->result().value<FetchUserInfoResult>();
                     _context->accountBuilder().setDisplayName(result.displayName());
-                    _context->accountBuilder().authenticationStrategy()->setDavUser(result.userName());
                     changeStateTo(SetupWizardState::AccountConfiguredState);
                 } else if (fetchUserInfoJob->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 401) {
                     _context->window()->showErrorMessage(tr("Invalid credentials"));

src/gui/newwizard/states/oauthcredentialssetupwizardstate.cpp

@@ -28,7 +28,7 @@ OAuthCredentialsSetupWizardState::OAuthCredentialsSetupWizardState(SetupWizardCo
         return _context->accountBuilder().serverUrl();
     }();
 
-    auto oAuth = new OAuth(authServerUrl, {}, _context->accessManager(), {}, this);
+    auto oAuth = new OAuth(authServerUrl, _context->accessManager(), {}, this);
     connect(oAuth, &OAuth::dynamicRegistrationDataReceived, this,
         [this](const QVariantMap &dynamicRegistrationData) { _context->accountBuilder().setDynamicRegistrationData(dynamicRegistrationData); });