Merge pull request #351 from Caliper/master

haacked · haacked · commit 4244775241dc · 2013-09-06T19:11:34.000-07:00
Fixed skipping of XAuth parameters with UrlOrPostParameters
diff --git a/RestSharp/Authenticators/OAuth1Authenticator.cs b/RestSharp/Authenticators/OAuth1Authenticator.cs
@@ -203,7 +203,7 @@ private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflo
 					break;
 				case OAuthParameterHandling.UrlOrPostParameters:
 					parameters.Add("oauth_signature", oauth.Signature);
-					foreach (var parameter in parameters.Where(parameter => !parameter.Name.IsNullOrBlank() && parameter.Name.StartsWith("oauth_")))
+					foreach (var parameter in parameters.Where(parameter => !parameter.Name.IsNullOrBlank() && (parameter.Name.StartsWith("oauth_") || parameter.Name.StartsWith("x_auth_"))))
 					{
 						request.AddParameter(parameter.Name, HttpUtility.UrlDecode(parameter.Value));
 					}

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflo`
`203`	`203`	`break;`
`204`	`204`	`case OAuthParameterHandling.UrlOrPostParameters:`
`205`	`205`	`parameters.Add("oauth_signature", oauth.Signature);`
`206`		`- foreach (var parameter in parameters.Where(parameter => !parameter.Name.IsNullOrBlank() && parameter.Name.StartsWith("oauth_")))`
	`206`	`+ foreach (var parameter in parameters.Where(parameter => !parameter.Name.IsNullOrBlank() && (parameter.Name.StartsWith("oauth_") \|\| parameter.Name.StartsWith("x_auth_"))))`
`207`	`207`	`{`
`208`	`208`	`request.AddParameter(parameter.Name, HttpUtility.UrlDecode(parameter.Value));`
`209`	`209`	`}`