Merge branch 'dev' into v109

# Conflicts:
#	src/RestSharp/Request/RestRequestExtensions.cs

Author: alexeyzimarev

docs/error-handling.md

@@ -36,9 +36,8 @@ Below you can find how different extensions deal with errors. Note that function
 | `ExecuteGetAsync`     | No               |
 | `ExecuteGetAsync<T>`  | No               |
 | `ExecutePostAsync`    | No               |
-| `ExecutePutAsync`     | No               |
-| `ExecuteGetAsync<T>`  | No               |
 | `ExecutePostAsync<T>` | No               |
+| `ExecutePutAsync`     | No               |
 | `ExecutePutAsync<T>`  | No               |
 | `GetAsync`            | Yes              |
 | `GetAsync<T>`         | Yes              |

docs/usage.md

@@ -33,7 +33,7 @@ record TokenResponse {
 
 Next, we create the authenticator itself. It needs the API key and API key secret to call the token endpoint using basic HTTP authentication. In addition, we can extend the list of parameters with the base URL to convert it to a more generic OAuth2 authenticator.
 
-The easiest way to create an authenticator is to inherit from the `AuthanticatorBase` base class:
+The easiest way to create an authenticator is to inherit from the `AuthenticatorBase` base class:
 
 ```csharp
 public class TwitterAuthenticator : AuthenticatorBase {

docs/v107/README.md

@@ -216,7 +216,7 @@ mockHttp.When("http://localhost/api/user/*")
         .Respond("application/json", "{'name' : 'Test McGee'}"); // Respond with JSON
 
 // Instantiate the client normally, but replace the message handler
-var client = new RestClient(...) { ConfigureMessageHandler = _ => mockHttp };
+var client = new RestClient(new RestClientOptions { ConfigureMessageHandler = _ => mockHttp });
 
 var request = new RestRequest("http://localhost/api/user/1234");
 var response = await client.GetAsync(request);

src/Directory.Build.props

@@ -21,7 +21,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
         <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All"/>
     </ItemGroup>
     <ItemGroup>
         <None Include="$(RepoRoot)\restsharp.png" Pack="true" PackagePath="\"/>

src/RestSharp.Serializers.NewtonsoftJson/RestSharp.Serializers.NewtonsoftJson.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\RestSharp\RestSharp.csproj"/>

src/RestSharp/Parameters/ObjectParser.cs

@@ -18,12 +18,12 @@
 namespace RestSharp;
 
 static class ObjectParser {
-    public static IEnumerable<(string Name, string? Value)> GetProperties(this object obj, params string[] includedProperties) {
+    public static IEnumerable<ParsedParameter> GetProperties(this object obj, params string[] includedProperties) {
         // automatically create parameters from object props
         var type  = obj.GetType();
         var props = type.GetProperties();
 
-        var properties = new List<(string Name, string? Value)>();
+        var properties = new List<ParsedParameter>();
 
         foreach (var prop in props.Where(x => IsAllowedProperty(x.Name))) {
             var val = prop.GetValue(obj, null);
@@ -38,14 +38,14 @@ static class ObjectParser {
 
         string? ParseValue(string? format, object? value) => format == null ? value?.ToString() : string.Format($"{{0:{format}}}", value);
 
-        IEnumerable<(string, string?)> GetArray(PropertyInfo propertyInfo, object? value) {
+        IEnumerable<ParsedParameter> GetArray(PropertyInfo propertyInfo, object? value) {
             var elementType = propertyInfo.PropertyType.GetElementType();
             var array       = (Array)value!;
 
             var attribute = propertyInfo.GetCustomAttribute<RequestPropertyAttribute>();
-            var name      = attribute?.Name ?? propertyInfo.Name;
-
+            var name      = attribute?.Name           ?? propertyInfo.Name;
             var queryType = attribute?.ArrayQueryType ?? RequestArrayQueryType.CommaSeparated;
+            var encode    = attribute?.Encode         ?? true;
 
             if (array.Length > 0 && elementType != null) {
                 // convert the array to an array of strings
@@ -54,21 +54,20 @@ static class ObjectParser {
                     .Select(item => ParseValue(attribute?.Format, item));
 
                 return queryType switch {
-                    RequestArrayQueryType.CommaSeparated  => new (string, string?)[] { (name, string.Join(",", values)) },
-                    RequestArrayQueryType.ArrayParameters => values.Select(x => ($"{name}[]", x)),
+                    RequestArrayQueryType.CommaSeparated  => new[] { new ParsedParameter(name, string.Join(",", values), encode) },
+                    RequestArrayQueryType.ArrayParameters => values.Select(x => new ParsedParameter($"{name}[]", x, encode)),
                     _                                     => throw new ArgumentOutOfRangeException()
                 };
-                    
             }
 
-            return new (string, string?)[] { (name, null) };
+            return new ParsedParameter[] { new(name, null, encode) };
         }
 
-        (string, string?) GetValue(PropertyInfo propertyInfo, object? value) {
+        ParsedParameter GetValue(PropertyInfo propertyInfo, object? value) {
             var attribute = propertyInfo.GetCustomAttribute<RequestPropertyAttribute>();
             var name      = attribute?.Name ?? propertyInfo.Name;
             var val       = ParseValue(attribute?.Format, value);
-            return (name, val);
+            return new ParsedParameter(name, val, attribute?.Encode ?? true);
         }
 
         bool IsAllowedProperty(string propertyName)
@@ -78,11 +77,14 @@ bool IsAllowedProperty(string propertyName)
     }
 }
 
+record ParsedParameter(string Name, string? Value, bool Encode);
+
 [AttributeUsage(AttributeTargets.Property)]
 public class RequestPropertyAttribute : Attribute {
     public string?               Name           { get; set; }
     public string?               Format         { get; set; }
     public RequestArrayQueryType ArrayQueryType { get; set; } = RequestArrayQueryType.CommaSeparated;
+    public bool                  Encode         { get; set; } = true;
 }
 
 public enum RequestArrayQueryType { CommaSeparated, ArrayParameters }

src/RestSharp/Request/RestRequestExtensions.cs

@@ -284,19 +284,19 @@ public static RestRequest AddFile(
     /// <param name="request">Request instance</param>
     /// <param name="name">Parameter name</param>
     /// <param name="bytes">File content as bytes</param>
-    /// <param name="filename">File name</param>
+    /// <param name="fileName">File name</param>
     /// <param name="contentType">Optional: content type. Default is "application/octet-stream"</param>
     /// <param name="options">File parameter header options</param>
     /// <returns></returns>
     public static RestRequest AddFile(
         this RestRequest      request,
         string                name,
         byte[]                bytes,
-        string                filename,
+        string                fileName,
         ContentType?          contentType = null,
         FileParameterOptions? options     = null
     )
-        => request.AddFile(FileParameter.Create(name, bytes, filename, contentType, options));
+        => request.AddFile(FileParameter.Create(name, bytes, fileName, contentType, options));
 
     /// <summary>
     /// Adds a file attachment to the request, where the file content will be retrieved from a given stream 
@@ -408,8 +408,8 @@ public static RestRequest AddXmlBody<T>(this RestRequest request, T obj, Content
     public static RestRequest AddObject<T>(this RestRequest request, T obj, params string[] includedProperties) where T : class {
         var props = obj.GetProperties(includedProperties);
 
-        foreach (var (name, value) in props) {
-            request.AddParameter(name, value);
+        foreach (var prop in props) {
+            request.AddParameter(prop.Name, prop.Value, prop.Encode);
         }
 
         return request;

src/RestSharp/Response/RestResponse.cs

@@ -91,7 +91,7 @@ async Task<RestResponse> GetDefaultResponse() {
                 ContentType         = httpResponse.Content.Headers.ContentType?.MediaType,
                 ResponseStatus      = calculateResponseStatus(httpResponse),
                 ErrorException      = httpResponse.MaybeException(),
-                ResponseUri         = httpResponse.RequestMessage!.RequestUri,
+                ResponseUri         = httpResponse.RequestMessage?.RequestUri,
                 Server              = httpResponse.Headers.Server.ToString(),
                 StatusCode          = httpResponse.StatusCode,
                 StatusDescription   = httpResponse.ReasonPhrase,

src/RestSharp/RestClient.Async.cs

@@ -81,6 +81,11 @@ static RestResponse GetErrorResponse(RestRequest request, Exception exception, C
     async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationToken cancellationToken) {
         Ensure.NotNull(request, nameof(request));
 
+        // Make sure we are not disposed of when someone tries to call us!
+        if (_disposed) {
+            throw new ObjectDisposedException(nameof(RestClient));
+        }
+
         using var requestContent = new RequestContent(this, request);
 
         var authenticator = request.Authenticator ?? Options.Authenticator;

src/RestSharp/RestClient.Extensions.Json.cs

@@ -47,11 +47,13 @@ public static partial class RestClientExtensions {
         object            parameters,
         CancellationToken cancellationToken = default
     ) {
-        var props = parameters.GetProperties();
+        var props   = parameters.GetProperties();
         var request = new RestRequest(resource);
 
-        foreach (var (name, value) in props) {
-            Parameter parameter = resource.Contains($"{name}") ? new UrlSegmentParameter(name, value!) : new QueryParameter(name, value);
+        foreach (var prop in props) {
+            Parameter parameter = resource.Contains($"{prop.Name}")
+                ? new UrlSegmentParameter(prop.Name, prop.Value!, prop.Encode)
+                : new QueryParameter(prop.Name, prop.Value, prop.Encode);
             request.AddParameter(parameter);
         }
 
@@ -141,4 +143,4 @@ public static async Task<HttpStatusCode> PutJsonAsync<TRequest>(
         var response    = await client.PutAsync(restRequest, cancellationToken).ConfigureAwait(false);
         return response.StatusCode;
     }
-}
+}