fix: minor refactoring

Author: scopsy

apps/api/src/app/webhooks/dtos/create-webhook-portal-token-response.dto.ts

@@ -0,0 +1,8 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class CreateWebhookPortalResponseDto {
+  @ApiProperty({
+    description: 'The webhook portal application ID',
+  })
+  appId: string;
+}

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

@@ -0,0 +1,3 @@
+import { EnvironmentWithUserCommand } from '../../../shared/commands/project.command';
+
+export class CreateWebhookPortalCommand extends EnvironmentWithUserCommand {}

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

@@ -0,0 +1,51 @@
+import { Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
+import { EnvironmentRepository, OrganizationRepository } from '@novu/dal';
+import { LogDecorator } from '@novu/application-generic';
+import { Svix } from 'svix';
+
+import { CreateWebhookPortalCommand } from './create-webhook-portal.command';
+import { CreateWebhookPortalResponseDto } from '../../dtos/create-webhook-portal-token-response.dto';
+
+@Injectable()
+export class CreateWebhookPortalUsecase {
+  constructor(
+    private environmentRepository: EnvironmentRepository,
+    @Inject('SVIX_CLIENT') private svix: Svix,
+    private organizationRepository: OrganizationRepository
+  ) {}
+
+  @LogDecorator()
+  async execute(command: CreateWebhookPortalCommand): Promise<CreateWebhookPortalResponseDto> {
+    const environment = await this.environmentRepository.findOne({
+      _id: command.environmentId,
+      _organizationId: command.organizationId,
+    });
+
+    if (!environment) {
+      throw new NotFoundException(
+        `Environment not found for id ${command.environmentId} and organization ${command.organizationId}`
+      );
+    }
+
+    const organization = await this.organizationRepository.findById(command.organizationId);
+    if (!organization) {
+      throw new NotFoundException(`Organization not found for id ${command.organizationId}`);
+    }
+
+    try {
+      const app = await this.svix.application.create({
+        name: organization.name,
+        uid: command.environmentId,
+        metadata: {
+          environmentId: command.environmentId,
+        },
+      });
+
+      return {
+        appId: app.uid!,
+      };
+    } catch (error) {
+      throw new Error(`Failed to generate Svix portal token: ${error?.message}`);
+    }
+  }
+}

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

@@ -5,17 +5,17 @@ import { Svix } from 'svix'; // Import Svix SDK type
 
 import { GetWebhookPortalTokenCommand } from './get-webhook-portal-token.command';
 import { GetWebhookPortalTokenResponseDto } from '../../dtos/get-webhook-portal-token-response.dto';
+import { CreateWebhookPortalUsecase } from '../create-webhook-portal-token/create-webhook-portal.usecase';
+import { CreateWebhookPortalCommand } from '../create-webhook-portal-token/create-webhook-portal.command';
 
 const LOG_CONTEXT = 'GetWebhookPortalTokenUsecase';
 
-@Injectable({
-  scope: Scope.REQUEST,
-})
+@Injectable()
 export class GetWebhookPortalTokenUsecase {
   constructor(
     private environmentRepository: EnvironmentRepository,
     @Inject('SVIX_CLIENT') private svix: Svix,
-    private organizationRepository: OrganizationRepository
+    private createWebhookPortalUsecase: CreateWebhookPortalUsecase
   ) {}
 
   @LogDecorator()
@@ -44,32 +44,21 @@ export class GetWebhookPortalTokenUsecase {
         appId: `${command.organizationId}-${command.environmentId}`,
       };
     } catch (error) {
-      console.log('AAAAA', error.code);
       if (error.code === 404) {
-        const organization = await this.organizationRepository.findById(command.organizationId);
-        if (!organization) {
-          throw new NotFoundException(`Organization not found for id ${command.organizationId}`);
-        }
-
-        const app = await this.svix.application.create({
-          name: organization.name,
-          uid: `${command.organizationId}-${command.environmentId}`,
-          metadata: {
+        const app = await this.createWebhookPortalUsecase.execute(
+          CreateWebhookPortalCommand.create({
             environmentId: command.environmentId,
-          },
-        });
-
-        const svixResponse = await this.svix.authentication.appPortalAccess(
-          `${command.organizationId}-${command.environmentId}`,
-          {}
+            organizationId: command.organizationId,
+            userId: command.userId,
+          })
         );
 
-        console.log('APPsSSSs', svixResponse);
+        const svixResponse = await this.svix.authentication.appPortalAccess(app.appId, {});
 
         return {
           url: svixResponse.url,
           token: svixResponse.token,
-          appId: `${command.organizationId}-${command.environmentId}`,
+          appId: app.appId,
         };
       }
       // Re-throw or handle specific Svix errors as needed

apps/api/src/app/webhooks/webhooks.controller.ts

@@ -1,17 +1,23 @@
-import { ClassSerializerInterceptor, Controller, Get, UseGuards, UseInterceptors } from '@nestjs/common';
+import { ClassSerializerInterceptor, Controller, Get, Post, UseGuards, UseInterceptors } from '@nestjs/common';
 import { ApiExcludeController, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { UserSession } from '@novu/application-generic';
 import { UserSessionData } from '@novu/shared';
 import { GetWebhookPortalTokenUsecase } from './usecases/get-webhook-portal-token/get-webhook-portal-token.usecase';
 import { GetWebhookPortalTokenCommand } from './usecases/get-webhook-portal-token/get-webhook-portal-token.command';
 import { GetWebhookPortalTokenResponseDto } from './dtos/get-webhook-portal-token-response.dto';
 import { UserAuthentication } from '../shared/framework/swagger/api.key.security';
+import { CreateWebhookPortalUsecase } from './usecases/create-webhook-portal-token/create-webhook-portal.usecase';
+import { CreateWebhookPortalCommand } from './usecases/create-webhook-portal-token/create-webhook-portal.command';
+import { CreateWebhookPortalResponseDto } from './dtos/create-webhook-portal-token-response.dto';
 
 @Controller({ path: `/webhooks`, version: '2' })
 @UseInterceptors(ClassSerializerInterceptor)
 @UserAuthentication()
 export class WebhooksController {
-  constructor(private getWebhookPortalTokenUsecase: GetWebhookPortalTokenUsecase) {}
+  constructor(
+    private getWebhookPortalTokenUsecase: GetWebhookPortalTokenUsecase,
+    private createWebhookPortalTokenUsecase: CreateWebhookPortalUsecase
+  ) {}
 
   @Get('/portal/token')
   @ApiOperation({
@@ -28,4 +34,19 @@ export class WebhooksController {
       })
     );
   }
+
+  @Post('/portal/token')
+  @ApiOperation({
+    summary: 'Create Webhook Portal Access Token',
+    description: 'Creates a token for accessing the webhook portal for the current environment.',
+  })
+  async createPortalToken(@UserSession() user: UserSessionData): Promise<CreateWebhookPortalResponseDto> {
+    return await this.createWebhookPortalTokenUsecase.execute(
+      CreateWebhookPortalCommand.create({
+        environmentId: user.environmentId,
+        organizationId: user.organizationId,
+        userId: user._id,
+      })
+    );
+  }
 }

apps/api/src/app/webhooks/webhooks.module.ts

@@ -3,11 +3,12 @@ import { SvixProviderService, SendWebhookMessage } from '@novu/application-gener
 import { SharedModule } from '../shared/shared.module';
 import { WebhooksController } from './webhooks.controller';
 import { GetWebhookPortalTokenUsecase } from './usecases/get-webhook-portal-token/get-webhook-portal-token.usecase';
+import { CreateWebhookPortalUsecase } from './usecases/create-webhook-portal-token/create-webhook-portal.usecase';
 
 @Module({
   imports: [SharedModule],
   controllers: [WebhooksController],
-  providers: [GetWebhookPortalTokenUsecase, SvixProviderService, SendWebhookMessage],
+  providers: [GetWebhookPortalTokenUsecase, CreateWebhookPortalUsecase, SvixProviderService, SendWebhookMessage],
   exports: [SendWebhookMessage],
 })
 export class WebhooksModule {}