Finish 57-no-signing-for-app-only-auth

CHANGELOG

@@ -16,6 +16,7 @@ codebird-php - changelog
 + #61 Return rate limit details with each API call
 + #60 Support uploading multiple media
 - #63 Return rate-limiting info only if contained in response
+- #57 Don't require consumer key if bearer token is already known
 
 2.4.1 (2013-06-23)
 + #26 Stringify null and boolean parameters

README.md

@@ -108,7 +108,7 @@ If you already have your token, tell Codebird to use it:
 ```php
 \Codebird\Codebird::setBearerToken('YOURBEARERTOKEN');
 ```
-
+In this case, you don't need to set the consumer key and secret.
 For sending an API request with app-only auth, see the ‘Usage examples’ section.
 
 

src/codebird.php

@@ -1058,14 +1058,20 @@ protected function _callApi($httpmethod, $method, $params = array(), $multipart
             if (json_encode($params) !== '{}') {
                 $url_with_params .= '?' . http_build_query($params);
             }
-            $authorization = $this->_sign($httpmethod, $url, $params);
+            if (! $app_only_auth) {
+                $authorization = $this->_sign($httpmethod, $url, $params);
+            }
             $ch = curl_init($url_with_params);
         } else {
             if ($multipart) {
-                $authorization = $this->_sign($httpmethod, $url, array());
-                $params        = $this->_buildMultipart($method, $params);
+                if (! $app_only_auth) {
+                    $authorization = $this->_sign($httpmethod, $url, array());
+                }
+                $params = $this->_buildMultipart($method, $params);
             } else {
-                $authorization = $this->_sign($httpmethod, $url, $params);
+                if (! $app_only_auth) {
+                    $authorization = $this->_sign($httpmethod, $url, $params);
+                }
                 $params        = http_build_query($params);
             }
             $ch = curl_init($url);
@@ -1079,8 +1085,10 @@ protected function _callApi($httpmethod, $method, $params = array(), $multipart
             curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
         }
         if ($app_only_auth) {
-            if (self::$_oauth_consumer_key === null) {
-                throw new \Exception('To make an app-only auth API request, the consumer key must be set.');
+            if (self::$_oauth_consumer_key === null
+                && self::$_oauth_bearer_token === null
+            ) {
+                throw new \Exception('To make an app-only auth API request, consumer key or bearer token must be set.');
             }
             // automatically fetch bearer token, if necessary
             if (self::$_oauth_bearer_token === null) {