Updated Zend_Service_GitHub to use BasicAuth instead of sending raw c…

…redentials via GET parameters
raphaelstolt · Aug 7, 2011 · 2235571 · 2235571
1 parent 8323ad4
commit 2235571
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/Zend/Service/GitHub.php b/Zend/Service/GitHub.php
@@ -360,13 +360,11 @@ protected function _get($path, array $query = null, $addApiEntryPath = true)
         $this->_prepare($path, $addApiEntryPath);
         $this->_localHttpClient->setParameterGet($query);
 
-        if ($this->_authorizationInitialized && $query !== null) {
-            $_query = array_merge($this->_getAuthorizationCredentials(), $query);
-            $this->_localHttpClient->setParameterGet($_query);
-        } elseif (!$this->_authorizationInitialized && $query !== null) {
-            $this->_localHttpClient->setParameterGet($query);
-        } elseif ($this->_authorizationInitialized && $query == null) {
-            $this->_localHttpClient->setParameterGet($this->_getAuthorizationCredentials());
+        if ( $this->_authorizationCredentials ) {
+            $this->_localHttpClient->setAuth(
+                $this->getLogin() . "/token", 
+                $this->getToken()
+            );
         }
         return $this->_localHttpClient->request('GET');
     }
@@ -381,15 +379,14 @@ protected function _get($path, array $query = null, $addApiEntryPath = true)
     protected function _post($path, $data = null)
     {
         $this->_prepare($path);
-        if ($this->_authorizationInitialized && $data !== null) {
-            $_data = array_merge($this->_getAuthorizationCredentials(), $data);
-        } elseif ($this->_authorizationInitialized && $data == null) {
-            $_data = $this->_getAuthorizationCredentials();
-        } elseif (!$this->_authorizationInitialized && $data !== null) {
-            $_data = $data;
+        if ( $this->_authorizationCredentials ) {
+            $this->_localHttpClient->setAuth(
+                $this->getLogin() . "/token", 
+                $this->getToken()
+            );
         }
-        return $this->_performPost('POST', $_data);
-    }
+        return $this->_performPost('POST', $data);
+    }    
     /**
      * Perform a POST or PUT
      *