From 8ccdc585704a686d6b5b42efa61dc4c9f3b1c19d Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Thu, 3 Oct 2024 07:27:56 -0700
Subject: [PATCH] Backport #1690

Fix exception when refreshing OAuth2 token
---
 projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs               | 4 ----
 projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj | 4 ++--
 projects/Unit/Unit.csproj                                     | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs b/projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs
index ce93659a93..8b19b4ff2a 100644
--- a/projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs
+++ b/projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs
@@ -248,10 +248,6 @@ private Dictionary<string, string> buildRefreshParameters(IToken token)
             var dict = buildRequestParameters();
             dict.Remove(GRANT_TYPE);
             dict.Add(GRANT_TYPE, REFRESH_TOKEN);
-            if (_scope != null)
-            {
-                dict.Add(SCOPE, _scope);
-            }
             dict.Add(REFRESH_TOKEN, token.RefreshToken);
             return dict;
         }
diff --git a/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj b/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
index 6ca352b3eb..a9e832464a 100644
--- a/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
+++ b/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
@@ -62,8 +62,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0'">
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/projects/Unit/Unit.csproj b/projects/Unit/Unit.csproj
index c5d0670e26..f569229a39 100755
--- a/projects/Unit/Unit.csproj
+++ b/projects/Unit/Unit.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
     <PackageReference Include="Verify.NUnit" Version="19.12.1" />
     <PackageReference Include="WireMock.Net" Version="1.5.35" />
   </ItemGroup>