From 389d04bbec13f0c0856c698e53caab363b3d23fe Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 3 Apr 2025 22:34:55 +0200
Subject: [PATCH] OAuthenticator: Don't clear refresh token

---
 src/core/oauthenticator.cpp | 58 ++++++++++++++++++-------------------
 src/core/oauthenticator.h   |  6 ++--
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/core/oauthenticator.cpp b/src/core/oauthenticator.cpp
index 26aa0d2d1..cc1ae6fcc 100644
--- a/src/core/oauthenticator.cpp
+++ b/src/core/oauthenticator.cpp
@@ -302,30 +302,6 @@ void OAuthenticator::Authenticate() {
 
 }
 
-QNetworkReply *OAuthenticator::CreateRequest(const ParamList &params) {
-
-  QUrlQuery url_query;
-  for (const Param &param : std::as_const(params)) {
-    url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(param.first)), QString::fromLatin1(QUrl::toPercentEncoding(param.second)));
-  }
-
-  QNetworkRequest network_request(access_token_url_);
-  network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
-  network_request.setHeader(QNetworkRequest::ContentTypeHeader, u"application/x-www-form-urlencoded"_s);
-  if (type_ == Type::Client_Credentials && !client_id_.isEmpty() && !client_secret_.isEmpty()) {
-    const QString authorization_header = client_id_ + u':' + client_secret_;
-    network_request.setRawHeader("Authorization", "Basic " + authorization_header.toUtf8().toBase64());
-  }
-
-  QNetworkReply *reply = network_->post(network_request, url_query.toString(QUrl::FullyEncoded).toUtf8());
-  replies_ << reply;
-  QObject::connect(reply, &QNetworkReply::sslErrors, this, &OAuthenticator::HandleLoginSSLErrors);
-  QObject::connect(reply, &QNetworkReply::finished, this, [this, reply]() { AccessTokenRequestFinished(reply); });
-
-  return reply;
-
-}
-
 void OAuthenticator::RedirectArrived() {
 
   if (local_redirect_server_.isNull()) {
@@ -396,6 +372,30 @@ void OAuthenticator::AuthorizationUrlReceived(const QUrl &request_url, const QUr
 
 }
 
+QNetworkReply *OAuthenticator::CreateAccessTokenRequest(const ParamList &params, const bool refresh_token) {
+
+  QUrlQuery url_query;
+  for (const Param &param : std::as_const(params)) {
+    url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(param.first)), QString::fromLatin1(QUrl::toPercentEncoding(param.second)));
+  }
+
+  QNetworkRequest network_request(access_token_url_);
+  network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
+  network_request.setHeader(QNetworkRequest::ContentTypeHeader, u"application/x-www-form-urlencoded"_s);
+  if (type_ == Type::Client_Credentials && !client_id_.isEmpty() && !client_secret_.isEmpty()) {
+    const QString authorization_header = client_id_ + u':' + client_secret_;
+    network_request.setRawHeader("Authorization", "Basic " + authorization_header.toUtf8().toBase64());
+  }
+
+  QNetworkReply *reply = network_->post(network_request, url_query.toString(QUrl::FullyEncoded).toUtf8());
+  replies_ << reply;
+  QObject::connect(reply, &QNetworkReply::sslErrors, this, &OAuthenticator::HandleSSLErrors);
+  QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, refresh_token]() { AccessTokenRequestFinished(reply, refresh_token); });
+
+  return reply;
+
+}
+
 void OAuthenticator::RequestAccessToken(const QString &code, const QUrl &redirect_url) {
 
   if (timer_refresh_login_->isActive()) {
@@ -426,7 +426,7 @@ void OAuthenticator::RequestAccessToken(const QString &code, const QUrl &redirec
 
   std::sort(params.begin(), params.end());
 
-  CreateRequest(params);
+  CreateAccessTokenRequest(params, false);
 
 }
 
@@ -448,11 +448,11 @@ void OAuthenticator::RenewAccessToken() {
     params << Param(u"client_secret"_s, client_secret_);
   }
 
-  CreateRequest(params);
+  CreateAccessTokenRequest(params, true);
 
 }
 
-void OAuthenticator::HandleLoginSSLErrors(const QList<QSslError> &ssl_errors) {
+void OAuthenticator::HandleSSLErrors(const QList<QSslError> &ssl_errors) {
 
   for (const QSslError &ssl_error : ssl_errors) {
     qLog(Debug) << settings_group_ << ssl_error.errorString();
@@ -460,7 +460,7 @@ void OAuthenticator::HandleLoginSSLErrors(const QList<QSslError> &ssl_errors) {
 
 }
 
-void OAuthenticator::AccessTokenRequestFinished(QNetworkReply *reply) {
+void OAuthenticator::AccessTokenRequestFinished(QNetworkReply *reply, const bool refresh_token) {
 
   if (!replies_.contains(reply)) return;
   replies_.removeAll(reply);
@@ -538,7 +538,7 @@ void OAuthenticator::AccessTokenRequestFinished(QNetworkReply *reply) {
   if (json_object.contains("refresh_token"_L1)) {
     refresh_token_ = json_object["refresh_token"_L1].toString();
   }
-  else {
+  else if (!refresh_token) {
     refresh_token_.clear();
   }
 
diff --git a/src/core/oauthenticator.h b/src/core/oauthenticator.h
index 714eeba03..323ca4d43 100644
--- a/src/core/oauthenticator.h
+++ b/src/core/oauthenticator.h
@@ -80,7 +80,7 @@ class OAuthenticator : public QObject {
 
   QString GrantType() const;
   void StartRefreshLoginTimer();
-  QNetworkReply *CreateRequest(const ParamList &params);
+  QNetworkReply *CreateAccessTokenRequest(const ParamList &params, const bool refresh_token);
   void RequestAccessToken(const QString &code = QString(), const QUrl &redirect_url = QUrl());
   void RenewAccessToken();
   void AuthorizationUrlReceived(const QUrl &request_url, const QUrl &redirect_url);
@@ -91,8 +91,8 @@ class OAuthenticator : public QObject {
 
  private Q_SLOTS:
   void RedirectArrived();
-  void HandleLoginSSLErrors(const QList<QSslError> &ssl_errors);
-  void AccessTokenRequestFinished(QNetworkReply *reply);
+  void HandleSSLErrors(const QList<QSslError> &ssl_errors);
+  void AccessTokenRequestFinished(QNetworkReply *reply, const bool refresh_token);
 
  private:
   const SharedPtr<NetworkAccessManager> network_;