Merge pull request restsharp#1167 from artiomchi/bugfix/oauth1-uri-query-handling

Query string shouldn't be removed in the OAuth1Authenticator

Author: alexeyzimarev

RestSharp.Tests/OAuth1AuthenticatorTests.cs

@@ -36,12 +36,15 @@ public void Setup()
             mockClient.SetupGet(x => x.DefaultParameters).Returns(new List<Parameter>());
 
             mockRequest = new Mock<RestRequest>();
+
+            mockWorkflow = new Mock<OAuthWorkflow>();
         }
 
         private OAuth1Authenticator authenticator;
 
         private Mock<RestRequest> mockRequest;
         private Mock<IRestClient> mockClient;
+        private Mock<OAuthWorkflow> mockWorkflow;
 
         [Test]
         public void Authenticate_ShouldAddAuthorizationAsTextValueToRequest_OnHttpAuthorizationHeaderHandling()
@@ -97,5 +100,26 @@ public void Authenticate_ShouldAddSignatureToRequestAsSeparateParameters_OnUrlOr
             Assert.IsNotNull(parameters.FirstOrDefault(x => x.Type == ParameterType.GetOrPost && x.Name == "oauth_nonce" && !string.IsNullOrWhiteSpace((string)x.Value) && x.ContentType == null));
             Assert.IsNotNull(parameters.FirstOrDefault(x => x.Type == ParameterType.GetOrPost && x.Name == "oauth_timestamp" && !string.IsNullOrWhiteSpace((string)x.Value) && x.ContentType == null));
         }
+
+        [Test]
+        public void AddOAuthData_ProtectedResource_ShouldRetainQueryParamsFromUrl()
+        {
+            authenticator.Type = OAuthType.ProtectedResource;
+
+            var uri = new Uri("https://no-query.string?queryparameter=foobartemp");
+            mockClient.Setup(x => x.BuildUri(It.IsAny<IRestRequest>())).Returns(uri);
+
+            var mockCall = mockWorkflow
+                .Setup(x => x.BuildProtectedResourceInfo(It.IsAny<string>(), It.IsAny<WebParameterCollection>(), It.IsAny<string>()))
+                .Callback<string, WebParameterCollection, string>((methodValue, webParamsValue, urlValue) =>
+                {
+                    Assert.AreEqual(uri, urlValue);
+                })
+                .Returns(new OAuthWebQueryInfo());
+
+            mockClient.SetupGet(x => x.DefaultParameters).Returns(new List<Parameter>());
+
+            authenticator.AddOAuthData(mockClient.Object, mockRequest.Object, mockWorkflow.Object);
+        }
     }
 }

RestSharp/AssemblyInfo.cs

@@ -2,5 +2,6 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("RestSharp.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d"),
-           InternalsVisibleTo("RestSharp.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d")]
+           InternalsVisibleTo("RestSharp.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d"),
+           InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 [assembly: CLSCompliant(true)]

RestSharp/Authenticators/OAuth1Authenticator.cs

@@ -12,7 +12,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.
 
 #endregion
 
@@ -191,14 +191,10 @@ public static OAuth1Authenticator ForProtectedResource(string consumerKey, strin
             return authenticator;
         }
 
-        private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflow workflow)
+        internal void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflow workflow)
         {
             var url = client.BuildUri(request)
                 .ToString();
-            var queryStringStart = url.IndexOf('?');
-
-            if (queryStringStart != -1)
-                url = url.Substring(0, queryStringStart);
 
             OAuthWebQueryInfo oauth;
             var method = request.Method.ToString()