From 7af3c867193d27e7a426900b9f176cdcc1200c4c Mon Sep 17 00:00:00 2001
From: Gennadii Chernykh <gennadii.chernykh@eglobal-group.com>
Date: Mon, 2 Dec 2024 12:55:10 +0400
Subject: [PATCH] Redis ACL AUTH two argument supporting. Signed-off-by:
 Gennadii Chernykh <ragnarek45@gmail.com>

Signed-off-by: Gennadii Chernykh <gennadii.chernykh@eglobal-group.com>
---
 src/Prometheus/Storage/Redis.php   |  1 -
 src/Prometheus/Storage/RedisNg.php | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Prometheus/Storage/Redis.php b/src/Prometheus/Storage/Redis.php
index cb1d5670..58de5b7d 100644
--- a/src/Prometheus/Storage/Redis.php
+++ b/src/Prometheus/Storage/Redis.php
@@ -196,7 +196,6 @@ private function ensureOpenConnection(): void
         }
 
         $this->connectToServer();
-
         $authParams = [];
 
         if (isset($this->options['user'])) {
diff --git a/src/Prometheus/Storage/RedisNg.php b/src/Prometheus/Storage/RedisNg.php
index cb369ba7..7340db18 100644
--- a/src/Prometheus/Storage/RedisNg.php
+++ b/src/Prometheus/Storage/RedisNg.php
@@ -28,6 +28,7 @@ class RedisNg implements Adapter
         'read_timeout' => '10',
         'persistent_connections' => false,
         'password' => null,
+        'user' => null,
     ];
 
     /**
@@ -195,9 +196,18 @@ private function ensureOpenConnection(): void
         }
 
         $this->connectToServer();
+        $authParams = [];
 
-        if ($this->options['password'] !== null) {
-            $this->redis->auth($this->options['password']);
+        if (isset($this->options['user'])) {
+            $authParams[] = $this->options['user'];
+        }
+
+        if (isset($this->options['password'])) {
+            $authParams[] = $this->options['password'];
+        }
+
+        if (!empty($authParams)) {
+            $this->redis->auth($authParams);
         }
 
         if (isset($this->options['database'])) {