Merge branch 'master' of https://github.com/restsharp/RestSharp into 608_Encoding

Author: Michael Hallett

.gitignore

@@ -41,3 +41,4 @@ Backup/
 *.htm
 *.orig
 DownloadSigned/
+RestSharp.IntegrationTests/config.json

README.markdown

@@ -6,7 +6,7 @@
 
 ### Features
 
-* Supports .NET 3.5+, Silverlight 4, Windows Phone 7, Mono, MonoTouch, Mono for Android, Compact Framework 3.5
+* Supports .NET 3.5+, Silverlight 4, Windows Phone 7, Mono, MonoTouch, Mono for Android
 * Easy installation using [NuGet](http://nuget.org/packages/RestSharp) for most .NET flavors
 * Supports strong naming using [NuGet](http://nuget.org/packages/RestSharpSigned) for most .NET flavors
 * Automatic XML and JSON deserialization

RestSharp.IntegrationTests/config.example.json

@@ -0,0 +1,6 @@
+{
+    "ConsumerKey": "",
+    "ConsumerSecret": "",
+    "AccessToken": "",
+    "AccessSecret": ""
+}

RestSharp.IntegrationTests/oAuth1Tests.cs

@@ -9,6 +9,7 @@
 using RestSharp.Contrib;
 using RestSharp.IntegrationTests.Models;
 using Xunit;
+using System.IO;
 
 namespace RestSharp.IntegrationTests
 {
@@ -20,7 +21,7 @@ public void Can_Authenticate_With_OAuth()
             const string consumerKey = "";
             const string consumerSecret = "";
 
-            var baseUrl = new Uri("http://api.twitter.com");
+            var baseUrl = new Uri("https://api.twitter.com");
             var client = new RestClient(baseUrl);
 
             client.Authenticator = OAuth1Authenticator.ForRequestToken(consumerKey, consumerSecret);
@@ -85,6 +86,40 @@ public void Can_Authenticate_With_OAuth()
             //Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
+        [Fact(Skip = "Provide your own consumer key/secret before running")]
+        public void Can_Authenticate_Twitter()
+        {
+            // To pass this test, place a file config.json in the RestSharp.IntegrationTests folder
+            // with the following content:
+            //
+            // {
+            //     "ConsumerKey": "",
+            //     "ConsumerSecret": "",
+            //     "AccessToken": "",
+            //     "AccessSecret": ""
+            // }
+            //
+            // The tokens can be found on the "Keys and Access Tokens" tab on the application
+            // management page for your app: https://apps.twitter.com/
+
+            Assert.True(File.Exists(@"..\..\config.json"));
+
+            var config = SimpleJson.DeserializeObject(File.ReadAllText(@"..\..\config.json")) as JsonObject;
+
+            var client = new RestClient("https://api.twitter.com/1.1");
+            client.Authenticator = OAuth1Authenticator.ForProtectedResource(
+                (string)config["ConsumerKey"], (string)config["ConsumerSecret"], 
+                (string)config["AccessToken"], (string)config["AccessSecret"]);
+
+            var request = new RestRequest("account/verify_credentials.json");
+            request.AddParameter("include_entities", "true", ParameterType.QueryString);
+
+            var response = client.Execute(request);
+
+            Assert.NotNull(response);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
         #region Netflix test classes
 
         [XmlRoot("queue")]

RestSharp/Authenticators/OAuth1Authenticator.cs

@@ -206,12 +206,12 @@ private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflo
             // or implement a seperate class for each OAuth version
             if (!request.AlwaysMultipartFormData && !request.Files.Any())
             {
-                foreach (var p in client.DefaultParameters.Where(p => p.Type == ParameterType.GetOrPost))
+                foreach (var p in client.DefaultParameters.Where(p => p.Type == ParameterType.GetOrPost || p.Type == ParameterType.QueryString))
                 {
                     parameters.Add(new WebPair(p.Name, p.Value.ToString()));
                 }
 
-                foreach (var p in request.Parameters.Where(p => p.Type == ParameterType.GetOrPost))
+                foreach (var p in request.Parameters.Where(p => p.Type == ParameterType.GetOrPost || p.Type == ParameterType.QueryString))
                 {
                     parameters.Add(new WebPair(p.Name, p.Value.ToString()));
                 }
@@ -220,12 +220,13 @@ private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflo
             {
                 // if we are sending a multipart request, only the "oauth_" parameters should be included in the signature
                 foreach (var p in client.DefaultParameters.Where(
-                    p => p.Type == ParameterType.GetOrPost && p.Name.StartsWith("oauth_")))
+                    p => (p.Type == ParameterType.GetOrPost || p.Type == ParameterType.QueryString) && p.Name.StartsWith("oauth_")))
                 {
                     parameters.Add(new WebPair(p.Name, p.Value.ToString()));
                 }
 
-                foreach (var p in request.Parameters.Where(p => p.Type == ParameterType.GetOrPost && p.Name.StartsWith("oauth_")))
+                foreach (var p in request.Parameters.Where(
+                    p => (p.Type == ParameterType.GetOrPost || p.Type == ParameterType.QueryString) && p.Name.StartsWith("oauth_")))
                 {
                     parameters.Add(new WebPair(p.Name, p.Value.ToString()));
                 }