basicAuthentication support for ElasticsearchServiceProvider

namespace order changed for phpcs namespace order changed for phpcs
matchish · Jun 15, 2022 · dd20e83 · dd20e83
1 parent 2677c4d
commit dd20e83
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/config/elasticsearch.php b/config/elasticsearch.php
@@ -2,6 +2,8 @@
 
 return [
     'host' => env('ELASTICSEARCH_HOST'),
+    'user' => env('ELASTICSEARCH_USER'),
+    'password' => env('ELASTICSEARCH_PASSWORD'),
     'indices' => [
         'mappings' => [
             'default' => [

diff --git a/src/ElasticSearch/Config/Storage.php b/src/ElasticSearch/Config/Storage.php
@@ -31,6 +31,22 @@ public function hosts(): array
         return explode(',', $this->loadConfig('host'));
     }
 
+    /**
+     * @return string
+     */
+    public function user(): string
+    {
+        return $this->loadConfig('user');
+    }
+
+    /**
+     * @return string
+     */
+    public function password(): string
+    {
+        return $this->loadConfig('password');
+    }
+
     /**
      * @param  string  $path
      * @return mixed

diff --git a/src/ElasticSearchServiceProvider.php b/src/ElasticSearchServiceProvider.php
@@ -8,6 +8,8 @@
 use Elastic\Elasticsearch\ClientBuilder;
 use Illuminate\Support\ServiceProvider;
 use Matchish\ScoutElasticSearch\ElasticSearch\Config\Config;
+use Matchish\ScoutElasticSearch\ElasticSearch\EloquentHitsIteratorAggregate;
+use Matchish\ScoutElasticSearch\ElasticSearch\HitsIteratorAggregate;
 
 final class ElasticSearchServiceProvider extends ServiceProvider
 {
@@ -19,12 +21,17 @@ public function register(): void
         $this->mergeConfigFrom(__DIR__.'/../config/elasticsearch.php', 'elasticsearch');
 
         $this->app->bind(Client::class, function () {
-            return ClientBuilder::create()->setHosts(Config::hosts())->build();
+            $clientBuilder = ClientBuilder::create()->setHosts(Config::hosts());
+            if ($user = Config::user()) {
+                $clientBuilder->setBasicAuthentication($user, Config::password());
+            }
+
+            return $clientBuilder->build();
         });
 
         $this->app->bind(
-            'Matchish\ScoutElasticSearch\ElasticSearch\HitsIteratorAggregate',
-            'Matchish\ScoutElasticSearch\ElasticSearch\EloquentHitsIteratorAggregate'
+            HitsIteratorAggregate::class,
+            EloquentHitsIteratorAggregate::class
         );
     }