Merge branch 'dev' of github.com:restsharp/RestSharp into dev

alexeyzimarev · alexeyzimarev · commit 9d71791d0d09 · 2020-09-30T14:27:37.000+02:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/docs/getting-started/getting-started.md b/docs/getting-started/getting-started.md
@@ -69,7 +69,7 @@ For example, only you'd only need these lines to make a request with JSON body:
 ```csharp
 var request = new RestRequest("address/update")
     .AddJsonBody(updatedAddress);
-var respose = await client.PostAsync<AddressUpdateResponse>(request);
+var response = await client.PostAsync<AddressUpdateResponse>(request);
 ```
 
 ## Response
diff --git a/src/RestSharp/Authenticators/OAuth/Extensions/OAuthExtensions.cs b/src/RestSharp/Authenticators/OAuth/Extensions/OAuthExtensions.cs
@@ -22,7 +22,7 @@ internal static class OAuthExtensions
     {
         public static string ToRequestValue(this OAuthSignatureMethod signatureMethod)
         {
-            var value    = signatureMethod.ToString().ToUpper();
+            var value    = signatureMethod.ToString().ToUpperInvariant();
             var shaIndex = value.IndexOf("SHA", StringComparison.Ordinal);
 
             return shaIndex > -1 ? value.Insert(shaIndex, "-") : value;
diff --git a/src/RestSharp/Authenticators/OAuth/OAuthTools.cs b/src/RestSharp/Authenticators/OAuth/OAuthTools.cs
@@ -191,7 +191,7 @@ static string ConstructRequestUrl(Uri url)
         public static string ConcatenateRequestElements(string method, string url, WebPairCollection parameters)
         {
             // Separating &'s are not URL encoded
-            var requestMethod     = method.ToUpper().Then("&");
+            var requestMethod     = method.ToUpperInvariant().Then("&");
             var requestUrl        = UrlEncodeRelaxed(ConstructRequestUrl(url.AsUri())).Then("&");
             var requestParameters = UrlEncodeRelaxed(NormalizeRequestParameters(parameters));
 
diff --git a/src/RestSharp/Authenticators/OAuth/OAuthWorkflow.cs b/src/RestSharp/Authenticators/OAuth/OAuthWorkflow.cs
@@ -10,7 +10,7 @@
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //   See the License for the specific language governing permissions and
-//   limitations under the License. 
+//   limitations under the License.
 
 using System;
 using System.Collections.Generic;
@@ -215,7 +215,7 @@ WebPairCollection GenerateAuthParameters(string timestamp, string nonce)
                 new WebPair("oauth_version", Version ?? "1.0")
             };
 
-            if (!Token.IsEmpty()) authParameters.Add(new WebPair("oauth_token", Token));
+            if (!Token.IsEmpty()) authParameters.Add(new WebPair("oauth_token", Token, true));
 
             if (!CallbackUrl.IsEmpty()) authParameters.Add(new WebPair("oauth_callback", CallbackUrl, true));
 
diff --git a/src/RestSharp/Extensions/StringExtensions.cs b/src/RestSharp/Extensions/StringExtensions.cs
@@ -236,14 +236,15 @@ string CaseWord(string word)
         /// <param name="culture"></param>
         /// <returns>String</returns>
         public static string ToCamelCase(this string lowercaseAndUnderscoredWord, CultureInfo culture)
-            => MakeInitialLowerCase(ToPascalCase(lowercaseAndUnderscoredWord, culture));
+            => MakeInitialLowerCase(ToPascalCase(lowercaseAndUnderscoredWord, culture), culture);
 
         /// <summary>
         /// Convert the first letter of a string to lower case
         /// </summary>
         /// <param name="word">String to convert</param>
+        /// <param name="culture"></param>
         /// <returns>string</returns>
-        public static string MakeInitialLowerCase(this string word) => string.Concat(word.Substring(0, 1).ToLower(), word.Substring(1));
+        public static string MakeInitialLowerCase(this string word, CultureInfo culture) => string.Concat(word.Substring(0, 1).ToLower(culture), word.Substring(1));
 
         /// <summary>
         /// Add underscores to a pascal-cased string
diff --git a/src/RestSharp/Http.cs b/src/RestSharp/Http.cs
@@ -36,7 +36,7 @@ public partial class Http : IHttp
     {
         const string LineBreak = "\r\n";
 
-        public string FormBoundary { get; } = "---------" + Guid.NewGuid().ToString().ToUpper();
+        public string FormBoundary { get; } = "---------" + Guid.NewGuid().ToString().ToUpperInvariant();
 
         // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
         static readonly Regex AddRangeRegex = new Regex("(\\w+)=(\\d+)-(\\d+)$");
@@ -53,7 +53,7 @@ public Http()
 
             void AddSyncHeaderActions()
             {
-                _restrictedHeaderActions.Add("Connection", (r, v) => { r.KeepAlive = v.ToLower().Contains("keep-alive"); });
+                _restrictedHeaderActions.Add("Connection", (r, v) => { r.KeepAlive = v.ToLowerInvariant().Contains("keep-alive"); });
                 _restrictedHeaderActions.Add("Content-Length", (r, v) => r.ContentLength = Convert.ToInt64(v));
                 _restrictedHeaderActions.Add("Expect", (r, v) => r.Expect                = v);
 
diff --git a/src/RestSharp/RestClient.cs b/src/RestSharp/RestClient.cs
@@ -268,7 +268,7 @@ void AddHandler(Func<IDeserializer> deserializerFactory, params string[] content
 
         void DoBuildUriValidations(IRestRequest request)
         {
-            if (BaseUrl == null && !request.Resource.ToLower().StartsWith("http"))
+            if (BaseUrl == null && !request.Resource.ToLowerInvariant().StartsWith("http"))
                 throw new ArgumentOutOfRangeException(
                     nameof(request),
                     "Request resource doesn't contain a valid scheme for an empty client base URL"
@@ -547,8 +547,8 @@ IRestResponse<T> Deserialize<T>(IRestRequest request, IRestResponse raw)
                 response = raw.ToAsyncResponse<T>();
 
                 // Only attempt to deserialize if the request has not errored due
-                // to a transport or framework exception.  HTTP errors should attempt to 
-                // be deserialized 
+                // to a transport or framework exception.  HTTP errors should attempt to
+                // be deserialized
                 if (response.ErrorException == null)
                 {
                     var func    = GetHandler(raw.ContentType);
diff --git a/src/RestSharp/Serializers/SerializeAsAttribute.cs b/src/RestSharp/Serializers/SerializeAsAttribute.cs
@@ -76,7 +76,7 @@ public string TransformName(string input)
             {
                 NameStyle.CamelCase  => name.ToCamelCase(Culture),
                 NameStyle.PascalCase => name.ToPascalCase(Culture),
-                NameStyle.LowerCase  => name.ToLower(),
+                NameStyle.LowerCase  => name.ToLower(Culture),
                 _                    => input
             };
         }
diff --git a/src/RestSharp/Serializers/Xml/XmlDeserializer.cs b/src/RestSharp/Serializers/Xml/XmlDeserializer.cs
@@ -182,7 +182,7 @@ protected virtual object Map(object x, XElement root)
                 if (asType == typeof(bool))
                 {
                     var toConvert = value.ToString()
-                        .ToLower();
+                        .ToLower(Culture);
 
                     prop.SetValue(x, XmlConvert.ToBoolean(toConvert), null);
                 }
@@ -366,7 +366,7 @@ object HandleListDerivative(XElement root, string propName, Type type)
 
             if (!elements.Any())
             {
-                var lowerName = name.ToLower().AsNamespaced(Namespace);
+                var lowerName = name.ToLower(Culture).AsNamespaced(Namespace);
 
                 elements = root.Descendants(lowerName).ToList();
             }
@@ -385,7 +385,7 @@ object HandleListDerivative(XElement root, string propName, Type type)
 
             if (!elements.Any())
             {
-                var lowerName = name.ToLower().AsNamespaced(Namespace);
+                var lowerName = name.ToLower(Culture).AsNamespaced(Namespace);
 
                 elements = root.Descendants()
                     .Where(e => e.Name.LocalName.RemoveUnderscoresAndDashes() == lowerName)
@@ -448,7 +448,7 @@ protected virtual object GetValueFromXml(XElement root, XName name, PropertyInfo
 
         protected virtual XElement GetElementByName(XElement root, XName name)
         {
-            var lowerName = name.LocalName.ToLower().AsNamespaced(name.NamespaceName);
+            var lowerName = name.LocalName.ToLower(Culture).AsNamespaced(name.NamespaceName);
             var camelName = name.LocalName.ToCamelCase(Culture).AsNamespaced(name.NamespaceName);
 
             if (root.Element(name) != null)
@@ -487,7 +487,7 @@ protected virtual XAttribute GetAttributeByName(XElement root, XName name, bool
                 : new List<XName>
                 {
                     name.LocalName,
-                    name.LocalName.ToLower()
+                    name.LocalName.ToLower(Culture)
                         .AsNamespaced(name.NamespaceName),
                     name.LocalName.ToCamelCase(Culture)
                         .AsNamespaced(name.NamespaceName)
diff --git a/test/RestSharp.Tests/OAuth1AuthenticatorTests.cs b/test/RestSharp.Tests/OAuth1AuthenticatorTests.cs
@@ -140,5 +140,31 @@ public void Authenticate_ShouldAddSignatureToRequestAsSeparateParameters_OnUrlOr
                 )
             );
         }
+
+        [Test]
+        [TestCase(OAuthType.AccessToken, "Token", "Token")]
+        [TestCase(OAuthType.ProtectedResource, "Token", "Token")]
+        [TestCase(OAuthType.AccessToken, "SVyDD+RsFzSoZChk=", "SVyDD%2BRsFzSoZChk%3D")]
+        [TestCase(OAuthType.ProtectedResource, "SVyDD+RsFzSoZChk=", "SVyDD%2BRsFzSoZChk%3D")]
+        public void Authenticate_ShouldEncodeOAuthTokenParameter(OAuthType type,string value, string expected)
+        {
+            // Arrange
+            const string url = "https://no-query.string";
+
+            var client  = new RestClient(url);
+            var request = new RestRequest();
+            _authenticator.Type  = type;
+            _authenticator.Token = value;
+
+            // Act
+            _authenticator.Authenticate(client, request);
+
+            // Assert
+            var authParameter = request.Parameters.Single(x => x.Name == "Authorization");
+            var authHeader         = (string) authParameter.Value;
+
+            Assert.IsNotNull(authHeader);
+            Assert.IsTrue(authHeader.Contains($"oauth_token=\"{expected}\""));
+        }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal static class OAuthExtensions`
`22`	`22`	`{`
`23`	`23`	`public static string ToRequestValue(this OAuthSignatureMethod signatureMethod)`
`24`	`24`	`{`
`25`		`- var value = signatureMethod.ToString().ToUpper();`
	`25`	`+ var value = signatureMethod.ToString().ToUpperInvariant();`
`26`	`26`	`var shaIndex = value.IndexOf("SHA", StringComparison.Ordinal);`
`27`	`27`
`28`	`28`	`return shaIndex > -1 ? value.Insert(shaIndex, "-") : value;`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ static string ConstructRequestUrl(Uri url)`
`191`	`191`	`public static string ConcatenateRequestElements(string method, string url, WebPairCollection parameters)`
`192`	`192`	`{`
`193`	`193`	`// Separating &'s are not URL encoded`
`194`		`- var requestMethod = method.ToUpper().Then("&");`
	`194`	`+ var requestMethod = method.ToUpperInvariant().Then("&");`
`195`	`195`	`var requestUrl = UrlEncodeRelaxed(ConstructRequestUrl(url.AsUri())).Then("&");`
`196`	`196`	`var requestParameters = UrlEncodeRelaxed(NormalizeRequestParameters(parameters));`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public partial class Http : IHttp`
`36`	`36`	`{`
`37`	`37`	`const string LineBreak = "\r\n";`
`38`	`38`
`39`		`- public string FormBoundary { get; } = "---------" + Guid.NewGuid().ToString().ToUpper();`
	`39`	`+ public string FormBoundary { get; } = "---------" + Guid.NewGuid().ToString().ToUpperInvariant();`
`40`	`40`
`41`	`41`	`// ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable`
`42`	`42`	`static readonly Regex AddRangeRegex = new Regex("(\\w+)=(\\d+)-(\\d+)$");`
`@@ -53,7 +53,7 @@ public Http()`
`53`	`53`
`54`	`54`	`void AddSyncHeaderActions()`
`55`	`55`	`{`
`56`		`- _restrictedHeaderActions.Add("Connection", (r, v) => { r.KeepAlive = v.ToLower().Contains("keep-alive"); });`
	`56`	`+ _restrictedHeaderActions.Add("Connection", (r, v) => { r.KeepAlive = v.ToLowerInvariant().Contains("keep-alive"); });`
`57`	`57`	`_restrictedHeaderActions.Add("Content-Length", (r, v) => r.ContentLength = Convert.ToInt64(v));`
`58`	`58`	`_restrictedHeaderActions.Add("Expect", (r, v) => r.Expect = v);`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public string TransformName(string input)`
`76`	`76`	`{`
`77`	`77`	`NameStyle.CamelCase => name.ToCamelCase(Culture),`
`78`	`78`	`NameStyle.PascalCase => name.ToPascalCase(Culture),`
`79`		`- NameStyle.LowerCase => name.ToLower(),`
	`79`	`+ NameStyle.LowerCase => name.ToLower(Culture),`
`80`	`80`	`_ => input`
`81`	`81`	`};`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ protected virtual object Map(object x, XElement root)`
`182`	`182`	`if (asType == typeof(bool))`
`183`	`183`	`{`
`184`	`184`	`var toConvert = value.ToString()`
`185`		`- .ToLower();`
	`185`	`+ .ToLower(Culture);`
`186`	`186`
`187`	`187`	`prop.SetValue(x, XmlConvert.ToBoolean(toConvert), null);`
`188`	`188`	`}`
`@@ -366,7 +366,7 @@ object HandleListDerivative(XElement root, string propName, Type type)`
`366`	`366`
`367`	`367`	`if (!elements.Any())`
`368`	`368`	`{`
`369`		`- var lowerName = name.ToLower().AsNamespaced(Namespace);`
	`369`	`+ var lowerName = name.ToLower(Culture).AsNamespaced(Namespace);`
`370`	`370`
`371`	`371`	`elements = root.Descendants(lowerName).ToList();`
`372`	`372`	`}`
`@@ -385,7 +385,7 @@ object HandleListDerivative(XElement root, string propName, Type type)`
`385`	`385`
`386`	`386`	`if (!elements.Any())`
`387`	`387`	`{`
`388`		`- var lowerName = name.ToLower().AsNamespaced(Namespace);`
	`388`	`+ var lowerName = name.ToLower(Culture).AsNamespaced(Namespace);`
`389`	`389`
`390`	`390`	`elements = root.Descendants()`
`391`	`391`	`.Where(e => e.Name.LocalName.RemoveUnderscoresAndDashes() == lowerName)`
`@@ -448,7 +448,7 @@ protected virtual object GetValueFromXml(XElement root, XName name, PropertyInfo`
`448`	`448`
`449`	`449`	`protected virtual XElement GetElementByName(XElement root, XName name)`
`450`	`450`	`{`
`451`		`- var lowerName = name.LocalName.ToLower().AsNamespaced(name.NamespaceName);`
	`451`	`+ var lowerName = name.LocalName.ToLower(Culture).AsNamespaced(name.NamespaceName);`
`452`	`452`	`var camelName = name.LocalName.ToCamelCase(Culture).AsNamespaced(name.NamespaceName);`
`453`	`453`
`454`	`454`	`if (root.Element(name) != null)`
`@@ -487,7 +487,7 @@ protected virtual XAttribute GetAttributeByName(XElement root, XName name, bool`
`487`	`487`	`: new List<XName>`
`488`	`488`	`{`
`489`	`489`	`name.LocalName,`
`490`		`- name.LocalName.ToLower()`
	`490`	`+ name.LocalName.ToLower(Culture)`
`491`	`491`	`.AsNamespaced(name.NamespaceName),`
`492`	`492`	`name.LocalName.ToCamelCase(Culture)`
`493`	`493`	`.AsNamespaced(name.NamespaceName)`