Merge pull request #28 from ensi-platform/task-105513-v8

Поддержка старого варианта авторизации в v8

Author: MsNatali

README.md

@@ -278,6 +278,14 @@ Hosts should be comma seperated string of hosts with protocol prefix and port su
  ELASTICSEARCH_SSL_VERIFICATION=true,
 ```
 
+## Elasticsearch 7 and 8 support.
+
+Due to the incompatibility of clients for Elasticsearch 7 and 8, separate releases will be created for these versions.
+Development for each version is carried out in the corresponding branch.
+
+To make changes to version 7, you need to create a task branch based on v7 and make a pull request to it.
+For version 8 it is similar, but based on the v8 branch.
+
 ## Contributing
 
 Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.

src/ElasticClient.php

@@ -128,13 +128,34 @@ public function getQueryLog(): Collection
 
     public static function fromConfig(array $config): static
     {
-        $client = (new ClientBuilder())
+        $builder = (new ClientBuilder())
             ->setHosts($config['hosts'])
-            ->setBasicAuthentication($config['username'] ?? '', $config['password'] ?? '')
             ->setRetries($config['retries'] ?? 1)
-            ->setSSLVerification($config['ssl_verification'] ?? false)
-            ->build();
+            ->setSSLVerification($config['ssl_verification'] ?? false);
 
-        return new static($client);
+        [$username, $password] = static::resolveBasicAuthData($config);
+
+        if (filled($username)) {
+            $builder->setBasicAuthentication($username, $password);
+        }
+
+        return new static($builder->build());
+    }
+
+    public static function resolveBasicAuthData(array $config): array
+    {
+        if (filled($config['username'] ?? null)) {
+            return [$config['username'], $config['password'] ?? ''];
+        }
+
+        foreach ($config['hosts'] as $host) {
+            $components = parse_url($host);
+
+            if (filled($components['user'] ?? null)) {
+                return [$components['user'], $components['pass'] ?? ''];
+            }
+        }
+
+        return ['', ''];
     }
 }

tests/Unit/ElasticClientTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Ensi\LaravelElasticQuery\Tests\Unit;
+
+use Ensi\LaravelElasticQuery\ElasticClient;
+
+class ElasticClientTest extends UnitTestCase
+{
+    /**
+     * @dataProvider provideBasicAuthData
+     */
+    public function testResolveBasicAuthData(array $config, array $expected): void
+    {
+        $this->assertEquals($expected, ElasticClient::resolveBasicAuthData($config));
+    }
+
+    public function provideBasicAuthData(): array
+    {
+        return [
+            'separate username and password' => [
+                [
+                    'hosts' => ['https://elastic.domain.io:9200'],
+                    'username' => 'foo',
+                    'password' => 'bar',
+                ],
+                ['foo', 'bar'],
+            ],
+            'separate username without password' => [
+                [
+                    'hosts' => ['https://elastic.domain.io:9200'],
+                    'username' => 'foo',
+                ],
+                ['foo', ''],
+            ],
+            'username and password in the host' => [
+                ['hosts' => ['https://elastic1.domain.io:9200', 'https://foo:bar@elastic2.domain.io:9200']],
+                ['foo', 'bar'],
+            ],
+            'only username in the host' => [
+                ['hosts' => ['https://foo@elastic1.domain.io:9200', 'https://elastic2.domain.io:9200']],
+                ['foo', ''],
+            ],
+            'missing auth data' => [
+                ['hosts' => ['https://elastic.domain.io:9200']],
+                ['', ''],
+            ],
+        ];
+    }
+}