+ Basic authorization

frkator · Sep 25, 2012 · c5d3fa3 · c5d3fa3
1 parent 985a2a2
commit c5d3fa3
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/oneapi/client.php b/oneapi/client.php
@@ -183,9 +183,6 @@ private function executeRequest(
             $sendHeaders[] = $key . ': ' . $value;
         }
 
-        if($this->oneApiAuthentication && $this->oneApiAuthentication->ibssoToken)
-            $sendHeaders[] = 'Authorization: IBSSO ' . $this->oneApiAuthentication->ibssoToken;
-
         if($httpMethod === 'GET') {
             if(sizeof($queryParams) > 0)
                 $url .= '?' . $this->buildQuery($queryParams);
@@ -204,6 +201,14 @@ private function executeRequest(
             CURLOPT_HTTPHEADER => $sendHeaders,
         );
 
+        if($this->oneApiAuthentication && $this->oneApiAuthentication->ibssoToken) {
+            // Token based authentication (one request per login request):
+            $opts[CURLOPT_HTTPHEADER][] = 'Authorization: IBSSO ' . $this->oneApiAuthentication->ibssoToken;
+        } else {
+            // Basic authorization:
+            $opts[CURLOPT_USERPWD] = $this->username . ':' . $this->password;
+        }
+
         Logs::debug('Executing ', $httpMethod, ' to ', $url);
 
         if (sizeof($queryParams) > 0 && ($httpMethod == 'POST' || $httpMethod == 'PUT')) {