@@ -6,7 +6,6 @@ import { configService, Log, Webhook } from '@config/env.config';
66import { Logger } from '@config/logger.config' ;
77import { BadRequestException } from '@exceptions' ;
88import axios , { AxiosInstance } from 'axios' ;
9- import { isURL } from 'class-validator' ;
109import * as jwt from 'jsonwebtoken' ;
1110
1211import { EmitData , EventController , EventControllerInterface } from '../event.controller' ;
@@ -75,16 +74,16 @@ export class WebhookController extends EventController implements EventControlle
7574
7675 const webhookConfig = configService . get < Webhook > ( 'WEBHOOK' ) ;
7776 const webhookLocal = instance ?. events ;
78- const webhookHeaders = { ...( instance ?. headers as Record < string , string > || { } ) } ;
79-
77+ const webhookHeaders = { ...( ( instance ?. headers as Record < string , string > ) || { } ) } ;
78+
8079 if ( webhookHeaders && 'jwt_key' in webhookHeaders ) {
8180 const jwtKey = webhookHeaders [ 'jwt_key' ] ;
8281 const jwtToken = this . generateJwtToken ( jwtKey ) ;
8382 webhookHeaders [ 'Authorization' ] = `Bearer ${ jwtToken } ` ;
8483
8584 delete webhookHeaders [ 'jwt_key' ] ;
8685 }
87-
86+
8887 const we = event . replace ( / [ . - ] / gm, '_' ) . toUpperCase ( ) ;
8988 const transformedWe = we . replace ( / _ / gm, '-' ) . toLowerCase ( ) ;
9089 const enabledLog = configService . get < Log > ( 'LOG' ) . LEVEL . includes ( 'WEBHOOKS' ) ;
@@ -250,7 +249,7 @@ export class WebhookController extends EventController implements EventControlle
250249 app : 'evolution' ,
251250 action : 'webhook' ,
252251 } ;
253-
252+
254253 const token = jwt . sign ( payload , authToken , { algorithm : 'HS256' } ) ;
255254 return token ;
256255 } catch ( error ) {
0 commit comments