From 8afb2a3a63d5ab438bd472051ecfe8eb262bfafa Mon Sep 17 00:00:00 2001
From: okiedork <okiedork@jlc.anonaddy.com>
Date: Mon, 30 May 2022 09:14:01 -0300
Subject: [PATCH] Add username option to Redis authentication

---
 .env.dist            | 1 +
 app/dependencies.php | 3 ++-
 app/settings.php     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.dist b/.env.dist
index bbe45111..6714550a 100644
--- a/.env.dist
+++ b/.env.dist
@@ -11,6 +11,7 @@ AMQP_PORT=
 
 REDIS_HOST=
 REDIS_PORT=
+REDIS_USERNAME=
 REDIS_PASSWORD=
 
 PHP_ENV=
diff --git a/app/dependencies.php b/app/dependencies.php
index b4bfa5e9..96226d0b 100644
--- a/app/dependencies.php
+++ b/app/dependencies.php
@@ -81,7 +81,8 @@
                   'port'   => $dsn->getPort() ?? 6379
                 ]
               ],
-              'password' => $dsn->getPassword() ?? null,
+              'username' => $dsn->getUser() ?? null,
+              'password' => $dsn->getPassword() ?? null
             ]
           );
         }
diff --git a/app/settings.php b/app/settings.php
index 1a7eff8a..0f56c0cd 100644
--- a/app/settings.php
+++ b/app/settings.php
@@ -15,7 +15,7 @@
           [
             'cache' => [
               'enabled' => PHP_SAPI !== 'cli',
-              'redis' => "redis://:${_ENV['REDIS_PASSWORD']}@${_ENV['REDIS_HOST']}:${_ENV['REDIS_PORT']}"
+              'redis' => "redis://${_ENV['REDIS_USERNAME']}:${_ENV['REDIS_PASSWORD']}@${_ENV['REDIS_HOST']}:${_ENV['REDIS_PORT']}"
             ],
             'db' => [
               'dsn' => "pgsql://${_ENV['POSTGRES_USER']}:${_ENV['POSTGRES_PASSWORD']}@${_ENV['POSTGRES_HOST']}:${_ENV['POSTGRES_PORT']}/${_ENV['POSTGRES_DB']}"