fix: adjusts in dockerfile

Author: dgcode-tec

CHANGELOG.md

@@ -10,7 +10,6 @@
 * Docker files adjusted
 * Fixed in the postman collection the webhookByEvent parameter by webhook_by_events
 * Added validations in create instance
-* Now it's getting the API URL directly in the request, no longer need the variable in the env file
 * Removed link preview endpoint, now it's done automatically from sending conventional text
 * Added group membership validation before sending message to groups
 * Adjusts in Dockerfile

Docker/.env.example

@@ -1,3 +1,5 @@
+SERVER_URL='http://localhost:8080' # http://localhost:3333 | http://localhost:3333/api/v1
+
 CORS_ORIGIN='*' # Or separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
 CORS_METHODS='POST,GET,PUT,DELETE'
 CORS_CREDENTIALS=true

Dockerfile

@@ -13,6 +13,8 @@ COPY ./package.json .
 
 ENV DOCKER_ENV=true
 
+ENV SERVER_URL='http://localhost:8080'
+
 ENV CORS_ORIGIN=*
 ENV CORS_METHODS=POST,GET,PUT,DELETE
 ENV CORS_CREDENTIALS=true

src/config/env.config.ts

@@ -3,7 +3,7 @@ import { load } from 'js-yaml';
 import { join } from 'path';
 import { isBooleanString } from 'class-validator';
 
-export type HttpServer = { TYPE: 'http' | 'https'; PORT: number };
+export type HttpServer = { TYPE: 'http' | 'https'; PORT: number; URL: string };
 
 export type HttpMethods = 'POST' | 'GET' | 'PUT' | 'DELETE';
 export type Cors = {
@@ -173,6 +173,7 @@ export class ConfigService {
       SERVER: {
         TYPE: process.env.SERVER_TYPE as 'http' | 'https',
         PORT: Number.parseInt(process.env.SERVER_PORT),
+        URL: process.env.SERVER_URL,
       },
       CORS: {
         ORIGIN: process.env.CORS_ORIGIN.split(','),

src/whatsapp/controllers/instance.controller.ts

@@ -28,21 +28,18 @@ export class InstanceController {
 
   private readonly logger = new Logger(InstanceController.name);
 
-  public async createInstance(
-    {
-      instanceName,
-      webhook,
-      webhook_by_events,
-      events,
-      qrcode,
-      token,
-      chatwoot_account_id,
-      chatwoot_token,
-      chatwoot_url,
-      chatwoot_sign_msg,
-    }: InstanceDto,
-    apiURL: string,
-  ) {
+  public async createInstance({
+    instanceName,
+    webhook,
+    webhook_by_events,
+    events,
+    qrcode,
+    token,
+    chatwoot_account_id,
+    chatwoot_token,
+    chatwoot_url,
+    chatwoot_sign_msg,
+  }: InstanceDto) {
     this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
 
     const mode = this.configService.get<Auth>('AUTHENTICATION').INSTANCE.MODE;
@@ -143,7 +140,7 @@ export class InstanceController {
         throw new BadRequestException('Invalid "url" property in chatwoot');
       }
 
-      const urlServer = apiURL;
+      const urlServer = this.configService.get<HttpServer>('SERVER').URL;
 
       try {
         this.chatwootService.create(instance, {
@@ -285,7 +282,7 @@ export class InstanceController {
         throw new BadRequestException('Invalid "url" property in chatwoot');
       }
 
-      const urlServer = apiURL;
+      const urlServer = this.configService.get<HttpServer>('SERVER').URL;
 
       try {
         this.chatwootService.create(instance, {

src/whatsapp/routers/instance.router.ts

@@ -24,14 +24,11 @@ export class InstanceRouter extends RouterBroker {
         logger.verbose('request query: ');
         logger.verbose(req.query);
 
-        const apiURL = req.headers.host || req.hostname;
-        logger.verbose('API URL: ' + apiURL);
-
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,
           ClassRef: InstanceDto,
-          execute: (instance) => instanceController.createInstance(instance, apiURL),
+          execute: (instance) => instanceController.createInstance(instance),
         });
 
         return res.status(HttpStatus.CREATED).json(response);