$OpenBSD: patch-src_libsync_networkjobs_cpp,v 1.5 2020/12/19 19:34:22 rsadowski Exp $

Index: src/libsync/networkjobs.cpp
--- src/libsync/networkjobs.cpp.orig
+++ src/libsync/networkjobs.cpp
@@ -929,7 +929,7 @@ void DetermineAuthTypeJob::start()
     });
     connect(oldFlowRequired, &JsonApiJob::jsonReceived, this, [this](const QJsonDocument &json, int statusCode) {
         if (statusCode == 200) {
-            _resultOldFlow = LoginFlowV2;
+            _resultOldFlow = Basic;
 
             auto data = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
             auto gs = data.value("globalscale");
@@ -937,7 +937,7 @@ void DetermineAuthTypeJob::start()
                 auto flow = gs.toObject().value("desktoplogin");
                 if (flow != QJsonValue::Undefined) {
                     if (flow.toInt() == 1) {
-                        _resultOldFlow = WebViewFlow;
+                        _resultOldFlow = Basic;
                     }
                 }
             }
@@ -963,17 +963,12 @@ void DetermineAuthTypeJob::checkAllDone()
 
     // WebViewFlow > OAuth > Shib > Basic
     if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
-        result = WebViewFlow;
+        result = Basic;
     }
 
     // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
     if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
-        result = LoginFlowV2;
-    }
-
-    // If we determined that we need the webview flow (GS for example) then we switch to that
-    if (_resultOldFlow == WebViewFlow) {
-        result = WebViewFlow;
+        result = Basic;
     }
 
     qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
