Some major code cleanup

Author: alexeyzimarev

src/RestSharp/Authenticators/AuthenticatorBase.cs

@@ -0,0 +1,27 @@
+//   Copyright © 2009-2020 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   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. 
+
+namespace RestSharp.Authenticators
+{
+    public abstract class AuthenticatorBase : IAuthenticator
+    {
+        protected AuthenticatorBase(string token) => Token = token;
+
+        protected string Token { get; }
+
+        protected abstract Parameter GetAuthenticationParameter(string accessToken);
+
+        public void Authenticate(IRestClient client, IRestRequest request) => request.AddOrUpdateParameter(GetAuthenticationParameter(Token));
+    }
+}

src/RestSharp/Authenticators/HttpBasicAuthenticator.cs

@@ -29,34 +29,19 @@ 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>
-    public class HttpBasicAuthenticator : IAuthenticator
+    public class HttpBasicAuthenticator : AuthenticatorBase
     {
-        readonly string _authHeader;
-
         public HttpBasicAuthenticator(string username, string password)
-            : this(username, password, Encoding.UTF8)
-        {
-        }
+            : this(username, password, Encoding.UTF8) { }
 
         public HttpBasicAuthenticator(string username, string password, Encoding encoding)
-        {
-            var token = Convert.ToBase64String(encoding.GetBytes($"{username}:{password}"));
-            
-            _authHeader = $"Basic {token}";
-        }
-
-        public void Authenticate(IRestClient client, IRestRequest request)
-        {
-            // NetworkCredentials always makes two trips, even if with PreAuthenticate,
-            // it is also unsafe for many partial trust scenarios
-            // request.Credentials = Credentials;
-            // thanks TweetSharp!
+            : base(GetHeader(username, password, encoding)) { }
 
-            // request.Credentials = new NetworkCredential(_username, _password);
+        static string GetHeader(string username, string password, Encoding encoding)
+            => Convert.ToBase64String(encoding.GetBytes($"{username}:{password}"));
 
-            // only add the Authorization parameter if it hasn't been added by a previous Execute
-            if (!request.Parameters.Any(p => "Authorization".Equals(p.Name, StringComparison.OrdinalIgnoreCase)))
-                request.AddParameter("Authorization", _authHeader, ParameterType.HttpHeader);
-        }
+        // return ;
+        protected override Parameter GetAuthenticationParameter(string accessToken)
+            => new Parameter("Authorization", $"Basic {accessToken}", ParameterType.HttpHeader);
     }
 }

src/RestSharp/Authenticators/JwtAuthenticator.cs

@@ -17,8 +17,6 @@
 
 #endregion
 
-using System;
-using System.Linq;
 using RestSharp.Validation;
 
 namespace RestSharp.Authenticators
@@ -30,18 +28,9 @@ namespace RestSharp.Authenticators
     public class JwtAuthenticator : IAuthenticator
     {
         string _authHeader;
-        bool _forceTokenUpdate;
 
         // ReSharper disable once IntroduceOptionalParameters.Global
-        public JwtAuthenticator(string accessToken) : this(accessToken, false)
-        {
-        }
-
-        public JwtAuthenticator(string accessToken, bool forceTokenUpdate)
-        {
-            SetBearerToken(accessToken);
-            _forceTokenUpdate = forceTokenUpdate;
-        }
+        public JwtAuthenticator(string accessToken) => SetBearerToken(accessToken);
 
         /// <summary>
         /// Set the new bearer token so the request gets the new header value
@@ -52,21 +41,9 @@ public void SetBearerToken(string accessToken)
             Ensure.NotEmpty(accessToken, nameof(accessToken));
 
             _authHeader = $"Bearer {accessToken}";
-            _forceTokenUpdate = true;
         }
 
         public void Authenticate(IRestClient client, IRestRequest request)
-        {
-            if (_forceTokenUpdate)
-            {
-                request.AddOrUpdateParameter("Authorization", _authHeader, ParameterType.HttpHeader);
-                return;
-            }
-
-            // only add the Authorization parameter if it hasn't been added by a previous Execute
-            if (!request.Parameters.Any(p => p.Type.Equals(ParameterType.HttpHeader) &&
-                                             p.Name.Equals("Authorization", StringComparison.OrdinalIgnoreCase)))
-                request.AddParameter("Authorization", _authHeader, ParameterType.HttpHeader);
-        }
+            => request.AddOrUpdateParameter("Authorization", _authHeader, ParameterType.HttpHeader);
     }
 }

