use IRestRequest in more places to make ioc easier

Author: johnsheehan

RestSharp/Authenticators/HttpBasicAuthenticator.cs

@@ -30,7 +30,7 @@ public HttpBasicAuthenticator(string username, string password) {
 			_username = username;
 		}
 
-		public void Authenticate(RestClient client, RestRequest request) {
+		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;

RestSharp/Authenticators/IAuthenticator.cs

@@ -18,6 +18,6 @@ namespace RestSharp
 {
 	public interface IAuthenticator
 	{
-        void Authenticate(RestClient client, RestRequest request);
+		void Authenticate(IRestClient client, IRestRequest request);
 	}
 }

RestSharp/Authenticators/NtlmAuthenticator.cs

@@ -23,7 +23,7 @@ namespace RestSharp
 	/// </summary>
 	public class NtlmAuthenticator : IAuthenticator
 	{
-        public void Authenticate(RestClient client, RestRequest request)
+        public void Authenticate(IRestClient client, IRestRequest request)
         {
 			request.Credentials = System.Net.CredentialCache.DefaultCredentials;
 		}

RestSharp/Authenticators/OAuth1Authenticator.cs

@@ -123,7 +123,7 @@ public static OAuth1Authenticator ForProtectedResource(string consumerKey, strin
 			return authenticator;
 		}
 
-		public void Authenticate(RestClient client, RestRequest request)
+		public void Authenticate(IRestClient client, IRestRequest request)
 		{
 			var workflow = new OAuthWorkflow
 			{
@@ -145,7 +145,7 @@ public void Authenticate(RestClient client, RestRequest request)
 			AddOAuthData(client, request, workflow);
 		}
 
-		private void AddOAuthData(RestClient client, RestRequest request, OAuthWorkflow workflow)
+		private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflow workflow)
 		{
 			var url = client.BuildUri(request).ToString();
 

RestSharp/Authenticators/OAuth2Authenticator.cs

@@ -40,7 +40,7 @@ public string AccessToken
             get { return _accessToken; }
         }
 
-        public abstract void Authenticate(RestClient client, RestRequest request);
+        public abstract void Authenticate(IRestClient client, IRestRequest request);
 	}
 
 	/// <summary>
@@ -62,7 +62,7 @@ public OAuth2UriQueryParameterAuthenticator(string accessToken)
 		{
 		}
 
-        public override void Authenticate(RestClient client, RestRequest request)
+        public override void Authenticate(IRestClient client, IRestRequest request)
 		{
 			request.AddParameter("oauth_token", AccessToken, ParameterType.GetOrPost);
 		}
@@ -94,7 +94,7 @@ public OAuth2AuthorizationRequestHeaderAuthenticator(string accessToken)
             _authorizationValue = "OAuth " + accessToken;
         }
 
-        public override void Authenticate(RestClient client, RestRequest request)
+        public override void Authenticate(IRestClient client, IRestRequest request)
         {
             // only add the Authorization parameter if it hasn't been added.
             if (!request.Parameters.Any(p => p.Name.Equals("Authorization", StringComparison.InvariantCultureIgnoreCase)))

RestSharp/Authenticators/SimpleAuthenticator.cs

@@ -30,7 +30,7 @@ public SimpleAuthenticator(string usernameKey, string username, string passwordK
 			_password = password;
 		}
 
-        public void Authenticate(RestClient client, RestRequest request)
+        public void Authenticate(IRestClient client, IRestRequest request)
         {
 			request.AddParameter(_usernameKey, _username);
 			request.AddParameter(_passwordKey, _password);

RestSharp/IRestClient.cs

@@ -50,22 +50,24 @@ public interface IRestClient
 		/// 
 		/// </summary>
 		/// <param name="request"></param>
-		RestRequestAsyncHandle ExecuteAsync(RestRequest request, Action<RestResponse, RestRequestAsyncHandle> callback);
+		RestRequestAsyncHandle ExecuteAsync(IRestRequest request, Action<RestResponse, RestRequestAsyncHandle> callback);
 		/// <summary>
 		/// 
 		/// </summary>
 		/// <param name="request"></param>
-		RestRequestAsyncHandle ExecuteAsync<T>(RestRequest request, Action<RestResponse<T>, RestRequestAsyncHandle> callback) where T : new();
+		RestRequestAsyncHandle ExecuteAsync<T>(IRestRequest request, Action<RestResponse<T>, RestRequestAsyncHandle> callback) where T : new();
 
 #if FRAMEWORK
 		/// <summary>
 		/// X509CertificateCollection to be sent with request
 		/// </summary>
 		X509CertificateCollection ClientCertificates { get; set; }
-		RestResponse Execute(RestRequest request);
-		RestResponse<T> Execute<T>(RestRequest request) where T : new();
+		RestResponse Execute(IRestRequest request);
+		RestResponse<T> Execute<T>(IRestRequest request) where T : new();
 
 		IWebProxy Proxy { get; set; }
 #endif
+
+		Uri BuildUri(IRestRequest request);
 	}
 }