Merge branch 'next' into nv-5712-inbox-snooze-frontend-implementation-inbox

Author: ChmaraX

.source

@@ -108,6 +108,7 @@ export class CreateEnvironment {
         environmentId: environment._id,
         organizationId: environment._organizationId,
         userId: command.userId,
+        name: environment.name,
       })
     );
 

apps/api/src/app/environments-v1/usecases/create-environment/create-environment.usecase.ts

@@ -3,7 +3,7 @@ import { TerminusModule } from '@nestjs/terminus';
 
 import { GetNovuProviderCredentials, StorageHelperService } from '@novu/application-generic';
 
-import { CommunityOrganizationRepository } from '@novu/dal';
+import { CommunityOrganizationRepository, CommunityUserRepository } from '@novu/dal';
 import { EventsController } from './events.controller';
 import { USE_CASES } from './usecases';
 
@@ -37,6 +37,6 @@ const PROVIDERS = [GetNovuProviderCredentials, StorageHelperService, CommunityOr
     BridgeModule,
   ],
   controllers: [EventsController],
-  providers: [...PROVIDERS, ...USE_CASES],
+  providers: [...PROVIDERS, ...USE_CASES, CommunityUserRepository],
 })
 export class EventsModule {}

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

@@ -1,3 +1,6 @@
+import { EnvironmentEnum } from '@novu/shared';
 import { EnvironmentWithUserCommand } from '../../../shared/commands/project.command';
 
-export class CreateNovuIntegrationsCommand extends EnvironmentWithUserCommand {}
+export class CreateNovuIntegrationsCommand extends EnvironmentWithUserCommand {
+  name: string | EnvironmentEnum;
+}

apps/api/src/app/integrations/usecases/create-novu-integrations/create-novu-integrations.command.ts

@@ -1,19 +1,19 @@
 import { Injectable } from '@nestjs/common';
+import { areNovuEmailCredentialsSet, FeatureFlagsService } from '@novu/application-generic';
 import { EnvironmentEntity, IntegrationRepository, OrganizationEntity, UserEntity } from '@novu/dal';
-import { areNovuEmailCredentialsSet, areNovuSmsCredentialsSet, FeatureFlagsService } from '@novu/application-generic';
 
 import {
   ChannelTypeEnum,
   EmailProviderIdEnum,
+  EnvironmentEnum,
   FeatureFlagsKeysEnum,
   InAppProviderIdEnum,
-  SmsProviderIdEnum,
 } from '@novu/shared';
-import { CreateNovuIntegrationsCommand } from './create-novu-integrations.command';
-import { CreateIntegration } from '../create-integration/create-integration.usecase';
 import { CreateIntegrationCommand } from '../create-integration/create-integration.command';
-import { SetIntegrationAsPrimary } from '../set-integration-as-primary/set-integration-as-primary.usecase';
+import { CreateIntegration } from '../create-integration/create-integration.usecase';
 import { SetIntegrationAsPrimaryCommand } from '../set-integration-as-primary/set-integration-as-primary.command';
