Merge branch 'v0.20.x' into next

novuhq · Oct 23, 2023 · a195d69 · a195d69 · github-actions · Oct 23, 2023
2 parents dfc72de + cc476dd
commit a195d69
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/apps/api/src/app/integrations/usecases/remove-integration/remove-integration.usecase.ts b/apps/api/src/app/integrations/usecases/remove-integration/remove-integration.usecase.ts
@@ -23,7 +23,10 @@ export class RemoveIntegration {
 
   async execute(command: RemoveIntegrationCommand) {
     try {
-      const existingIntegration = await this.integrationRepository.findById(command.integrationId);
+      const existingIntegration = await this.integrationRepository.findOne({
+        _id: command.integrationId,
+        _organizationId: command.organizationId,
+      });
       if (!existingIntegration) {
         throw new NotFoundException(`Entity with id ${command.integrationId} not found`);
       }

diff --git a/libs/shared/src/types/events/index.ts b/libs/shared/src/types/events/index.ts
@@ -33,7 +33,7 @@ export interface IEmailOptions {
   payloadDetails?: any;
   notificationDetails?: any;
   ipPoolName?: string;
-  customData?: Record<string, Record<string, unknown>>;
+  customData?: Record<string, any>;
 }
 
 export interface ITriggerPayload {

diff --git a/packages/node/src/lib/events/events.interface.ts b/packages/node/src/lib/events/events.interface.ts
@@ -36,7 +36,7 @@ export interface IEmailOverrides extends IIntegrationOverride {
   cc?: string[];
   bcc?: string[];
   senderName?: string;
-  customData?: Record<string, Record<string, unknown>>;
+  customData?: Record<string, any>;
 }
 
 export type ITriggerTenant = string | ITenantDefine;

diff --git a/packages/node/src/lib/events/events.spec.ts b/packages/node/src/lib/events/events.spec.ts
@@ -71,6 +71,21 @@ describe('test use of novus node package - Events', () => {
             test: 'test-data',
           },
         },
+        email: {
+          customData: {
+            templateId: 'template-id-123',
+            nestedObject: {
+              firstChild: {
+                secondChild: {
+                  name: 'Second Child',
+                },
+              },
+            },
+            fourthChild: {
+              name: 'Fourth Child',
+            },
+          },
+        },
       },
     });
 
@@ -85,6 +100,21 @@ describe('test use of novus node package - Events', () => {
             test: 'test-data',
           },
         },
+        email: {
+          customData: {
+            templateId: 'template-id-123',
+            nestedObject: {
+              firstChild: {
+                secondChild: {
+                  name: 'Second Child',
+                },
+              },
+            },
+            fourthChild: {
+              name: 'Fourth Child',
+            },
+          },
+        },
       },
       payload: {
         organizationName: 'Company',

diff --git a/packages/stateless/src/lib/provider/provider.interface.ts b/packages/stateless/src/lib/provider/provider.interface.ts
@@ -23,7 +23,7 @@ export interface IEmailOptions {
   payloadDetails?: any;
   notificationDetails?: any;
   ipPoolName?: string;
-  customData?: Record<string, Record<string, unknown>>;
+  customData?: Record<string, any>;
 }
 
 export interface ISmsOptions {