A 404 during a token refresh is no reason to gice up

Fixes: #9245
owncloud · Jan 21, 2022 · 8ee7adf · 8ee7adf
1 parent 2f5547e
commit 8ee7adf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/changelog/unreleased/9245 b/changelog/unreleased/9245
@@ -0,0 +1,4 @@
+Enhancement: Don't log out if we receive a 404 during token refresh
+
+https://github.com/owncloud/client/issues/9245
+https://github.com/owncloud/client/pull/9380
diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
@@ -34,6 +34,10 @@
 #include <QSettings>
 #include <QSslKey>
 
+#include <chrono>
+
+using namespace std::chrono_literals;
+
 Q_LOGGING_CATEGORY(lcHttpCredentials, "sync.credentials.http", QtInfoMsg)
 Q_LOGGING_CATEGORY(lcHttpLegacyCredentials, "sync.credentials.http.legacy", QtInfoMsg)
 
@@ -271,12 +275,16 @@ bool HttpCredentials::refreshAccessToken()
         case QNetworkReply::ServiceUnavailableError:
             Q_FALLTHROUGH();
         case QNetworkReply::UnknownNetworkError:
-            QTimer::singleShot(30000, this, &HttpCredentials::refreshAccessToken);
+            QTimer::singleShot(30s, this, &HttpCredentials::refreshAccessToken);
+            break;
+        case QNetworkReply::ContentNotFoundError:
+            // 404: not part of the protocol, bigip f5?
+            QTimer::singleShot(0, this, &HttpCredentials::refreshAccessToken);
             break;
         default:
             // something is broken
             // start fresh
-            qCWarning(lcHttpCredentials) << "Token refresh encountered an unsupported network error" << errorString << "-> log out";
+            qCWarning(lcHttpCredentials) << "Token refresh encountered an unsupported network error" << error << ": " << errorString << "-> log out";
             forgetSensitiveData();
             Q_EMIT _account->invalidCredentials();
         }