diff --git a/.env.example b/.env.example index 016d0a09..21163d7c 100644 --- a/.env.example +++ b/.env.example @@ -23,7 +23,7 @@ WAHA_BASE_URL=http://localhost:3000 # # https://waha.devlike.pro/docs/how-to/security/ # -WHATSAPP_API_KEY=admin +WAHA_API_KEY=admin WAHA_DASHBOARD_USERNAME=admin WAHA_DASHBOARD_PASSWORD=admin #WHATSAPP_SWAGGER_USERNAME=admin diff --git a/docker-compose/n8n/docker-compose.yaml b/docker-compose/n8n/docker-compose.yaml index 74388376..4cee8304 100644 --- a/docker-compose/n8n/docker-compose.yaml +++ b/docker-compose/n8n/docker-compose.yaml @@ -10,7 +10,7 @@ services: - './.sessions:/app/.sessions' - './.media:/app/.media' environment: - - WHATSAPP_API_KEY=321 + - WAHA_API_KEY=321 - WAHA_DASHBOARD_USERNAME=admin - WAHA_DASHBOARD_PASSWORD=admin - WHATSAPP_DEFAULT_ENGINE=WEBJS diff --git a/docker-compose/test/docker-compose.yaml b/docker-compose/test/docker-compose.yaml index 329aabb1..26953a0b 100644 --- a/docker-compose/test/docker-compose.yaml +++ b/docker-compose/test/docker-compose.yaml @@ -29,7 +29,7 @@ services: # - WHATSAPP_HOOK_EVENTS=message # - WHATSAPP_API_HOSTNAME=localhost - WHATSAPP_DEFAULT_ENGINE=WEBJS - - WHATSAPP_API_KEY=321 + - WAHA_API_KEY=321 # Username and password for Swagger - WHATSAPP_SWAGGER_USERNAME=swagger - WHATSAPP_SWAGGER_PASSWORD=admin @@ -55,7 +55,7 @@ services: # Environment variables from https://waha.devlike.pro/docs/how-to/config/ # - WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111 # - WHATSAPP_HOOK_EVENTS=message - # - WHATSAPP_API_KEY=321 + # - WAHA_API_KEY=321 # - WHATSAPP_SWAGGER_USERNAME=admin # - WHATSAPP_SWAGGER_PASSWORD=123 # - WAHA_DASHBOARD_USERNAME=admin diff --git a/src/config.service.ts b/src/config.service.ts index 40e23a40..152e6adc 100644 --- a/src/config.service.ts +++ b/src/config.service.ts @@ -138,7 +138,10 @@ export class WhatsappConfigService implements OnApplicationBootstrap { } getApiKey(): string | undefined { - return this.configService.get('WHATSAPP_API_KEY', ''); + return ( + this.configService.get('WHATSAPP_API_KEY', '') || + this.configService.get('WAHA_API_KEY', '') + ); } getExcludedPaths(): string[] { diff --git a/src/core/auth/WebSocketAuth.ts b/src/core/auth/WebSocketAuth.ts index c8fa40e9..36be62e7 100644 --- a/src/core/auth/WebSocketAuth.ts +++ b/src/core/auth/WebSocketAuth.ts @@ -6,7 +6,7 @@ export class WebSocketAuth { private key: string; constructor() { - this.key = process.env.WHATSAPP_API_KEY || ''; + this.key = process.env.WHATSAPP_API_KEY || process.env.WAHA_API_KEY || ''; } verifyClient = (info: any, callback: any) => {