From 4134cd1dde4ebb6b0ceb07198c1fd24de54d78a2 Mon Sep 17 00:00:00 2001 From: "eric.koleda@google.com" Date: Mon, 11 Jul 2011 15:12:40 +0000 Subject: [PATCH] Fixed 1.0a support in AndySmithOAuthHander. git-svn-id: http://google-api-adwords-php.googlecode.com/svn/trunk@193 bd846e36-b2c2-11de-ae6a-cd50274c347e --- .../Api/Ads/Common/Util/AndySmithOAuthHandler.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Google/Api/Ads/Common/Util/AndySmithOAuthHandler.php b/src/Google/Api/Ads/Common/Util/AndySmithOAuthHandler.php index c1374b04..fb2c3925 100644 --- a/src/Google/Api/Ads/Common/Util/AndySmithOAuthHandler.php +++ b/src/Google/Api/Ads/Common/Util/AndySmithOAuthHandler.php @@ -60,9 +60,8 @@ public function GetRequestToken($credentials, $scope, $server = NULL, $consumer = new OAuthConsumer($credentials['oauth_consumer_key'], $credentials['oauth_consumer_secret']); $signatureMethod = new OAuthSignatureMethod_HMAC_SHA1(); - $params['version'] = '1.0a'; - $params = array('scope' => $scope); + $params = array('oauth_version' => '1.0a', 'scope' => $scope); if (isset($applicationName)) { $params['xoauth_displayname'] = $applicationName; } @@ -93,9 +92,8 @@ public function GetAccessToken($credentials, $verifier, $server = NULL) { $token = new OAuthToken($credentials['oauth_token'], $credentials['oauth_token_secret']); $signatureMethod = new OAuthSignatureMethod_HMAC_SHA1(); - $params['version'] = '1.0a'; - $params = array('oauth_verifier' => $verifier); + $params = array('oauth_version' => '1.0a', 'oauth_verifier' => $verifier); $endpoint = $this->GetAccessEndpoint($server); $request = OAuthRequest::from_consumer_and_token($consumer, $token, 'GET', @@ -118,10 +116,10 @@ public function GetSignedRequestParameters($credentials, $url) { $token = new OAuthToken($credentials['oauth_token'], $credentials['oauth_token_secret']); $signatureMethod = new OAuthSignatureMethod_HMAC_SHA1(); - $params['version'] = '1.0a'; + $params = array('oauth_version' => '1.0a'); $request = OAuthRequest::from_consumer_and_token($consumer, $token, 'POST', - $url, array()); + $url, $params); $request->sign_request($signatureMethod, $consumer, $token); return $request->get_parameters(); }