add basic auth method

Author: philkra

src/Elasticsearch/ClientBuilder.php

@@ -339,6 +339,8 @@ public function setHosts(array $hosts): ClientBuilder
     /**
      * Set the APIKey Pair, consiting of the API Id and the ApiKey of the Response from /_security/api_key
      *
+     * <i>APIKey will have precedence over Basic Authentication</i>
+     *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html
      *
      * @param string $id
@@ -350,12 +352,29 @@ public function setApiKey(string $id, string $apiKey)
             'ApiKey ' . base64_encode($id . ':' . $apiKey)
         ];
 
+        // Remove Basic Auth Credentials if set
+        unset($this->connectionParams['client']['curl'][CURLOPT_HTTPAUTH]);
+        unset($this->connectionParams['client']['curl'][CURLOPT_USERPWD]);
+
         return $this;
     }
 
-    public function setConnectionParams(array $params): ClientBuilder
+    /**
+     * Set the APIKey Pair, consiting of the API Id and the ApiKey of the Response from /_security/api_key
+     *
+     * @param string $username
+     * @param string $password
+     */
+    public function setBasicAuthentication(string $username, string $password)
     {
-        $this->connectionParams = $params;
+        if(isset($this->connectionParams['client']['curl']) === false) {
+            $this->connectionParams['client']['curl'] = [];
+        }
+
+        $this->connectionParams['client']['curl'] += [
+            CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
+            CURLOPT_USERPWD  => $username.':'.$password
+        ];
 
         return $this;
     }
@@ -390,6 +409,13 @@ public function setElasticCloudId(string $cloudId)
         return $this;
     }
 
+    public function setConnectionParams(array $params): ClientBuilder
+    {
+        $this->connectionParams = $params;
+
+        return $this;
+    }
+
     public function setRetries(int $retries): ClientBuilder
     {
         $this->retries = $retries;

src/Elasticsearch/Connections/Connection.php

@@ -129,7 +129,11 @@ public function __construct(
             $this->transportSchema = $hostDetails['scheme'];
         }
 
-        if (isset($hostDetails['user']) && isset($hostDetails['pass'])) {
+        // Only Set the Basic if API Key is not set and setBasicAuthentication was not called prior
+        if (isset($connectionParams['client']['headers']['Authorization']) === false
+                && isset($connectionParams['client']['curl'][CURLOPT_HTTPAUTH]) === false
+                && isset($hostDetails['user'])
+                && isset($hostDetails['pass'])){
             $connectionParams['client']['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
             $connectionParams['client']['curl'][CURLOPT_USERPWD] = $hostDetails['user'].':'.$hostDetails['pass'];
         }