From 697e92f81837c0c3c43358bec90218f709b9baf1 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 29 May 2022 14:54:53 +0200
Subject: [PATCH] Feature/finalize exposing redis password env variable (#975)

* Add hints

* Update changelog
---
 .env                                                      | 8 ++++----
 CHANGELOG.md                                              | 6 ++++++
 apps/api/src/app/redis-cache/redis-cache.module.ts        | 2 +-
 apps/api/src/services/configuration.service.ts            | 2 +-
 apps/api/src/services/interfaces/environment.interface.ts | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index 3b1b2887..44c1ec3a 100644
--- a/.env
+++ b/.env
@@ -3,15 +3,15 @@ COMPOSE_PROJECT_NAME=ghostfolio-development
 # CACHE
 REDIS_HOST=localhost
 REDIS_PORT=6379
-REDIS_PASSWORD=password
+REDIS_PASSWORD=<INSERT_REDIS_PASSWORD>
 
 # POSTGRES
 POSTGRES_DB=ghostfolio-db
 POSTGRES_USER=user
-POSTGRES_PASSWORD=password
+POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
 
-ACCESS_TOKEN_SALT=GHOSTFOLIO
+ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 ALPHA_VANTAGE_API_KEY=
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer
-JWT_SECRET_KEY=123456
+JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
 PORT=3333
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e72ff076..dca00fbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Exposed the environment variable `REDIS_PASSWORD`
+
 ## 1.154.0 - 28.05.2022
 
 ### Added
diff --git a/apps/api/src/app/redis-cache/redis-cache.module.ts b/apps/api/src/app/redis-cache/redis-cache.module.ts
index 05fa7bf8..96cf5032 100644
--- a/apps/api/src/app/redis-cache/redis-cache.module.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.module.ts
@@ -14,8 +14,8 @@ import { RedisCacheService } from './redis-cache.service';
       useFactory: async (configurationService: ConfigurationService) => ({
         host: configurationService.get('REDIS_HOST'),
         max: configurationService.get('MAX_ITEM_IN_CACHE'),
-        port: configurationService.get('REDIS_PORT'),
         password: configurationService.get('REDIS_PASSWORD'),
+        port: configurationService.get('REDIS_PORT'),
         store: redisStore,
         ttl: configurationService.get('CACHE_TTL')
       })
diff --git a/apps/api/src/services/configuration.service.ts b/apps/api/src/services/configuration.service.ts
index 5b471686..9666e7ab 100644
--- a/apps/api/src/services/configuration.service.ts
+++ b/apps/api/src/services/configuration.service.ts
@@ -36,8 +36,8 @@ export class ConfigurationService {
       PORT: port({ default: 3333 }),
       RAKUTEN_RAPID_API_KEY: str({ default: '' }),
       REDIS_HOST: str({ default: 'localhost' }),
-      REDIS_PORT: port({ default: 6379 }),
       REDIS_PASSWORD: str({ default: '' }),
+      REDIS_PORT: port({ default: 6379 }),
       ROOT_URL: str({ default: 'http://localhost:4200' }),
       STRIPE_PUBLIC_KEY: str({ default: '' }),
       STRIPE_SECRET_KEY: str({ default: '' }),
diff --git a/apps/api/src/services/interfaces/environment.interface.ts b/apps/api/src/services/interfaces/environment.interface.ts
index ec363c0e..79db93f5 100644
--- a/apps/api/src/services/interfaces/environment.interface.ts
+++ b/apps/api/src/services/interfaces/environment.interface.ts
@@ -27,8 +27,8 @@ export interface Environment extends CleanedEnvAccessors {
   PORT: number;
   RAKUTEN_RAPID_API_KEY: string;
   REDIS_HOST: string;
-  REDIS_PORT: number;
   REDIS_PASSWORD: string;
+  REDIS_PORT: number;
   ROOT_URL: string;
   STRIPE_PUBLIC_KEY: string;
   STRIPE_SECRET_KEY: string;