improve ToS handling

src/gui/connectionvalidator.cpp

@@ -12,7 +12,7 @@
  * for more details.
  */
 
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QLoggingCategory>
@@ -221,13 +221,20 @@
         stat = CredentialsWrong;
 
     } else if (reply->error() != QNetworkReply::NoError) {
-        _errors << job->errorStringParsingBody();
+        QByteArray body;
+        _errors << job->errorStringParsingBody(&body);
 
         const int httpStatus =
             reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
         if (httpStatus == 503) {
             _errors.clear();
             stat = ServiceUnavailable;
+        } else if (httpStatus == 403) {
+            const auto davException = job->errorStringParsingBodyException(body);
+            if (davException == QStringLiteral(R"(OCA\TermsOfService\TermsNotSignedException)")) {
+                qCInfo(lcConnectionValidator) << "The terms of service need to be signed";
+                stat = NeedToSignTermsOfService;
+            }
         }
     }
 

src/gui/owncloudsetupwizard.cpp

@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include <QAbstractButton>
 #include <QtCore>
 #include <QProcess>
 #include <QMessageBox>
@@ -31,6 +31,7 @@
 #include "networkjobs.h"
 #include "owncloudgui.h"
 #include "owncloudsetupwizard.h"
+#include "owncloudpropagator_p.h"
 #include "sslerrordialog.h"
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudwizardcommon.h"
@@ -422,10 +423,17 @@
 
         // Provide messages for other errors, such as invalid credentials.
     } else if (reply->error() != QNetworkReply::NoError) {
+        auto davException = OCC::getExceptionFromReply(reply);
+
         if (!_ocWizard->account()->credentials()->stillValid(reply)) {
             errorMsg = tr("Access forbidden by server. To verify that you have proper access, "
                           "<a href=\"%1\">click here</a> to access the service with your browser.")
                            .arg(Utility::escape(_ocWizard->account()->url().toString()));
+        } else if (!davException.first.isEmpty() && davException.first == QStringLiteral(R"(OCA\TermsOfService\TermsNotSignedException)")) {
+            qCInfo(lcWizard) << "Terms of service not accepted yet!";
+            // TODO: it would be cool to display a new wizard page containing the terms of service
+            errorMsg = tr("Please accept the <a href=\"%1\">Terms of Service</a> with your browser and try again.")
+                           .arg(Utility::escape(_ocWizard->account()->url().toString()));
         } else {
             errorMsg = job->errorStringParsingBody();
         }

src/gui/tray/syncstatussummary.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Felix Weilbach <felix.weilbach@nextcloud.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,7 @@
 
 #include "syncstatussummary.h"
 #include "accountfwd.h"
+#include "accountstate.h"
 #include "folderman.h"
 #include "navigationpanehelper.h"
 #include "networkjobs.h"
@@ -124,6 +125,10 @@
         setTotalFiles(0);
         setSyncStatusString(tr("Offline"));
         setSyncStatusDetailString("");
+        if (_accountState->state() == AccountState::NeedToSignTermsOfService)
+        {
+            setSyncStatusDetailString(tr("You need to accept the terms of service"));
+        }
         setSyncIcon(Theme::instance()->folderOffline());
         return;
     }
@@ -340,6 +345,11 @@
     setSyncStatusDetailString("");
     if (_accountState && !_accountState->isConnected()) {
         setSyncStatusString(tr("Offline"));
+        // TODO: remove this, this is intentionally in caps to see that this is temporary
+        if (_accountState->state() == AccountState::NeedToSignTermsOfService)
+        {
+            setSyncStatusDetailString(tr("NEEDS TOS <a href=\"%1\">click here</a>").arg(_accountState->account()->url().toString()));
+        }
         setSyncIcon(Theme::instance()->folderOffline());
     } else {
         setSyncStatusString(tr("All synced!"));

src/libsync/owncloudpropagator_p.h

@@ -69,8 +69,8 @@ inline QPair<QByteArray, QByteArray> getExceptionFromReply(QNetworkReply * const
         return {};
     }
     const auto httpStatusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    // only for BadRequest and UnsupportedMediaType
-    if (httpStatusCode != 400 && httpStatusCode != 415) {
+    // only for BadRequest, Forbidden, and UnsupportedMediaType
+    if (!(httpStatusCode == 400 || httpStatusCode == 403 || httpStatusCode == 415)) {
         return {};
     }