Merge pull request #4 from Hossara/main

Fix redis auth
Hossara · Apr 26, 2024 · 1b8570d · 1b8570d
2 parents 09ad25b + 1d83499
commit 1b8570d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,10 +3,13 @@ FROM node:18 AS base
 RUN yarn global add pnpm
 
 ARG REDIS_SERVER
+ARG REDIS_USERNAME
+ARG REDIS_PASSWORD
 ARG FIREBASE_ADMIN_DATABASE
 ARG BOT_TOKEN
 
-ENV REDIS_SERVER=${REDIS_SERVER} FIREBASE_ADMIN_DATABASE=${FIREBASE_ADMIN_DATABASE} BOT_TOKEN=${BOT_TOKEN}
+ENV FIREBASE_ADMIN_DATABASE=${FIREBASE_ADMIN_DATABASE} BOT_TOKEN=${BOT_TOKEN}
+ENV REDIS_SERVER=${REDIS_SERVER} REDIS_USERNAME=${REDIS_USERNAME} REDIS_PASSWORD=${REDIS_PASSWORD}
 
 FROM base AS deps
 

diff --git a/src/app.ts b/src/app.ts
@@ -17,6 +17,8 @@ export const env = {
     BOT_TOKEN: string,
     PROXY: string,
     REDIS_SERVER: string,
+    REDIS_USERNAME: string,
+    REDIS_PASSWORD: string,
 
     FIREBASE_apiKey: string,
     FIREBASE_authDomain: string,
@@ -57,9 +59,14 @@ export const firebase = getFirestore(initializeApp({
 }))
 
 // Initialize redis client
-export const redisClient = createClient({
-    url: env.REDIS_SERVER
-})
+let redis_options: any = {url: env.REDIS_SERVER}
+if (env.REDIS_USERNAME) redis_options = {
+    ...redis_options,
+    username: env.REDIS_USERNAME,
+    password: env.REDIS_PASSWORD
+}
+
+export const redisClient = createClient(redis_options)
 
 redisClient.on('error', err => console.error("Redis error: ", err))