fixed getAccessToken to use oauth_session_handle key if available

YahooArchive · Sep 22, 2009 · 5a9fb3b · 5a9fb3b
1 parent dddb3e9
commit 5a9fb3b
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/lib/Yahoo/YahooOAuthApplication.class.php b/lib/Yahoo/YahooOAuthApplication.class.php
@@ -111,10 +111,21 @@ public function getRequestToken($callback = "oob")
 
   public function getAuthorizationUrl($oauth_request_token)
   {
-    $oauth_request = OAuthRequest::from_consumer_and_token($this->consumer, $oauth_request_token, 'GET', YahooOAuthClient::AUTHORIZATION_API_URL);
-    $oauth_request->sign_request($this->signature_method_hmac_sha1, $this->consumer, $oauth_request_token);
-
-    return $oauth_request->to_url();
+    // $oauth_request = OAuthRequest::from_consumer_and_token($this->consumer, $oauth_request_token, 'GET', YahooOAuthClient::AUTHORIZATION_API_URL);
+    // $oauth_request->sign_request($this->signature_method_hmac_sha1, $this->consumer, $oauth_request_token);
+
+    // return $oauth_request->to_url();
+
+    if($oauth_request_token->request_auth_url) 
+    {
+       $auth_url = $oauth_request_token->request_auth_url;
+    }
+    else 
+    {
+       $auth_url = sprintf("%s?oauth_token=%s", YahooOAuthClient::AUTHORIZATION_API_URL, $oauth_request_token->key);
+    }
+
+    return $auth_url;
   }
 
   public function getAccessToken($oauth_request_token, $verifier = null)
@@ -128,6 +139,11 @@ public function getAccessToken($oauth_request_token, $verifier = null)
       $parameters = array('oauth_verifier' => $verifier);
     }
 
+    if($oauth_request_token->session_handle) 
+    {
+       $parameters["oauth_session_handle"] = $oauth_request_token->session_handle;
+    }
+
     $oauth_request = OAuthRequest::from_consumer_and_token($this->consumer, $oauth_request_token, 'GET', YahooOAuthClient::ACCESS_TOKEN_API_URL, $parameters);
     $oauth_request->sign_request($this->signature_method_hmac_sha1, $this->consumer, $oauth_request_token);
     $this->token = $this->client->fetch_access_token($oauth_request);