WIP fixing tests

Author: alexeyzimarev

benchmarks/RestSharp.Benchmarks/Serializers/JsonNetDeserializeBenchmarks.cs

@@ -23,13 +23,16 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-        <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All"/>
+<!--        <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All"/>-->
         <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All"/>
     </ItemGroup>
     <ItemGroup>
         <None Include="$(RepoRoot)\restsharp.png" Pack="true" PackagePath="\"/>
         <Using Include="JetBrains.Annotations"/>
     </ItemGroup>
+    <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
+        <PackageReference Include="IsExternalInit" Version="1.0.1" PrivateAssets="All"/>
+    </ItemGroup>
     <Target Name="CustomVersion" AfterTargets="MinVer">
         <PropertyGroup>
             <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)</FileVersion>

src/Directory.Build.props

@@ -20,7 +20,7 @@ public class JsonNetSerializer : IRestSerializer {
         ConstructorHandling  = ConstructorHandling.AllowNonPublicDefaultConstructor
     };
 
-    [ThreadStatic] static WriterBuffer? tWriterBuffer;
+    [ThreadStatic] static WriterBuffer? _writerBuffer;
 
     readonly JsonSerializer _serializer;
 
@@ -38,7 +38,7 @@ public class JsonNetSerializer : IRestSerializer {
     public string? Serialize(object? obj) {
         if (obj == null) return null;
 
-        using var writerBuffer = tWriterBuffer ??= new WriterBuffer(_serializer);
+        using var writerBuffer = _writerBuffer ??= new WriterBuffer(_serializer);
 
         _serializer.Serialize(writerBuffer.GetJsonTextWriter(), obj, obj.GetType());
 
@@ -47,7 +47,7 @@ public class JsonNetSerializer : IRestSerializer {
 
     public string? Serialize(Parameter bodyParameter) => Serialize(bodyParameter.Value);
 
-    public T? Deserialize<T>(IRestResponse response) {
+    public T? Deserialize<T>(RestResponse response) {
         using var reader = new JsonTextReader(new StringReader(response.Content)) { CloseInput = true };
 
         return _serializer.Deserialize<T>(reader);

src/RestSharp.Serializers.NewtonsoftJson/JsonNetSerializer.cs

@@ -1,11 +1,12 @@
-namespace RestSharp.Authenticators; 
+namespace RestSharp.Authenticators;
 
 public abstract class AuthenticatorBase : IAuthenticator {
     protected AuthenticatorBase(string token) => Token = token;
 
     protected string Token { get; }
 
-    protected abstract Parameter GetAuthenticationParameter(string accessToken);
+    protected abstract ValueTask<Parameter> GetAuthenticationParameter(string accessToken);
 
-    public void Authenticate(RestClient client, IRestRequest request) => request.AddOrUpdateParameter(GetAuthenticationParameter(Token));
+    public async ValueTask Authenticate(RestClient client, IRestRequest request)
+        => request.AddOrUpdateParameter(await GetAuthenticationParameter(Token));
 }

src/RestSharp/Authenticators/AuthenticatorBase.cs

@@ -9,6 +9,7 @@ namespace RestSharp.Authenticators;
 /// Encoding can be specified depending on what your server expect (see https://stackoverflow.com/a/7243567).
 /// UTF-8 is used by default but some servers might expect ISO-8859-1 encoding.
 /// </remarks>
+[PublicAPI]
 public class HttpBasicAuthenticator : AuthenticatorBase
 {
     public HttpBasicAuthenticator(string username, string password) : this(username, password, Encoding.UTF8) { }
@@ -20,6 +21,6 @@ static string GetHeader(string username, string password, Encoding encoding)
         => Convert.ToBase64String(encoding.GetBytes($"{username}:{password}"));
 
     // return ;
-    protected override Parameter GetAuthenticationParameter(string accessToken)
-        => new("Authorization", $"Basic {accessToken}", ParameterType.HttpHeader);
+    protected override ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
+        => new(new Parameter("Authorization", $"Basic {accessToken}", ParameterType.HttpHeader));
 }

src/RestSharp/Authenticators/HttpBasicAuthenticator.cs

@@ -1,5 +1,5 @@
 namespace RestSharp.Authenticators;
 
 public interface IAuthenticator {
-    void Authenticate(RestClient client, IRestRequest request);
+    ValueTask Authenticate(RestClient client, IRestRequest request);
 }

src/RestSharp/Authenticators/IAuthenticator.cs

@@ -5,7 +5,7 @@ namespace RestSharp.Authenticators;
 /// <remarks>https://tools.ietf.org/html/draft-ietf-oauth-json-web-token</remarks>
 /// </summary>
 public class JwtAuthenticator : IAuthenticator {
-    string _authHeader;
+    string _authHeader = null!;
 
     // ReSharper disable once IntroduceOptionalParameters.Global
     public JwtAuthenticator(string accessToken) => SetBearerToken(accessToken);
@@ -14,12 +14,11 @@ public class JwtAuthenticator : IAuthenticator {
     /// Set the new bearer token so the request gets the new header value
     /// </summary>
     /// <param name="accessToken"></param>
-    public void SetBearerToken(string accessToken) {
-        Ensure.NotEmpty(accessToken, nameof(accessToken));
+    [PublicAPI]
+    public void SetBearerToken(string accessToken) => _authHeader = $"Bearer {Ensure.NotEmpty(accessToken, nameof(accessToken))}";
 
-        _authHeader = $"Bearer {accessToken}";
+    public ValueTask Authenticate(RestClient client, IRestRequest request) {
+        request.AddOrUpdateParameter("Authorization", _authHeader, ParameterType.HttpHeader);
+        return default;
     }
-
-    public void Authenticate(RestClient client, IRestRequest request)
-        => request.AddOrUpdateParameter("Authorization", _authHeader, ParameterType.HttpHeader);
 }

src/RestSharp/Authenticators/JwtAuthenticator.cs

@@ -39,7 +39,7 @@ public class OAuth1Authenticator : IAuthenticator {
 
     internal virtual string ClientPassword { get; set; }
 
-    public void Authenticate(RestClient client, IRestRequest request) {
+    public ValueTask Authenticate(RestClient client, IRestRequest request) {
         var workflow = new OAuthWorkflow {
             ConsumerKey        = ConsumerKey,
             ConsumerSecret     = ConsumerSecret,
@@ -57,6 +57,7 @@ public void Authenticate(RestClient client, IRestRequest request) {
         };
 
         AddOAuthData(client, request, workflow);
+        return default;
     }
 
     public static OAuth1Authenticator ForRequestToken(

src/RestSharp/Authenticators/OAuth/OAuth1Authenticator.cs

@@ -23,6 +23,6 @@ public OAuth2AuthorizationRequestHeaderAuthenticator(string accessToken)
     /// <param name="tokenType">The token type.</param>
     public OAuth2AuthorizationRequestHeaderAuthenticator(string accessToken, string tokenType) : base(accessToken) => _tokenType = tokenType;
 
-    protected override Parameter GetAuthenticationParameter(string accessToken)
-        => new("Authorization", $"{_tokenType} {accessToken}", ParameterType.HttpHeader);
+    protected override ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
+        => new(new Parameter("Authorization", $"{_tokenType} {accessToken}", ParameterType.HttpHeader));
 }

src/RestSharp/Authenticators/OAuth2/OAuth2AuthorizationRequestHeaderAuthenticator.cs

@@ -14,5 +14,6 @@ public class OAuth2UriQueryParameterAuthenticator : AuthenticatorBase
     /// <param name="accessToken">The access token.</param>
     public OAuth2UriQueryParameterAuthenticator(string accessToken) : base(accessToken) { }
 
-    protected override Parameter GetAuthenticationParameter(string accessToken) => new("oauth_token", accessToken, ParameterType.GetOrPost);
+    protected override ValueTask<Parameter> GetAuthenticationParameter(string accessToken) 
+        => new(new Parameter("oauth_token", accessToken, ParameterType.GetOrPost));
 }