Merge branch 'next' into self-hosted-auth

Author: djabarovgeorge

.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

@@ -8,7 +8,17 @@ import { EnvironmentEntity } from '@novu/dal';
 import { FullPayloadForRender, RenderCommand } from './render-command';
 import { MailyAttrsEnum } from '../../../shared/helpers/maily.types';
 import { parseLiquid } from '../../../shared/helpers/liquid';
-import { hasShow, isRepeatNode, isVariableNode, wrapMailyInLiquid } from '../../../shared/helpers/maily-utils';
+import {
+  hasShow,
+  isButtonNode,
+  isImageNode,
+  isLinkNode,
+  isRepeatNode,
+  isVariableNode,
+  wrapMailyInLiquid,
+} from '../../../shared/helpers/maily-utils';
+
+type MailyJSONMarks = NonNullable<MailyJSONContent['marks']>[number];
 
 export class EmailOutputRendererCommand extends RenderCommand {
   environmentId: string;
@@ -249,7 +259,11 @@ export class EmailOutputRendererUsecase {
     }
   }
 
-  private processForEachNodes(nodes: MailyJSONContent[], iterablePath: string, index: number): MailyJSONContent[] {
+  private processForEachNodes(
+    nodes: MailyJSONContent[],
+    iterablePath: string,
+    index: number
+  ): Array<MailyJSONContent | MailyJSONMarks> {
     return nodes.map((node) => {
       const processedNode = { ...node };
 
@@ -262,10 +276,54 @@ export class EmailOutputRendererUsecase {
         return processedNode;
       }
 
+      if (isButtonNode(processedNode)) {
+        if (processedNode.attrs?.text) {
+          processedNode.attrs.text = this.addIndexToLiquidExpression(processedNode.attrs.text, iterablePath, index);
+        }
+
+        if (processedNode.attrs?.url) {
+          processedNode.attrs.url = this.addIndexToLiquidExpression(processedNode.attrs.url, iterablePath, index);
+        }
+
+        return processedNode;
+      }
+
+      if (isImageNode(processedNode)) {
+        if (processedNode.attrs?.src) {
+          processedNode.attrs.src = this.addIndexToLiquidExpression(processedNode.attrs.src, iterablePath, index);
+        }
+
+        if (processedNode.attrs?.externalLink) {
+          processedNode.attrs.externalLink = this.addIndexToLiquidExpression(
+            processedNode.attrs.externalLink,
+            iterablePath,
+            index
+          );
+        }
+
+        return processedNode;
+      }
+
+      if (isLinkNode(processedNode)) {
+        if (processedNode.attrs?.href) {
+          processedNode.attrs.href = this.addIndexToLiquidExpression(processedNode.attrs.href, iterablePath, index);
+        }
+
+        return processedNode;
+      }
+
       if (processedNode.content?.length) {
         processedNode.content = this.processForEachNodes(processedNode.content, iterablePath, index);
       }
 
+      if (processedNode.marks?.length) {
+        processedNode.marks = this.processForEachNodes(
+          processedNode.marks,
+          iterablePath,
+          index
+        ) as Array<MailyJSONMarks>;
+      }
+
       return processedNode;
     });
   }

apps/api/src/app/environments-v1/usecases/output-renderers/email-output-renderer.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

@@ -2,6 +2,6 @@ export class SubscriberSessionResponseDto {
   readonly token: string;
   readonly totalUnreadCount: number;
   readonly removeNovuBranding: boolean;
-  readonly isSnoozeEnabled: boolean;
+  readonly maxSnoozeDurationHours: number;
   readonly isDevelopmentMode: boolean;
 }

apps/api/src/app/inbox/dtos/subscriber-session-response.dto.ts

@@ -2,12 +2,7 @@ import sinon from 'sinon';
 import { expect } from 'chai';
 import { NotFoundException, BadRequestException } from '@nestjs/common';
 import { CommunityOrganizationRepository, EnvironmentRepository, IntegrationRepository } from '@novu/dal';
-import {
-  AnalyticsService,
-  CreateOrUpdateSubscriberUseCase,
-  FeatureFlagsService,
-  SelectIntegration,
-} from '@novu/application-generic';
+import { AnalyticsService, CreateOrUpdateSubscriberUseCase, SelectIntegration } from '@novu/application-generic';
 import { ApiServiceLevelEnum, ChannelTypeEnum, InAppProviderIdEnum } from '@novu/shared';
 import { AuthService } from '../../../auth/services/auth.service';
 import { Session } from './session.usecase';
@@ -45,7 +40,6 @@ describe('Session', () => {
   let notificationsCount: sinon.SinonStubbedInstance<NotificationsCount>;
   let integrationRepository: sinon.SinonStubbedInstance<IntegrationRepository>;
   let organizationRepository: sinon.SinonStubbedInstance<CommunityOrganizationRepository>;
-  let featureFlagsService: sinon.SinonStubbedInstance<FeatureFlagsService>;
 
   beforeEach(() => {
     environmentRepository = sinon.createStubInstance(EnvironmentRepository);
@@ -56,7 +50,6 @@ describe('Session', () => {
     notificationsCount = sinon.createStubInstance(NotificationsCount);
     integrationRepository = sinon.createStubInstance(IntegrationRepository);
     organizationRepository = sinon.createStubInstance(CommunityOrganizationRepository);
-    featureFlagsService = sinon.createStubInstance(FeatureFlagsService);
 
     session = new Session(
       environmentRepository as any,
@@ -66,8 +59,7 @@ describe('Session', () => {
       analyticsService as any,
       notificationsCount as any,
       integrationRepository as any,
-      organizationRepository as any,
-      featureFlagsService as any
+      organizationRepository as any
     );
   });
 
@@ -226,9 +218,7 @@ describe('Session', () => {
     ).to.be.true;
   });
 
-  it('should return the correct isSnoozeEnabled value for different service levels', async () => {
-    featureFlagsService.getFlag.resolves(true);
-
+  it('should return the correct maxSnoozeDurationHours value for different service levels', async () => {
     const command: SessionCommand = {
       applicationIdentifier: 'app-id',
       subscriber: { subscriberId: 'subscriber-id' },
@@ -247,24 +237,24 @@ describe('Session', () => {
     notificationsCount.execute.resolves(notificationCount);
     authService.getSubscriberWidgetToken.resolves(token);
 
-    // FREE plan should have snooze disabled
+    // FREE plan should have 24 hours max snooze duration
     organizationRepository.findOne.resolves({ apiServiceLevel: ApiServiceLevelEnum.FREE } as any);
     const freeResponse: SubscriberSessionResponseDto = await session.execute(command);
-    expect(freeResponse.isSnoozeEnabled).to.equal(false);
+    expect(freeResponse.maxSnoozeDurationHours).to.equal(24);
 
-    // PRO plan should have snooze enabled
+    // PRO plan should have 90 days max snooze duration
     organizationRepository.findOne.resolves({ apiServiceLevel: ApiServiceLevelEnum.PRO } as any);
     const proResponse: SubscriberSessionResponseDto = await session.execute(command);
-    expect(proResponse.isSnoozeEnabled).to.equal(true);
+    expect(proResponse.maxSnoozeDurationHours).to.equal(90 * 24);
 
-    // BUSINESS/TEAM plan should have snooze enabled
+    // BUSINESS/TEAM plan should have 90 days max snooze duration
     organizationRepository.findOne.resolves({ apiServiceLevel: ApiServiceLevelEnum.BUSINESS } as any);
     const businessResponse: SubscriberSessionResponseDto = await session.execute(command);
-    expect(businessResponse.isSnoozeEnabled).to.equal(true);
+    expect(businessResponse.maxSnoozeDurationHours).to.equal(90 * 24);
 
-    // ENTERPRISE plan should have snooze enabled
+    // ENTERPRISE plan should have 90 days max snooze duration
     organizationRepository.findOne.resolves({ apiServiceLevel: ApiServiceLevelEnum.ENTERPRISE } as any);
     const enterpriseResponse: SubscriberSessionResponseDto = await session.execute(command);
-    expect(enterpriseResponse.isSnoozeEnabled).to.equal(true);
+    expect(enterpriseResponse.maxSnoozeDurationHours).to.equal(90 * 24);
   });
 });

apps/api/src/app/inbox/usecases/session/session.spec.ts

@@ -6,20 +6,16 @@ import {
   LogDecorator,
   SelectIntegration,
   SelectIntegrationCommand,
-  FeatureFlagsService,
 } from '@novu/application-generic';
 import {
   CommunityOrganizationRepository,
   EnvironmentEntity,
   EnvironmentRepository,
   IntegrationRepository,
-  OrganizationEntity,
-  UserEntity,
 } from '@novu/dal';
 import {
   ApiServiceLevelEnum,
   ChannelTypeEnum,
-  FeatureFlagsKeysEnum,
   FeatureNameEnum,
   getFeatureForTierAsNumber,
   InAppProviderIdEnum,
@@ -46,8 +42,7 @@ export class Session {
     private analyticsService: AnalyticsService,
     private notificationsCount: NotificationsCount,
     private integrationRepository: IntegrationRepository,
-    private organizationRepository: CommunityOrganizationRepository,
-    private featureFlagsService: FeatureFlagsService
+    private organizationRepository: CommunityOrganizationRepository
   ) {}
 
   @LogDecorator()
@@ -116,11 +111,7 @@ export class Session {
     const token = await this.authService.getSubscriberWidgetToken(subscriber);
 
     const removeNovuBranding = inAppIntegration.removeNovuBranding || false;
-    const isSnoozeEnabled = await this.isSnoozeEnabled(
-      environment._organizationId,
-      environment._id,
-      command.subscriber.subscriberId
-    );
+    const maxSnoozeDurationHours = await this.getMaxSnoozeDurationHours(environment);
 
     /**
      * We want to prevent the playground inbox demo from marking the integration as connected
@@ -151,34 +142,22 @@ export class Session {
       token,
       totalUnreadCount,
       removeNovuBranding,
-      isSnoozeEnabled,
+      maxSnoozeDurationHours,
       isDevelopmentMode: environment.name.toLowerCase() !== 'production',
     };
   }
 
-  private async isSnoozeEnabled(organizationId: string, environmentId: string, subscriberId: string) {
+  private async getMaxSnoozeDurationHours(environment: EnvironmentEntity) {
     const organization = await this.organizationRepository.findOne({
-      _id: organizationId,
-    });
-
-    const isSnoozeEnabled = await this.featureFlagsService.getFlag({
-      key: FeatureFlagsKeysEnum.IS_SNOOZE_ENABLED,
-      defaultValue: false,
-      organization: { _id: organizationId } as OrganizationEntity,
-      environment: { _id: environmentId } as EnvironmentEntity,
-      user: { _id: subscriberId } as UserEntity,
+      _id: environment._organizationId,
     });
 
-    if (!isSnoozeEnabled) {
-      return false;
-    }
-
     const tierLimitMs = getFeatureForTierAsNumber(
       FeatureNameEnum.PLATFORM_MAX_SNOOZE_DURATION,
       organization?.apiServiceLevel || ApiServiceLevelEnum.FREE,
       true
     );
 
-    return tierLimitMs > 0;
+    return tierLimitMs / 1000 / 60 / 60;
   }
 }