Fixing tests but it seems that auth might be a breaking change

Author: alexeyzimarev

src/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs

@@ -16,6 +16,6 @@ internal static class StringExtensions
 
         public static byte[] GetBytes(this string input) => Encoding.UTF8.GetBytes(input);
 
-        public static string PercentEncode(this string s) => string.Join("", s.GetBytes().Select(x => $"{x:X2}"));
+        public static string PercentEncode(this string s) => string.Join("", s.GetBytes().Select(x => $"%{x:X2}"));
     }
 }

src/RestSharp/Authenticators/OAuth/OAuth1Authenticator.cs

@@ -290,7 +290,7 @@ string GetAuthorizationHeader(WebPairCollection parameters)
                             !p.Name.IsNullOrBlank() && !p.Value.IsNullOrBlank() &&
                             (p.Name.StartsWith("oauth_") || p.Name.StartsWith("x_auth_"))
                     )
-                    .Select(x => $"{x.Name}={x.Value}")
+                    .Select(x => $"{x.Name}=\"{x.Value}\"")
                     .ToList();
 
             if (!Realm.IsNullOrBlank())

src/RestSharp/RestRequest.cs

@@ -467,7 +467,8 @@ public IRestRequest AddParameter(string name, object value, string contentType,
         /// <returns></returns>
         public IRestRequest AddOrUpdateParameter(Parameter parameter)
         {
-            var p = Parameters.FirstOrDefault(x => x.Name == parameter.Name);
+            var p = Parameters
+                .FirstOrDefault(x => x.Name == parameter.Name && x.Type == parameter.Type);
 
             if (p != null) Parameters.Remove(p);
 

test/RestSharp.Tests/HttpBasicAuthenticatorTests.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Moq;
 using NUnit.Framework;
 using RestSharp.Authenticators;
+using Shouldly;
 
 namespace RestSharp.Tests
 {
@@ -24,53 +26,23 @@ public void Setup()
 
         HttpBasicAuthenticator _authenticator;
 
-        [TestCase("Authorization")]
-        [TestCase("authorization")]
-        [TestCase("AUTHORIZATION")]
-        public void Authenticate_ShouldNotAddAuthorizationParameter_IfAlreadyAssigned(string parameterName)
-        {
-            // Arrange
-            var mockClient  = new Mock<IRestClient>();
-            var mockRequest = new Mock<IRestRequest>();
-
-            mockRequest.SetupGet(x => x.Parameters)
-                .Returns(
-                    new List<Parameter> {new Parameter(parameterName, null, default)}
-                );
-
-            // Act
-            _authenticator.Authenticate(mockClient.Object, mockRequest.Object);
-
-            // Assert
-            mockRequest.Verify(
-                x =>
-                    x.AddParameter("Authorization", It.IsAny<string>(), ParameterType.HttpHeader), Times.Never
-            );
-        }
-
         [Test]
         public void Authenticate_ShouldAddAuthorizationParameter_IfPreviouslyUnassigned()
         {
             // Arrange
-            var mockClient  = new Mock<IRestClient>();
-            var mockRequest = new Mock<IRestRequest>();
+            var client  = new RestClient();
+            var request = new RestRequest();
 
-            mockRequest.SetupGet(x => x.Parameters)
-                .Returns(
-                    new List<Parameter> {new Parameter("NotMatching", null, default)}
-                );
+            request.AddParameter(new Parameter("NotMatching", null, default));
 
             var expectedToken =
                 $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{_username}:{_password}"))}";
 
             // Act
-            _authenticator.Authenticate(mockClient.Object, mockRequest.Object);
+            _authenticator.Authenticate(client, request);
 
             // Assert
-            mockRequest.Verify(
-                x =>
-                    x.AddParameter("Authorization", expectedToken, ParameterType.HttpHeader), Times.Once
-            );
+            request.Parameters.Single(x => x.Name == "Authorization").Value.ShouldBe(expectedToken);
         }
     }
 }

test/RestSharp.Tests/JwtAuthTests.cs

@@ -70,9 +70,9 @@ public void Set_Auth_Header_Only_Once()
             var client  = new RestClient();
             var request = new RestRequest();
 
-            request.AddHeader("Authorization", _expectedAuthHeaderContent);
+            request.AddHeader("Authorization", "second_header_auth_token");
 
-            client.Authenticator = new JwtAuthenticator("second_header_auth_token");
+            client.Authenticator = new JwtAuthenticator(_testJwt);
 
             //In real case client.Execute(...) will invoke Authenticate method
             client.Authenticator.Authenticate(client, request);