Moved some stuff to a base class

3 files changed, 118 insertions, 93 deletions

diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 519427dac..2390034cd 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -80,7 +80,7 @@ class TwitterauthorizationAction extends Action
                 $_SESSION['twitter_request_token_secret'] = $req_tok->key;
 
                 $auth_link = $client->getAuthorizeLink($req_tok);
-
+                
             } catch (TwitterOAuthClientException $e) {
                 $msg = sprintf('OAuth client cURL error - code: %1s, msg: %2s',
                            $e->getCode(), $e->getMessage());
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
new file mode 100644
index 000000000..11de991c8
--- /dev/null
+++ b/lib/oauthclient.php
@@ -0,0 +1,111 @@
+<?php
+
+require_once('OAuth.php');
+
+class OAuthClientCurlException extends Exception { }
+
+class OAuthClient
+{
+    var $consumer;
+    var $token;
+
+    function __construct($consumer_key, $consumer_secret,
+                         $oauth_token = null, $oauth_token_secret = null)
+    {
+        $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+        $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+        $this->token = null;
+
+        if (isset($oauth_token) && isset($oauth_token_secret)) {
+            $this->token = new OAuthToken($oauth_token, $oauth_token_secret);
+        }
+    }
+
+    function getRequestToken()
+    {
+        $response = $this->oAuthGet(TwitterOAuthClient::$requestTokenURL);
+        parse_str($response);
+        $token = new OAuthToken($oauth_token, $oauth_token_secret);
+        return $token;
+    }
+
+    function getAuthorizeLink($request_token, $oauth_callback = null)
+    {
+        $url = TwitterOAuthClient::$authorizeURL . '?oauth_token=' .
+            $request_token->key;
+
+        if (isset($oauth_callback)) {
+            $url .= '&oauth_callback=' . urlencode($oauth_callback);
+        }
+
+        return $url;
+    }
+
+    function getAccessToken()
+    {
+        $response = $this->oAuthPost(TwitterOAuthClient::$accessTokenURL);
+        parse_str($response);
+        $token = new OAuthToken($oauth_token, $oauth_token_secret);
+        return $token;
+    }
+
+    function oAuthGet($url)
+    {
+        $request = OAuthRequest::from_consumer_and_token($this->consumer,
+            $this->token, 'GET', $url, null);
+        $request->sign_request($this->sha1_method,
+            $this->consumer, $this->token);
+
+        return $this->httpRequest($request->to_url());
+    }
+
+    function oAuthPost($url, $params = null)
+    {
+        $request = OAuthRequest::from_consumer_and_token($this->consumer,
+            $this->token, 'POST', $url, $params);
+        $request->sign_request($this->sha1_method,
+            $this->consumer, $this->token);
+
+        return $this->httpRequest($request->get_normalized_http_url(),
+            $request->to_postdata());
+    }
+
+    function httpRequest($url, $params = null)
+    {
+        $options = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_FAILONERROR    => true,
+            CURLOPT_HEADER         => false,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_USERAGENT      => 'Laconica',
+            CURLOPT_CONNECTTIMEOUT => 120,
+            CURLOPT_TIMEOUT        => 120,
+            CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
+            CURLOPT_SSL_VERIFYPEER => false,
+
+            // Twitter is strict about accepting invalid "Expect" headers
+
+            CURLOPT_HTTPHEADER => array('Expect:')
+        );
+
+        if (isset($params)) {
+            $options[CURLOPT_POST] = true;
+            $options[CURLOPT_POSTFIELDS] = $params;
+        }
+
+        $ch = curl_init($url);
+        curl_setopt_array($ch, $options);
+        $response = curl_exec($ch);
+
+        if ($response === false) {
+            $msg  = curl_error($ch);
+            $code = curl_errno($ch);
+            throw new OAuthClientCurlException($msg, $code);
+        }
+
+        curl_close($ch);
+
+        return $response;
+    }
+
+}
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index 63ffe1c7c..e1190f167 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -1,10 +1,6 @@
 <?php
 
-require_once('OAuth.php');
-
-class OAuthClientCurlException extends Exception { }
-
-class TwitterOAuthClient
+class TwitterOAuthClient extends OAuthClient
 {
     public static $requestTokenURL = 'https://twitter.com/oauth/request_token';
     public static $authorizeURL    = 'https://twitter.com/oauth/authorize';
@@ -12,40 +8,17 @@ class TwitterOAuthClient
 
     function __construct($oauth_token = null, $oauth_token_secret = null)
     {
-        $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
         $consumer_key    = common_config('twitter', 'consumer_key');
         $consumer_secret = common_config('twitter', 'consumer_secret');
-        $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
-        $this->token = null;
 
-        if (isset($oauth_token) && isset($oauth_token_secret)) {
-            $this->token = new OAuthToken($oauth_token, $oauth_token_secret);
-        }
+        parent::__construct($consumer_key, $consumer_secret,
+                            $oauth_token, $oauth_token_secret);
     }
 
-    function getRequestToken()
-    {
-        $response = $this->oAuthGet(TwitterOAuthClient::$requestTokenURL);
-        parse_str($response);
-        $token = new OAuthToken($oauth_token, $oauth_token_secret);
-        return $token;
-    }
-
-    function getAuthorizeLink($request_token)
-    {
-        // Not sure Twitter actually looks at oauth_callback
-
-        return TwitterOAuthClient::$authorizeURL .
-        '?oauth_token=' . $request_token->key . '&oauth_callback=' .
-        urlencode(common_local_url('twitterauthorization'));
-    }
+    function getAuthorizeLink($request_token) {
+        return parent::getAuthorizeLink($request_token,
+                                        common_local_url('twitterauthorization'));
 
-    function getAccessToken()
-    {
-        $response = $this->oAuthPost(TwitterOAuthClient::$accessTokenURL);
-        parse_str($response);
-        $token = new OAuthToken($oauth_token, $oauth_token_secret);
-        return $token;
     }
 
     function verify_credentials()
@@ -66,63 +39,4 @@ class TwitterOAuthClient
         return $status;
     }
 
-    function oAuthGet($url)
-    {
-        $request = OAuthRequest::from_consumer_and_token($this->consumer,
-            $this->token, 'GET', $url, null);
-        $request->sign_request($this->sha1_method,
-            $this->consumer, $this->token);
-
-        return $this->httpRequest($request->to_url());
-    }
-
-    function oAuthPost($url, $params = null)
-    {
-        $request = OAuthRequest::from_consumer_and_token($this->consumer,
-            $this->token, 'POST', $url, $params);
-        $request->sign_request($this->sha1_method,
-            $this->consumer, $this->token);
-
-        return $this->httpRequest($request->get_normalized_http_url(),
-            $request->to_postdata());
-    }
-
-    function httpRequest($url, $params = null)
-    {
-        $options = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FAILONERROR    => true,
-            CURLOPT_HEADER         => false,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_USERAGENT      => 'Laconica',
-            CURLOPT_CONNECTTIMEOUT => 120,
-            CURLOPT_TIMEOUT        => 120,
-            CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-            CURLOPT_SSL_VERIFYPEER => false,
-
-            // Twitter is strict about accepting invalid "Expect" headers
-
-            CURLOPT_HTTPHEADER => array('Expect:')
-        );
-
-        if (isset($params)) {
-            $options[CURLOPT_POST] = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
-        }
-
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
-
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new OAuthClientCurlException($msg, $code);
-        }
-
-        curl_close($ch);
-
-        return $response;
-    }
-
 }