fixed the problem of not disabling the global webhook by the variable and apikey only appears if it is enabled to be exposed

CHANGELOG.md

@@ -20,6 +20,7 @@
 * Adjust the route getProfileBusiness to fetchProfileBusiness
 * fix error after logout and try to get status or to connect again
 * fix sending narrated audio on whatsapp android and ios
+* fixed the problem of not disabling the global webhook by the variable
 
 # 1.0.9 (2023-06-10)
 

docker-compose.yaml

@@ -11,9 +11,9 @@ services:
       context: .
       dockerfile: Dockerfile
     ports:
-      - 8080:8080
+      - 8083:8080
-    volumes:
+    # volumes:
-      - /data/instances:/evolution/instances
+    #   - /data/instances:/evolution/instances
     environment:
       # Determine how long the instance should be deleted from memory in case of no connection.
       # Default time: 5 minutes
@@ -25,7 +25,7 @@ services:
       - STORE_CONTACTS=true
       - STORE_CHATS=true
       # Permanent data storage
-      - DATABASE_ENABLED=true
+      - DATABASE_ENABLED=false
       - DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true
       - DATABASE_CONNECTION_DB_PREFIX_NAME=evolution
       # Choose the data you want to save in the application's database or store
@@ -35,7 +35,7 @@ services:
       - DATABASE_SAVE_MESSAGE_UPDATE=false
       - DATABASE_SAVE_DATA_CONTACTS=true
       - DATABASE_SAVE_DATA_CHATS=true
-      - REDIS_ENABLED=true
+      - REDIS_ENABLED=false
       - REDIS_URI=redis://redis:6379
       - REDIS_PREFIX_KEY=evolution
       # Webhook Settings
@@ -92,31 +92,31 @@ services:
     expose:
       - 8083
 
-  mongodb:
+  # mongodb:
-    container_name: mongodb
+  #   container_name: mongodb
-    image: mongo
+  #   image: mongo
-    restart: always
+  #   restart: always
-    volumes:
+  #   volumes:
-      - /data/mongodb:/data/db
+  #     - /data/mongodb:/data/db
-    ports:
+  #   ports:
-      - 27017:27017
+  #     - 27017:27017
-    environment:
+  #   environment:
-      MONGO_INITDB_ROOT_USERNAME: root
+  #     MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: root
+  #     MONGO_INITDB_ROOT_PASSWORD: root
-    networks:
+  #   networks:
-      - evolution-net
+  #     - evolution-net
-    expose:
+  #   expose:
-      - 27017
+  #     - 27017
 
-  redis:
+  # redis:
-    container_name: redis
+  #   container_name: redis
-    image: redis:latest
+  #   image: redis:latest
-    restart: always
+  #   restart: always
-    volumes:
+  #   volumes:
-      - /data/redis:/data
+  #     - /data/redis:/data
-    ports:
+  #   ports:
-      - 6379:6379
+  #     - 6379:6379
-    networks:
+  #   networks:
-      - evolution-net
+  #     - evolution-net
-    expose:
+  #   expose:
-      - 6379
+  #     - 6379

src/whatsapp/services/monitor.service.ts

@@ -72,9 +72,6 @@ export class WAMonitoringService {
           if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
             const tokenStore = await this.repository.auth.find(key);
             apikey = tokenStore.apikey || '';
-          } else {
-            apikey = '';
-          }
 
             instances.push({
               instance: {
@@ -86,6 +83,17 @@ export class WAMonitoringService {
                 apikey,
               },
             });
+          } else {
+            instances.push({
+              instance: {
+                instanceName: key,
+                owner: value.wuid,
+                profileName: (await value.getProfileName()) || 'not loaded',
+                profilePictureUrl: value.profilePictureUrl,
+                status: (await value.getProfileStatus()) || '',
+              },
+            });
+          }
         } else {
           instances.push({
             instance: {

src/whatsapp/services/whatsapp.service.ts

@@ -265,6 +265,8 @@ export class WAStartupService {
         }
       }
     }
+
+    if (webhookGlobal.GLOBAL?.ENABLED) {
       if (webhookGlobal.EVENTS[we]) {
         const globalWebhook = this.configService.get<Webhook>('WEBHOOK').GLOBAL;
 
@@ -318,6 +320,7 @@ export class WAStartupService {
         }
       }
     }
+  }
 
   private async connectionUpdate({
     qr,