src/RestSharp/Authenticators/NtlmAuthenticator.cs

@@ -26,13 +26,12 @@ namespace RestSharp.Authenticators
     /// </summary>
     public class NtlmAuthenticator : IAuthenticator
     {
-        readonly ICredentials credentials;
+        readonly ICredentials _credentials;
 
         /// <summary>
         ///     Authenticate with the credentials of the currently logged in user
         /// </summary>
-        public NtlmAuthenticator()
-            : this(CredentialCache.DefaultCredentials) { }
+        public NtlmAuthenticator() : this(CredentialCache.DefaultCredentials) { }
 
         /// <summary>
         ///     Authenticate by impersonation
@@ -46,8 +45,8 @@ public NtlmAuthenticator(string username, string password)
         ///     Authenticate by impersonation, using an existing <c>ICredentials</c> instance
         /// </summary>
         /// <param name="credentials"></param>
-        public NtlmAuthenticator(ICredentials credentials) => this.credentials = credentials ?? throw new ArgumentNullException(nameof(credentials));
+        public NtlmAuthenticator(ICredentials credentials) => this._credentials = credentials ?? throw new ArgumentNullException(nameof(credentials));
 
-        public void Authenticate(IRestClient client, IRestRequest request) => request.Credentials = credentials;
+        public void Authenticate(IRestClient client, IRestRequest request) => request.Credentials = _credentials;
     }
 }

src/RestSharp/Authenticators/OAuth/Enums.cs

@@ -0,0 +1,10 @@
+namespace RestSharp.Authenticators.OAuth
+{
+    public enum OAuthSignatureMethod { HmacSha1, HmacSha256, PlainText, RsaSha1 }
+    
+    public enum OAuthSignatureTreatment { Escaped, Unescaped }
+    
+    public enum OAuthParameterHandling { HttpAuthorizationHeader, UrlOrPostParameters }
+    
+    public enum OAuthType { RequestToken, AccessToken, ProtectedResource, ClientAuthentication }
+}

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

@@ -1,80 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
 
 namespace RestSharp.Authenticators.OAuth.Extensions
 {
     internal static class CollectionExtensions
     {
-        public static IEnumerable<T> AsEnumerable<T>(this T item) => new[] {item};
-
-        public static IEnumerable<T> And<T>(this T item, T other) => new[] {item, other};
-
-        public static IEnumerable<T> And<T>(this IEnumerable<T> items, T item)
-        {
-            foreach (var i in items) yield return i;
-
-            yield return item;
-        }
-
-        public static TK TryWithKey<T, TK>(this IDictionary<T, TK> dictionary, T key)
-            => dictionary.ContainsKey(key)
-                ? dictionary[key]
-                : default;
-
-        public static IEnumerable<T> ToEnumerable<T>(this object[] items) where T : class => items.Select(item => item as T);
-
         public static void ForEach<T>(this IEnumerable<T> items, Action<T> action)
         {
             foreach (var item in items) action(item);
         }
-
-        public static void AddRange(this IDictionary<string, string> collection, NameValueCollection range)
-        {
-            foreach (var key in range.AllKeys) collection.Add(key, range[key]);
-        }
-
-        public static string ToQueryString(this NameValueCollection collection)
-        {
-            var sb = new StringBuilder();
-
-            if (collection.Count > 0) sb.Append('?');
-
-            var count = 0;
-
-            foreach (var key in collection.AllKeys)
-            {
-                sb.AppendFormat("{0}={1}", key, collection[key].UrlEncode());
-                count++;
-
-                if (count >= collection.Count) continue;
-
-                sb.Append('&');
-            }
-
-            return sb.ToString();
-        }
-
-        public static string Concatenate(this WebParameterCollection collection, string separator, string spacer)
-        {
-            var sb    = new StringBuilder();
-            var total = collection.Count;
-            var count = 0;
-
-            foreach (var item in collection)
-            {
-                sb.Append(item.Name);
-                sb.Append(separator);
-                sb.Append(item.Value);
-
-                count++;
-
-                if (count < total) sb.Append(spacer);
-            }
-
-            return sb.ToString();
-        }
     }
 }

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