+import { SetIntegrationAsPrimary } from '../set-integration-as-primary/set-integration-as-primary.usecase';
+import { CreateNovuIntegrationsCommand } from './create-novu-integrations.command';
 
 @Injectable()
 export class CreateNovuIntegrations {
@@ -25,7 +25,7 @@ export class CreateNovuIntegrations {
   ) {}
 
   private async createEmailIntegration(command: CreateNovuIntegrationsCommand) {
-    if (!areNovuEmailCredentialsSet()) {
+    if (!areNovuEmailCredentialsSet() || command.name !== EnvironmentEnum.DEVELOPMENT) {
       return;
     }
 
@@ -60,42 +60,6 @@ export class CreateNovuIntegrations {
     }
   }
 
-  private async createSmsIntegration(command: CreateNovuIntegrationsCommand) {
-    if (!areNovuSmsCredentialsSet()) {
-      return;
-    }
-
-    const smsIntegrationCount = await this.integrationRepository.count({
-      providerId: SmsProviderIdEnum.Novu,
-      channel: ChannelTypeEnum.SMS,
-      _organizationId: command.organizationId,
-      _environmentId: command.environmentId,
-    });
-
-    if (smsIntegrationCount === 0) {
-      const novuSmsIntegration = await this.createIntegration.execute(
-        CreateIntegrationCommand.create({
-          providerId: SmsProviderIdEnum.Novu,
-          channel: ChannelTypeEnum.SMS,
-          name: 'Novu SMS',
-          active: true,
-          check: false,
-          userId: command.userId,
-          environmentId: command.environmentId,
-          organizationId: command.organizationId,
-        })
-      );
-      await this.setIntegrationAsPrimary.execute(
-        SetIntegrationAsPrimaryCommand.create({
-          organizationId: command.organizationId,
-          environmentId: command.environmentId,
-          integrationId: novuSmsIntegration._id,
-          userId: command.userId,
-        })
-      );
-    }
-  }
-
   private async createInAppIntegration(command: CreateNovuIntegrationsCommand) {
     const inAppIntegrationCount = await this.integrationRepository.count({
       providerId: InAppProviderIdEnum.Novu,
@@ -131,7 +95,6 @@ export class CreateNovuIntegrations {
 
   async execute(command: CreateNovuIntegrationsCommand): Promise<void> {
     await this.createEmailIntegration(command);
-    await this.createSmsIntegration(command);
     await this.createInAppIntegration(command);
   }
 }

apps/api/src/app/integrations/usecases/create-novu-integrations/create-novu-integrations.usecase.ts

@@ -60,6 +60,7 @@ export class SyncExternalOrganization {
         environmentId: devEnv._id,
         organizationId: devEnv._organizationId,
         userId: user._id,
+        name: devEnv.name,
       })
     );
 
@@ -78,6 +79,7 @@ export class SyncExternalOrganization {
         environmentId: prodEnv._id,
         organizationId: prodEnv._organizationId,
         userId: user._id,
+        name: prodEnv.name,
       })
     );
 

apps/api/src/app/organization/usecases/create-organization/sync-external-organization/sync-external-organization.usecase.ts

@@ -1,5 +1,6 @@
 /* eslint-disable max-len */
 import { DocumentBuilder, OpenAPIObject, SwaggerModule } from '@nestjs/swagger';
+import packageJson from '../../../../../package.json';
 import { INestApplication } from '@nestjs/common';
 import { SecuritySchemeObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface';
 import { injectDocumentComponents } from './injection';
@@ -28,7 +29,7 @@ function buildBaseOptions() {
   const options = new DocumentBuilder()
     .setTitle('Novu API')
     .setDescription('Novu REST API. Please see https://docs.novu.co/api-reference for more details.')
-    .setVersion('1.0')
+    .setVersion(packageJson.version)
     .setContact('Novu Support', 'https://discord.gg/novu', '[email protected]')
     .setExternalDoc('Novu Documentation', 'https://docs.novu.co')
     .setTermsOfService('https://novu.co/terms')

apps/api/src/app/shared/framework/swagger/swagger.controller.ts

@@ -143,9 +143,15 @@ export function IntegrationConfiguration({
             <InlineToast
               variant={'warning'}
               title="Demo Integration"
-              description={`This is a demo integration intended for testing purposes only. It is limited to 300 ${
-                provider?.channel === 'email' ? 'emails' : 'sms'
-              } per month.`}
+              description={`This is a demo ${
+                provider?.channel === 'email' ? 'email' : 'SMS'
+              } integration intended for testing purposes only. It is limited to 300 ${
+                provider?.channel === 'email' ? 'messages' : 'SMS'
+              } per month.${
+                provider?.channel === 'email'
+                  ? ' You can only send emails from it to the email address you are logged in with.'
+                  : ''
+              }`}
             />
           </div>
         ) : (

apps/dashboard/src/components/integrations/components/integration-configuration.tsx

@@ -47,7 +47,7 @@ COPY --chown=1000:1000 --from=assets /usr/src/app .
 # Install production dependencies
 RUN --mount=type=cache,id=pnpm-store-webhook,target=/root/.pnpm-store \
     pnpm install --reporter=silent --filter "{${PACKAGE_PATH}}..." \
-    --frozen-lockfile --unsafe-perm --prod --reporter=silent
+    --frozen-lockfile --unsafe-perm --reporter=silent
 
 # Set the working directory to the webhook app and start the application using pm2-runtime
 WORKDIR /usr/src/app/apps/webhook

apps/webhook/Dockerfile

@@ -1,47 +1,47 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
-import inlineCss from 'inline-css';
 import { addBreadcrumb } from '@sentry/node';
+import inlineCss from 'inline-css';
 
 import {
-  MessageRepository,
-  SubscriberRepository,
+  CompileEmailTemplate,
+  CompileEmailTemplateCommand,
+  CreateExecutionDetails,
+  CreateExecutionDetailsCommand,
+  DetailEnum,
+  FeatureFlagsService,
+  GetNovuProviderCredentials,
+  InstrumentUsecase,
+  MailFactory,
+  SelectIntegration,
+  SelectVariant,
+} from '@novu/application-generic';
+import {
+  EnvironmentEntity,
   EnvironmentRepository,
   IntegrationEntity,
-  MessageEntity,
   LayoutRepository,
-  EnvironmentEntity,
+  MessageEntity,
+  MessageRepository,
   OrganizationEntity,
+  SubscriberRepository,
   UserEntity,
 } from '@novu/dal';
+import { EmailOutput } from '@novu/framework/internal';
 import {
   ChannelTypeEnum,
   EmailProviderIdEnum,
   ExecutionDetailsSourceEnum,
   ExecutionDetailsStatusEnum,
+  FeatureFlagsKeysEnum,
   IAttachmentOptions,
   IEmailOptions,
-  FeatureFlagsKeysEnum,
 } from '@novu/shared';
-import {
-  InstrumentUsecase,
-  DetailEnum,
-  SelectIntegration,
-  CompileEmailTemplate,
-  CompileEmailTemplateCommand,
-  MailFactory,
-  GetNovuProviderCredentials,
-  SelectVariant,
-  CreateExecutionDetails,
-  CreateExecutionDetailsCommand,
-  FeatureFlagsService,
-} from '@novu/application-generic';
-import { EmailOutput } from '@novu/framework/internal';
 
-import { SendMessageCommand } from './send-message.command';
-import { SendMessageBase } from './send-message.base';
 import { PlatformException } from '../../../shared/utils';
 import { SendMessageResult } from './send-message-type.usecase';
+import { SendMessageBase } from './send-message.base';
+import { SendMessageCommand } from './send-message.command';
 
 const LOG_CONTEXT = 'SendMessageEmail';
 
@@ -76,6 +76,8 @@ export class SendMessageEmail extends SendMessageBase {
   @InstrumentUsecase()
   public async execute(command: SendMessageCommand): Promise<SendMessageResult> {
     let integration: IntegrationEntity | undefined;
+    const { subscriber } = command.compileContext;
+    const email = command.overrides?.email?.toRecipient || subscriber.email;
 
     const overrideSelectedIntegration = command.overrides?.email?.integrationIdentifier;
     try {
@@ -84,16 +86,23 @@ export class SendMessageEmail extends SendMessageBase {
         environmentId: command.environmentId,
         channelType: ChannelTypeEnum.EMAIL,
         userId: command.userId,
+        recipientEmail: email,
         identifier: overrideSelectedIntegration as string,
         filterData: {
           tenant: command.job.tenant,
         },
       });
     } catch (e) {
+      let detailEnum = DetailEnum.LIMIT_PASSED_NOVU_INTEGRATION;
+
+      if (e.message.includes('does not match the current logged-in user')) {
+        detailEnum = DetailEnum.SUBSCRIBER_NOT_MEMBER_OF_ORGANIZATION;
+      }
+
       await this.createExecutionDetails.execute(
         CreateExecutionDetailsCommand.create({
           ...CreateExecutionDetailsCommand.getDetailsFromJob(command.job),
-          detail: DetailEnum.LIMIT_PASSED_NOVU_INTEGRATION,
+          detail: detailEnum,
           source: ExecutionDetailsSourceEnum.INTERNAL,
           status: ExecutionDetailsStatusEnum.FAILED,
           raw: JSON.stringify({ message: e.message }),
@@ -113,9 +122,6 @@ export class SendMessageEmail extends SendMessageBase {
     if (!step) throw new PlatformException('Email channel step not found');
     if (!step.template) throw new PlatformException('Email channel template not found');
 
-    const { subscriber } = command.compileContext;
-    const email = command.overrides?.email?.toRecipient || subscriber.email;
-
     addBreadcrumb({
       message: 'Sending Email',
     });

apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts

@@ -1,8 +1,6 @@
 /* eslint-disable global-require */
-import i18next from 'i18next';
-import { ModuleRef } from '@nestjs/core';
 import { Logger } from '@nestjs/common';
-import { format } from 'date-fns';
+import { ModuleRef } from '@nestjs/core';
 import {
   IntegrationEntity,
   JobEntity,
@@ -19,6 +17,8 @@ import {
   ProvidersIdEnum,
   SmsProviderIdEnum,
 } from '@novu/shared';
+import { format } from 'date-fns';
+import i18next from 'i18next';
 
 import {
   CreateExecutionDetails,
@@ -30,8 +30,8 @@ import {
   SelectVariant,
   SelectVariantCommand,
 } from '@novu/application-generic';
-import { SendMessageResult, SendMessageType } from './send-message-type.usecase';
 import { PlatformException } from '../../../shared/utils';
+import { SendMessageResult, SendMessageType } from './send-message-type.usecase';
 import { SendMessageCommand } from './send-message.command';
 
 export abstract class SendMessageBase extends SendMessageType {
@@ -56,6 +56,7 @@ export abstract class SendMessageBase extends SendMessageType {
     environmentId: string;
     channelType: ChannelTypeEnum;
     userId: string;
+    recipientEmail?: string;
     filterData: {
       tenant: ITenantDefine | undefined;
     };
@@ -73,6 +74,7 @@ export abstract class SendMessageBase extends SendMessageType {
         environmentId: integration._environmentId,
         organizationId: integration._organizationId,
         userId: params.userId,
+        recipientEmail: params.recipientEmail,
       });
     }