fix: webhook app id

Author: scopsy

apps/api/src/app/webhooks/usecases/create-webhook-portal-token/create-webhook-portal.usecase.ts

@@ -35,12 +35,15 @@ export class CreateWebhookPortalUsecase {
     try {
       const app = await this.svix.application.create({
         name: organization.name,
-        uid: command.environmentId,
+        uid: `${command.organizationId}-${command.environmentId}`,
         metadata: {
           environmentId: command.environmentId,
+          organizationId: command.organizationId,
         },
       });
 
+      await this.environmentRepository.updateOne({ _id: command.environmentId }, { $set: { webhookAppId: app.uid } });
+
       return {
         appId: app.uid!,
       };

libs/application-generic/src/webhooks/usecases/send-webhook-message/send-webhook-message.usecase.ts

@@ -3,6 +3,7 @@ import { Svix } from 'svix';
 import shortid from 'shortid';
 
 import { PinoLogger } from 'nestjs-pino';
+import { EnvironmentRepository } from '@novu/dal';
 import { SendWebhookMessageCommand } from './send-webhook-message.command';
 import { WrapperDto } from '../../dtos/webhook-payload.dto';
 
@@ -12,13 +13,32 @@ const LOG_CONTEXT = 'SendWebhookMessageUseCase';
 export class SendWebhookMessage {
   constructor(
     @Inject('SVIX_CLIENT') private svix: Svix,
-    private logger: PinoLogger
+    private logger: PinoLogger,
+    private environmentRepository: EnvironmentRepository
   ) {
     this.logger.setContext(LOG_CONTEXT);
   }
 
   async execute(command: SendWebhookMessageCommand): Promise<{ eventId: string } | undefined> {
     const eventId = `evt_${shortid.generate()}`;
+    const environment = await this.environmentRepository.findOne(
+      {
+        _id: command.environmentId,
+      },
+      'webhookAppId'
+    );
+
+    if (!environment) {
+      throw new Error(`Environment not found for id ${command.environmentId}`);
+    }
+
+    const appId = environment.webhookAppId;
+
+    if (!appId) {
+      this.logger.debug(`Webhook app ID not found for environment ${command.environmentId}, Event ID: ${eventId}`);
+
+      return;
+    }
 
     const webhookPayload: WrapperDto<any> = {
       type: command.eventType,
@@ -33,7 +53,7 @@ export class SendWebhookMessage {
         `Attempting to send webhook ${command.eventType} for application ${command.organizationId}-${command.environmentId}, Event ID: ${eventId}`
       );
 
-      const message = await this.svix.message.create(`${command.organizationId}-${command.environmentId}`, {
+      const message = await this.svix.message.create(appId, {
         eventType: command.eventType,
         eventId,
         payload: webhookPayload,

libs/dal/src/repositories/environment/environment.entity.ts

@@ -53,6 +53,8 @@ export class EnvironmentEntity {
     url: string;
   };
 
+  webhookAppId?: string;
+
   createdAt?: string;
 
   updatedAt?: string;

libs/dal/src/repositories/environment/environment.schema.ts

@@ -53,6 +53,9 @@ const environmentSchema = new Schema<EnvironmentDBModel>(
     bridge: {
       url: Schema.Types.String,
     },
+    webhookAppId: {
+      type: Schema.Types.String,
+    },
     _parentId: {
       type: Schema.Types.ObjectId,
       ref: 'Environment',