Changeset 26555 for extensions/oAuth/include/hybridauth/Hybrid/Providers/Twitter.php

Timestamp:

Jan 9, 2014, 6:11:33 PM (10 years ago)

Author:

mistic100

Message:

update Hybridauth, update guides

File:

• extensions/oAuth/include/hybridauth/Hybrid/Providers/Twitter.php (modified) (1 diff)

extensions/oAuth/include/hybridauth/Hybrid/Providers/Twitter.php

@@ -18 +18 @@
                 parent::initialize();
 
-                // Provider api end-points
-                $this->api->api_base_url      = "https://api.twitter.com/1/";
+                // Provider api end-points 
+                $this->api->api_base_url      = "https://api.twitter.com/1.1/";
                 $this->api->authorize_url     = "https://api.twitter.com/oauth/authenticate";
                 $this->api->request_token_url = "https://api.twitter.com/oauth/request_token";
                 $this->api->access_token_url  = "https://api.twitter.com/oauth/access_token";
 
+                if ( isset( $this->config['api_version'] ) && $this->config['api_version'] ){
+                        $this->api->api_base_url  = "https://api.twitter.com/{$this->config['api_version']}/";
+                }
+ 
+                if ( isset( $this->config['authorize'] ) && $this->config['authorize'] ){
+                        $this->api->authorize_url = "https://api.twitter.com/oauth/authorize";
+                }
+
                 $this->api->curl_auth_header  = false;
         }
+
+        /**
+         * begin login step
+         */
+        function loginBegin()
+        {
+                $tokens = $this->api->requestToken( $this->endpoint );
+        
+                // request tokens as recived from provider
+                $this->request_tokens_raw = $tokens;
+        
+                // check the last HTTP status code returned
+                if ( $this->api->http_code != 200 ){
+                        throw new Exception( "Authentification failed! {$this->providerId} returned an error. " . $this->errorMessageByStatus( $this->api->http_code ), 5 );
+                }
+        
+                if ( ! isset( $tokens["oauth_token"] ) ){
+                        throw new Exception( "Authentification failed! {$this->providerId} returned an invalid oauth token.", 5 );
+                }
+        
+                $this->token( "request_token"       , $tokens["oauth_token"] );
+                $this->token( "request_token_secret", $tokens["oauth_token_secret"] );
+        
+                // redirect the user to the provider authentication url with force_login
+                if ( isset( $this->config['force_login'] ) && $this->config['force_login'] ){
+                        Hybrid_Auth::redirect( $this->api->authorizeUrl( $tokens, array( 'force_login' => true ) ) );
+                }
+
+                // else, redirect the user to the provider authentication url
+                Hybrid_Auth::redirect( $this->api->authorizeUrl( $tokens ) );
+        }
 
         /**