All tests pass

Author: alexeyzimarev

src/RestSharp.Serializers.NewtonsoftJson/RestClientExtensions.cs

@@ -7,14 +7,14 @@ public static class RestClientExtensions {
     /// </summary>
     /// <param name="client"></param>
     /// <returns></returns>
-    public static IRestClient UseNewtonsoftJson(this IRestClient client) => client.UseSerializer(() => new JsonNetSerializer());
+    public static RestClient UseNewtonsoftJson(this RestClient client) => client.UseSerializer(() => new JsonNetSerializer());
 
     /// <summary>
     /// Use Newtonsoft.Json serializer with custom settings
     /// </summary>
     /// <param name="client"></param>
     /// <param name="settings">Newtonsoft.Json serializer settings</param>
     /// <returns></returns>
-    public static IRestClient UseNewtonsoftJson(this IRestClient client, JsonSerializerSettings settings)
+    public static RestClient UseNewtonsoftJson(this RestClient client, JsonSerializerSettings settings)
         => client.UseSerializer(() => new JsonNetSerializer(settings));
 }

src/RestSharp.Serializers.SystemTextJson/RestSharp.Serializers.SystemTextJson.csproj

@@ -7,6 +7,6 @@ public abstract class AuthenticatorBase : IAuthenticator {
 
     protected abstract ValueTask<Parameter> GetAuthenticationParameter(string accessToken);
 
-    public async ValueTask Authenticate(RestClient client, IRestRequest request)
+    public async ValueTask Authenticate(RestClient client, RestRequest request)
         => request.AddOrUpdateParameter(await GetAuthenticationParameter(Token));
 }

src/RestSharp/Authenticators/AuthenticatorBase.cs

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

src/RestSharp/Authenticators/IAuthenticator.cs

@@ -17,7 +17,7 @@ public class JwtAuthenticator : IAuthenticator {
     [PublicAPI]
     public void SetBearerToken(string accessToken) => _authHeader = $"Bearer {Ensure.NotEmpty(accessToken, nameof(accessToken))}";
 
-    public ValueTask Authenticate(RestClient client, IRestRequest request) {
+    public ValueTask Authenticate(RestClient client, RestRequest request) {
         request.AddOrUpdateParameter("Authorization", _authHeader, ParameterType.HttpHeader);
         return default;
     }

src/RestSharp/Authenticators/JwtAuthenticator.cs

@@ -39,7 +39,7 @@ public class OAuth1Authenticator : IAuthenticator {
 
     internal virtual string ClientPassword { get; set; }
 
-    public ValueTask Authenticate(RestClient client, IRestRequest request) {
+    public ValueTask Authenticate(RestClient client, RestRequest request) {
         var workflow = new OAuthWorkflow {
             ConsumerKey        = ConsumerKey,
             ConsumerSecret     = ConsumerSecret,
@@ -220,7 +220,7 @@ public static OAuth1Authenticator ForProtectedResource(
             TokenSecret        = accessTokenSecret
         };
 
-    void AddOAuthData(RestClient client, IRestRequest request, OAuthWorkflow workflow) {
+    void AddOAuthData(RestClient client, RestRequest request, OAuthWorkflow workflow) {
         var requestUrl = client.BuildUriWithoutQueryParameters(request);
 
         if (requestUrl.Contains('?'))
@@ -250,7 +250,7 @@ void AddOAuthData(RestClient client, IRestRequest request, OAuthWorkflow workflo
                 ? x => BaseQuery(x) && x.Name.StartsWith("oauth_")
                 : (Func<Parameter, bool>)BaseQuery;
 
-        parameters.AddRange(client.Options.DefaultParameters.Where(query).ToWebParameters());
+        parameters.AddRange(client.DefaultParameters.Where(query).ToWebParameters());
         parameters.AddRange(request.Parameters.Where(query).ToWebParameters());
 
         if (Type == OAuthType.RequestToken)

src/RestSharp/Authenticators/OAuth/OAuth1Authenticator.cs

@@ -1,23 +1,28 @@
-namespace RestSharp.Extensions;
+using System;
+
+namespace RestSharp.Extensions;
 
 /// <summary>
 /// Extension method overload!
 /// </summary>
-public static class MiscExtensions {
+static class MiscExtensions {
     /// <summary>
     /// Read a stream into a byte array
     /// </summary>
     /// <param name="input">Stream to read</param>
+    /// <param name="cancellationToken"></param>
     /// <returns>byte[]</returns>
-    [Obsolete("This method will be removed soon. If you use it, please copy the code to your project.")]
-    public static byte[] ReadAsBytes(this Stream input) {
+    public static async Task<byte[]> ReadAsBytes(this Stream input, CancellationToken cancellationToken) {
         var buffer = new byte[16 * 1024];
 
         using var ms = new MemoryStream();
 
         int read;
-
-        while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
+#if NETSTANDARD
+        while ((read = await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0)
+#else
+        while ((read = await input.ReadAsync(buffer, cancellationToken)) > 0)
+#endif
             ms.Write(buffer, 0, read);
 
         return ms.ToArray();

src/RestSharp/Extensions/MiscExtensions.cs

@@ -158,7 +158,7 @@ static string AddSpaces(this string pascalCasedWord)
 
     internal static bool IsEmpty(this string? value) => string.IsNullOrWhiteSpace(value);
 
-    internal static bool IsNotEmpty(this string value) => !string.IsNullOrWhiteSpace(value);
+    internal static bool IsNotEmpty(this string? value) => !string.IsNullOrWhiteSpace(value);
 
     /// <summary>
     /// Return possible variants of a name for name matching.