Merge pull request #63 from CS3219-AY2425S1/redis-auth-fix

fix redis auth issues. Revert to previous config

Author: TabrizPlv

.env.local

@@ -17,7 +17,7 @@ MATCHING_SERVICE_NAME=match-express
 MATCHING_EXPRESS_PORT=9004
 MATCHING_DB_USERNAME="peerprep-match-express"
 MATCHING_DB_PASSWORD="password"
-MATCHING_DB_HOST_PORT=6379
+MATCHING_DB_HOST_PORT=6378
 MATCHING_DB_HOST_MGMT_PORT=3001
 
 FRONTEND_SERVICE_NAME=frontend

backend/matching/.env.compose

@@ -3,10 +3,10 @@
 
 EXPRESS_PORT=9004
 
-# MATCHING_DB_HOSTNAME="match-db"
-MATCHING_DB_PORT=6379
+MATCHING_DB_HOSTNAME="match-db"
+MATCHING_DB_PORT=6378
 
-# MATCHING_DB_USERNAME="peerprep-match-express"
-# MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
-# REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"
+MATCHING_DB_USERNAME="peerprep-match-express"
+MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"
 

backend/matching/.env.docker

@@ -9,5 +9,5 @@ PEERPREP_USER_HOST=http://host.docker.internal:9001
 PEERPREP_QUESTION_HOST=http://host.docker.internal:9002
 PEERPREP_COLLAB_HOST=http://host.docker.internal:9003
 
-# MATCHING_DB_USERNAME=peerprep-match-express
-# MATCHING_DB_PASSWORD=G7jBgyz9wGAFQ5La
+MATCHING_DB_USERNAME=peerprep-match-express
+MATCHING_DB_PASSWORD=G7jBgyz9wGAFQ5La

backend/matching/.env.local

@@ -3,7 +3,7 @@ PEERPREP_UI_HOST=http://localhost:5173
 EXPRESS_PORT=9004
 
 MATCHING_DB_HOSTNAME=localhost
-MATCHING_DB_PORT=6379
+MATCHING_DB_PORT=6378
 
 
 PEERPREP_USER_HOST="http://localhost:9001"
@@ -12,6 +12,6 @@ PEERPREP_COLLAB_HOST="http://localhost:9003"
 
 
 
-# MATCHING_DB_USERNAME="peerprep-match-express"
-# MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
-# REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"
+MATCHING_DB_USERNAME="peerprep-match-express"
+MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"

backend/matching/src/config.ts

@@ -9,9 +9,11 @@ export const PEERPREP_QUESTION_HOST = process.env.PEERPREP_QUESTION_HOST;
 export const PEERPREP_COLLAB_HOST = process.env.PEERPREP_COLLAB_HOST;
 
 const DB_HOSTNAME = process.env.MATCHING_DB_HOSTNAME;
-const DB_PORT = Number.parseInt(process.env.MATCHING_DB_PORT ?? '6379');
-// export const DB_URL = `redis://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}`;
-export const DB_URL = `redis://${DB_HOSTNAME}:${DB_PORT}`;
+const DB_PORT = Number.parseInt(process.env.MATCHING_DB_PORT ?? '6378');
+const DB_USERNAME = process.env.MATCHING_DB_USERNAME;
+const DB_PASSWORD = process.env.MATCHING_DB_PASSWORD;
+export const DB_URL = `redis://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}`;
+// export const DB_URL = `redis://${DB_HOSTNAME}:${DB_PORT}`;
 
 export const NODE_ENV = process.env.NODE_ENV;