From 7fd4c2d96b639a3922b22c5b3288e465d9a2caef Mon Sep 17 00:00:00 2001
From: Artem Niehrieiev <r.tem@tuta.io>
Date: Thu, 20 Nov 2025 13:34:23 +0000
Subject: [PATCH] feat(redis): enhance connection setup with username and
 database handling

---
 .../data-access-objects/data-access-object-redis.ts        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shared-code/src/data-access-layer/data-access-objects/data-access-object-redis.ts b/shared-code/src/data-access-layer/data-access-objects/data-access-object-redis.ts
index 3c6398c2f..61c78c1c3 100644
--- a/shared-code/src/data-access-layer/data-access-objects/data-access-object-redis.ts
+++ b/shared-code/src/data-access-layer/data-access-objects/data-access-object-redis.ts
@@ -696,6 +696,11 @@ export class DataAccessObjectRedis extends BasicDataAccessObject implements IDat
 
   private async getUsualConnection(): Promise<RedisClientType> {
     let client: RedisClientType = LRUStorage.getRedisClientCache(this.connection);
+    const database = this.connection.database
+      ? Number(this.connection.database)
+        ? Number(this.connection.database)
+        : 0
+      : 0;
     if (!client) {
       client = createClient({
         socket: {
@@ -706,6 +711,8 @@ export class DataAccessObjectRedis extends BasicDataAccessObject implements IDat
           rejectUnauthorized: this.connection.ssl === false ? false : true,
         },
         password: this.connection.password || undefined,
+        username: this.connection.username || undefined,
+        database: database,
       });
       await client.connect();
       LRUStorage.setRedisClientCache(this.connection, client);