From 0c2657eea6dafbd9582e5bc086537a953102466e Mon Sep 17 00:00:00 2001 From: PB Borel Date: Wed, 4 Sep 2024 16:56:37 +0200 Subject: [PATCH] fix(6423): add username and password for redis connection (#6745) Co-authored-by: pbb --- packages/twenty-server/.env.example | 2 ++ .../cache-storage/cache-storage.module-factory.ts | 5 +++++ .../engine/integrations/environment/environment-variables.ts | 4 ++++ .../message-queue/message-queue.module-factory.ts | 4 ++++ .../src/content/developers/self-hosting/self-hosting-var.mdx | 2 ++ 5 files changed, 17 insertions(+) diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example index 2724fb7c4c71..6f8167d6b869 100644 --- a/packages/twenty-server/.env.example +++ b/packages/twenty-server/.env.example @@ -52,6 +52,8 @@ SIGN_IN_PREFILLED=true # MESSAGE_QUEUE_TYPE=pg-boss # REDIS_HOST=127.0.0.1 # REDIS_PORT=6379 +# REDIS_USERNAME= +# REDIS_PASSWORD= # DEMO_WORKSPACE_IDS=REPLACE_ME_WITH_A_RANDOM_UUID # SERVER_URL=http://localhost:3000 # WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION=30 diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts index 79dedaf6bdc4..9894699387be 100644 --- a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts +++ b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.module-factory.ts @@ -29,12 +29,17 @@ export const cacheStorageModuleFactory = ( ); } + const username = environmentService.get('REDIS_USERNAME'); + const password = environmentService.get('REDIS_PASSWORD'); + return { ...cacheModuleOptions, store: redisStore, socket: { host, port, + username, + password, }, }; } diff --git a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts index 373edd4cbf1a..ae8c304f72ca 100644 --- a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts +++ b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts @@ -368,6 +368,10 @@ export class EnvironmentVariables { @CastToPositiveNumber() REDIS_PORT = 6379; + REDIS_USERNAME: string; + + REDIS_PASSWORD: string; + API_TOKEN_EXPIRES_IN = '100y'; SHORT_TERM_TOKEN_EXPIRES_IN = '5m'; diff --git a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts index 671548449f37..4aad6714ba97 100644 --- a/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts +++ b/packages/twenty-server/src/engine/integrations/message-queue/message-queue.module-factory.ts @@ -34,6 +34,8 @@ export const messageQueueModuleFactory = async ( case MessageQueueDriverType.BullMQ: { const host = environmentService.get('REDIS_HOST'); const port = environmentService.get('REDIS_PORT'); + const username = environmentService.get('REDIS_USERNAME'); + const password = environmentService.get('REDIS_PASSWORD'); return { type: MessageQueueDriverType.BullMQ, @@ -41,6 +43,8 @@ export const messageQueueModuleFactory = async ( connection: { host, port, + username, + password, }, }, }; diff --git a/packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx b/packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx index abd7de752432..d5219e511fba 100644 --- a/packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx +++ b/packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx @@ -36,6 +36,8 @@ yarn command:prod cron:calendar:calendar-event-list-fetch ['PG_SSL_ALLOW_SELF_SIGNED', 'false', 'Allow self signed certificates'], ['REDIS_HOST', '127.0.0.1', 'Redis connection host'], ['REDIS_PORT', '6379', 'Redis connection port'], + ['REDIS_USERNAME', 'redis_username', 'Redis connection username'], + ['REDIS_PASSWORD', 'redis_pwd', 'Redis connection password'], ['FRONT_BASE_URL', 'http://localhost:3001', 'Url to the hosted frontend'], ['SERVER_URL', 'http://localhost:3000', 'Url to the hosted server'], ['PORT', '3000', 'Port'],