Peer reviews

Author: ROMzombie

README.md

@@ -86,7 +86,7 @@ API Keys are a "password" for your data in an application and should always be t
 
 In our UI you will find an API Settings screen which divides API Keys into two distinct categories:
 * Personal Access Tokens, which are scoped to your own user account and can only see and manipulate the data you have access to
-* Service Account Keys, which can only be authorized by an Admin and have full access to the data stored in the application
+* Service Account Keys, which can only be authorized by an Administrator and have full access to the data stored in the application
 
 For additional information on how to authorize and use PATs and SAKs please see our [developer documentation](https://developer.infusionsoft.com/pat-and-sak/).
 

src/Infusionsoft/Infusionsoft.php

@@ -492,25 +492,11 @@ public function request()
         // Reset the empty key flag back to the default for the next request
         $this->needsEmptyKey = true;
 
-        $options = [];
+        $options = $this->setOptionsForRequest([]);
 
-        if ( $this->authenticationType === AuthenticationType::OAuth2AccessToken ) {
-            $options['headers'] = array(
-                'Content-Type' => 'application/json',
-                'Authorization' => 'Bearer ' . $token->getAccessToken()
-            );
-        } else {
-            $options['headers'] = array(
-                'Content-Type' => 'application/json',
-                'X-Keap-API-Key' => $this->apikey
-            );
-        }
+        $client = $this->getSerializer();
 
-        $client   = $this->getSerializer();
-
-        $response = $client->request($method, $this->getUrl(), $params, $this->getHttpClient($options));
-
-        return $response;
+        return $client->request($method, $this->getUrl(), $params, $this->getHttpClient($options));
     }
 
     /**
@@ -539,17 +525,7 @@ public function restfulRequest($method, $url, $params = array())
             $params['body'] = json_encode($params);
         }
 
-        if ( $this->authenticationType === AuthenticationType::OAuth2AccessToken ) {
-            $params['headers'] = array(
-                'Content-Type' => 'application/json',
-                'Authorization' => 'Bearer ' . $token->getAccessToken()
-            );
-        } else {
-            $params['headers'] = array(
-                'Content-Type' => 'application/json',
-                'X-Keap-API-Key' => $this->apikey
-            );
-        }
+        $params = $this->setOptionsForRequest($params);
 
         $response = (string)$client->call($method, $url, $params);
 
@@ -914,5 +890,25 @@ public function getRestApi($class)
         return new $class($this);
     }
 
+    /**
+     * @param array $options
+     * @return array
+     */
+    public function setOptionsForRequest(array $options): array
+    {
+        if ($this->authenticationType === AuthenticationType::OAuth2AccessToken) {
+            $options['headers'] = array(
+                'Content-Type' => 'application/json',
+                'Authorization' => 'Bearer ' . $this->getToken()->getAccessToken()
+            );
+        } else {
+            $options['headers'] = array(
+                'Content-Type' => 'application/json',
+                'X-Keap-API-Key' => $this->apikey
+            );
+        }
+        return $options;
+    }
+
 }