@@ -8,31 +8,10 @@ internal static class OAuthExtensions
     {
         public static string ToRequestValue(this OAuthSignatureMethod signatureMethod)
         {
-            var value = signatureMethod.ToString()
-                .ToUpper();
-            var shaIndex = value.IndexOf("SHA");
+            var value    = signatureMethod.ToString().ToUpper();
+            var shaIndex = value.IndexOf("SHA", StringComparison.Ordinal);
 
-            return shaIndex > -1
-                ? value.Insert(shaIndex, "-")
-                : value;
-        }
-
-        public static OAuthSignatureMethod FromRequestValue(this string signatureMethod)
-        {
-            switch (signatureMethod)
-            {
-                case "HMAC-SHA1":
-                    return OAuthSignatureMethod.HmacSha1;
-
-                case "HMAC-SHA256":
-                    return OAuthSignatureMethod.HmacSha256;
-
-                case "RSA-SHA1":
-                    return OAuthSignatureMethod.RsaSha1;
-
-                default:
-                    return OAuthSignatureMethod.PlainText;
-            }
+            return shaIndex > -1 ? value.Insert(shaIndex, "-") : value;
         }
 
         public static string HashWith(this string input, HashAlgorithm algorithm)

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

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Text;
 
@@ -10,51 +8,14 @@ internal static class StringExtensions
     {
         public static bool IsNullOrBlank(this string value) => string.IsNullOrWhiteSpace(value);
 
-        public static bool EqualsIgnoreCase(this string left, string right) => string.Equals(left, right, StringComparison.OrdinalIgnoreCase);
-
-        public static bool EqualsAny(this string input, params string[] args) => args.Aggregate(false, (current, arg) => current | input.Equals(arg));
-
-        public static string FormatWith(this string format, params object[] args) => string.Format(format, args);
-
-        public static string FormatWithInvariantCulture(this string format, params object[] args)
-            => string.Format(CultureInfo.InvariantCulture, format, args);
+        public static bool EqualsIgnoreCase(this string left, string right) => string.Equals(left, right, StringComparison.InvariantCultureIgnoreCase);
 
         public static string Then(this string input, string value) => string.Concat(input, value);
 
-        public static string UrlEncode(this string value) => Uri.EscapeDataString(value);
-
-        public static string UrlDecode(this string value) => Uri.UnescapeDataString(value);
-
         public static Uri AsUri(this string value) => new Uri(value);
 
-        public static string ToBase64String(this byte[] input) => Convert.ToBase64String(input);
-
         public static byte[] GetBytes(this string input) => Encoding.UTF8.GetBytes(input);
 
-        public static string PercentEncode(this string s)
-        {
-            var bytes = s.GetBytes();
-            var sb    = new StringBuilder();
-
-            foreach (var b in bytes)
-                sb.AppendFormat("%{0:X2}", b);
-
-            return sb.ToString();
-        }
-
-        public static IDictionary<string, string> ParseQueryString(this string query)
-        {
-            // [DC]: This method does not URL decode, and cannot handle decoded input
-            if (query.StartsWith("?"))
-                query = query.Substring(1);
-
-            if (query.Equals(string.Empty))
-                return new Dictionary<string, string>();
-
-            var parts = query.Split('&');
-
-            return parts.Select(part => part.Split('='))
-                .ToDictionary(pair => pair[0], pair => pair[1]);
-        }
+        public static string PercentEncode(this string s) => string.Join("", s.GetBytes().Select(x => $"{x:X2}"));
     }
 }

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

@@ -4,17 +4,6 @@ namespace RestSharp.Authenticators.OAuth.Extensions
 {
     internal static class TimeExtensions
     {
-        public static DateTime FromNow(this TimeSpan value) => new DateTime((DateTime.Now + value).Ticks);
-
-        public static DateTime FromUnixTime(this long seconds)
-        {
-            var time = new DateTime(1970, 1, 1);
-
-            time = time.AddSeconds(seconds);
-
-            return time.ToLocalTime();
-        }
-
         public static long ToUnixTime(this DateTime dateTime)
         {
             var timeSpan  = dateTime - new DateTime(1970, 1, 1);