Add IP Pool Name In Integration

apps/api/src/app/integrations/dtos/credentials.dto.ts

@@ -1,8 +1,9 @@
 import { ApiPropertyOptional } from '@nestjs/swagger';
 import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator';
 import { TransformToBoolean } from '../../shared/transformers/to-boolean';
+import { ICredentials } from '@novu/shared';
 
-export class CredentialsDto {
+export class CredentialsDto implements ICredentials {
   @ApiPropertyOptional()
   @IsString()
   @IsOptional()
@@ -115,4 +116,24 @@ export class CredentialsDto {
   @IsString()
   @IsOptional()
   webhookUrl?: string;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+  redirectUrl?: string;
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @IsOptional()
+  hmac?: boolean;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+  serviceAccount?: string;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+  ipPoolName?: string;
 }

apps/api/src/app/integrations/usecases/check-integration/check-integration.command.ts

@@ -1,7 +1,6 @@
-import { IsDefined, IsOptional, IsString, IsBoolean } from 'class-validator';
-import { ICredentials } from '@novu/dal';
+import { IsDefined, IsString } from 'class-validator';
 import { EnvironmentCommand } from '../../../shared/commands/project.command';
-import { ChannelTypeEnum } from '@novu/shared';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 
 export class CheckIntegrationCommand extends EnvironmentCommand {
   @IsDefined()

apps/api/src/app/subscribers/usecases/chat-oauth/chat-oauth.usecase.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 
 import { ChannelTypeEnum } from '@novu/stateless';
-import { IntegrationEntity, IntegrationRepository, EnvironmentRepository, ICredentials } from '@novu/dal';
+import { IntegrationEntity, IntegrationRepository, EnvironmentRepository, ICredentialsEntity } from '@novu/dal';
 
 import { ChatOauthCommand } from './chat-oauth.command';
 import { createHash } from '../../../shared/helpers/hmac.service';
@@ -60,7 +60,7 @@ export class ChatOauth {
     return `${this.SLACK_OAUTH_URL}client_id=${clientId}&scope=incoming-webhook&user_scope=&redirect_uri=${redirectUri}`;
   }
 
-  private async getCredentials(command: ChatOauthCommand): Promise<ICredentials> {
+  private async getCredentials(command: ChatOauthCommand): Promise<ICredentialsEntity> {
     const query: Partial<IntegrationEntity> & { _environmentId: string } = {
       _environmentId: command.environmentId,
       channel: ChannelTypeEnum.CHAT,

apps/web/src/pages/integrations/IntegrationsStoreModal.tsx

@@ -9,6 +9,7 @@ import {
   InAppProviderIdEnum,
   ProvidersIdEnum,
   SmsProviderIdEnum,
+  ICredentials,
 } from '@novu/shared';
 
 import { useAuthController, useEnvController } from '../../hooks';
@@ -18,7 +19,7 @@ import { NovuInAppProviderModal } from './components/NovuInAppProviderModal';
 import { ChannelGroup } from './components/Modal/ChannelGroup';
 import { colors, shadows, Title } from '../../design-system';
 import { ConnectIntegrationForm } from './components/Modal/ConnectIntegrationForm';
-import { Close } from '../../design-system/icons/actions/Close';
+import { Close } from '../../design-system/icons';
 import { useProviders } from './useProviders';
 import { useSegment } from '../../components/providers/SegmentProvider';
 import { IntegrationsStoreModalAnalytics } from './constants';
@@ -328,32 +329,6 @@ export interface IIntegratedProvider {
   novu?: boolean;
 }
 
-export interface ICredentials {
-  apiKey?: string;
-  user?: string;
-  secretKey?: string;
-  domain?: string;
-  password?: string;
-  host?: string;
-  port?: string;
-  secure?: boolean;
-  region?: string;
-  accountSid?: string;
-  messageProfileId?: string;
-  token?: string;
-  from?: string;
-  senderName?: string;
-  applicationId?: string;
-  clientId?: string;
-  projectName?: string;
-  serviceAccount?: string;
-  baseUrl?: string;
-  webhookUrl?: string;
-  requireTls?: boolean;
-  ignoreTls?: boolean;
-  tlsOptions?: Record<string, unknown>;
-}
-
 export interface IntegrationEntity {
   _id?: string;
 

apps/web/src/pages/integrations/IntegrationsStorePage.tsx

@@ -12,6 +12,7 @@ import {
   InAppProviderIdEnum,
   ProvidersIdEnum,
   SmsProviderIdEnum,
+  ICredentials,
 } from '@novu/shared';
 
 import PageHeader from '../../components/layout/components/PageHeader';
@@ -152,34 +153,6 @@ export interface IIntegratedProvider {
   novu?: boolean;
 }
 
-export interface ICredentials {
-  apiKey?: string;
-  user?: string;
-  secretKey?: string;
-  domain?: string;
-  password?: string;
-  host?: string;
-  port?: string;
-  secure?: boolean;
-  region?: string;
-  accountSid?: string;
-  messageProfileId?: string;
-  token?: string;
-  from?: string;
-  senderName?: string;
-  applicationId?: string;
-  clientId?: string;
-  projectName?: string;
-  serviceAccount?: string;
-  baseUrl?: string;
-  webhookUrl?: string;
-  requireTls?: boolean;
-  ignoreTls?: boolean;
-  tlsOptions?: Record<string, unknown>;
-  redirectUrl?: string;
-  hmac?: boolean;
-}
-
 export interface IntegrationEntity {
   _id?: string;
 

apps/web/src/pages/integrations/components/ConnectIntegrationForm.tsx

@@ -11,7 +11,7 @@ import { ChannelTypeEnum, ICredentialsDto, IConfigCredentials } from '@novu/shar
 import { Button, colors, Input, Switch, Text } from '../../../design-system';
 import { IIntegratedProvider } from '../IntegrationsStorePage';
 import { createIntegration, getWebhookSupportStatus, updateIntegration } from '../../../api/integration';
-import { Close } from '../../../design-system/icons/actions/Close';
+import { Close } from '../../../design-system/icons';
 import { IntegrationInput } from './IntegrationInput';
 import { IS_DOCKER_HOSTED, WEBHOOK_URL } from '../../../config';
 import { useEnvController, useAuthController } from '../../../hooks';

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

@@ -1,38 +1,9 @@
-import { ChannelTypeEnum } from '@novu/shared';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 
 import type { EnvironmentId } from '../environment';
 import type { OrganizationId } from '../organization';
 import { ChangePropsValueType } from '../../types/helpers';
 
-export interface ICredentials {
-  apiKey?: string;
-  user?: string;
-  secretKey?: string;
-  domain?: string;
-  password?: string;
-  host?: string;
-  port?: string;
-  secure?: boolean;
-  region?: string;
-  accountSid?: string;
-  messageProfileId?: string;
-  token?: string;
-  from?: string;
-  senderName?: string;
-  applicationId?: string;
-  clientId?: string;
-  projectName?: string;
-  serviceAccount?: string;
-  baseUrl?: string;
-  webhookUrl?: string;
-  ipPoolName?: string;
-  requireTls?: boolean;
-  ignoreTls?: boolean;
-  tlsOptions?: Record<string, unknown>;
-  redirectUrl?: string;
-  hmac?: boolean;
-}
-
 export class IntegrationEntity {
   _id: string;
 
@@ -44,7 +15,7 @@ export class IntegrationEntity {
 
   channel: ChannelTypeEnum;
 
-  credentials: ICredentials;
+  credentials: ICredentialsEntity;
 
   active: boolean;
 
@@ -59,4 +30,6 @@ export class IntegrationEntity {
   deletedBy: string;
 }
 
+export type ICredentialsEntity = ICredentials;
+
 export type IntegrationDBModel = ChangePropsValueType<IntegrationEntity, '_environmentId' | '_organizationId'>;

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

@@ -44,6 +44,7 @@ const integrationSchema = new Schema<IntegrationDBModel>(
       tlsOptions: Schema.Types.Mixed,
       redirectUrl: Schema.Types.String,
       hmac: Schema.Types.Boolean,
+      ipPoolName: Schema.Types.String,
     },
     active: {
       type: Schema.Types.Boolean,

libs/shared/src/consts/providers/credentials/provider-credentials.ts

@@ -201,6 +201,12 @@ export const sendgridConfig: IConfigCredentials[] = [
     type: 'string',
     required: true,
   },
+  {
+    key: CredentialsKeyEnum.IpPoolName,
+    displayName: 'IP Pool Name',
+    type: 'string',
+    required: false,
+  },
   ...mailConfigBase,
 ];
 

libs/shared/src/consts/providers/provider.enum.ts

@@ -26,6 +26,7 @@ export enum CredentialsKeyEnum {
   TlsOptions = 'tlsOptions',
   RedirectUrl = 'redirectUrl',
   Hmac = 'hmac',
+  IpPoolName = 'ipPoolName',
 }
 
 export enum EmailProviderIdEnum {

libs/shared/src/dto/integration/construct-integration.interface.ts

@@ -1,30 +1,6 @@
-export interface ICredentialsDto {
-  apiKey?: string;
-  user?: string;
-  secretKey?: string;
-  domain?: string;
-  password?: string;
-  host?: string;
-  port?: string;
-  secure?: boolean;
-  hmac?: boolean;
-  region?: string;
-  accountSid?: string;
-  messageProfileId?: string;
-  token?: string;
-  from?: string;
-  senderName?: string;
-  applicationId?: string;
-  clientId?: string;
-  projectName?: string;
-  serviceAccount?: string;
-  baseUrl?: string;
-  requireTls?: boolean;
-  ignoreTls?: boolean;
-  tlsOptions?: Record<string, unknown>;
-  webhookUrl?: string;
-  redirectUrl?: string;
-}
+import { ICredentials } from '../../entities/integration';
+
+export type ICredentialsDto = ICredentials;
 
 export interface IConstructIntegrationDto {
   credentials: ICredentialsDto;

libs/shared/src/entities/integration/credential.interface.ts

@@ -0,0 +1,28 @@
+export interface ICredentials {
+  apiKey?: string;
+  user?: string;
+  secretKey?: string;
+  domain?: string;
+  password?: string;
+  host?: string;
+  port?: string;
+  secure?: boolean;
+  region?: string;
+  accountSid?: string;
+  messageProfileId?: string;
+  token?: string;
+  from?: string;
+  senderName?: string;
+  applicationId?: string;
+  clientId?: string;
+  projectName?: string;
+  serviceAccount?: string;
+  baseUrl?: string;
+  webhookUrl?: string;
+  requireTls?: boolean;
+  ignoreTls?: boolean;
+  tlsOptions?: Record<string, unknown>;
+  redirectUrl?: string;
+  hmac?: boolean;
+  ipPoolName?: string;
+}

libs/shared/src/entities/integration/index.ts

@@ -0,0 +1 @@
+export * from './credential.interface';

libs/shared/src/index.ts

@@ -15,6 +15,7 @@ export * from './entities/subscriber-preference';
 export * from './entities/subscriber';
 export * from './entities/layout';
 export * from './entities/notification-group';
+export * from './entities/integration';
 export * from './types';
 export * from './dto';
 export * from './consts';

packages/application-generic/src/factories/chat/handlers/discord.handler.ts

@@ -1,4 +1,4 @@
-import { ICredentials } from '@novu/dal';
+import { ICredentials } from '@novu/shared';
 import { ChannelTypeEnum } from '@novu/stateless';
 import { BaseChatHandler } from './base.handler';
 import { DiscordProvider } from '@novu/discord';

packages/application-generic/src/factories/chat/handlers/mattermost.handler.ts

@@ -1,4 +1,4 @@
-import { ICredentials } from '@novu/dal';
+import { ICredentials } from '@novu/shared';
 import { ChannelTypeEnum } from '@novu/stateless';
 import { BaseChatHandler } from './base.handler';
 import { MattermostProvider } from '@novu/mattermost';

packages/application-generic/src/factories/chat/handlers/msteams.handler.ts

@@ -1,4 +1,4 @@
-import { ICredentials } from '@novu/dal';
+import { ICredentials } from '@novu/shared';
 import { ChannelTypeEnum } from '@novu/stateless';
 import { BaseChatHandler } from './base.handler';
 import { MsTeamsProvider } from '@novu/ms-teams';

packages/application-generic/src/factories/chat/handlers/slack.handler.ts

@@ -1,4 +1,4 @@
-import { ICredentials } from '@novu/dal';
+import { ICredentials } from '@novu/shared';
 import { ChannelTypeEnum } from '@novu/stateless';
 import { SlackProvider } from '@novu/slack';
 

packages/application-generic/src/factories/chat/interfaces/index.ts

@@ -1,6 +1,6 @@
 import { IChatOptions, ISendMessageSuccessResponse } from '@novu/stateless';
-import { ICredentials, IntegrationEntity } from '@novu/dal';
-import { ChannelTypeEnum } from '@novu/shared';
+import { IntegrationEntity } from '@novu/dal';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 
 export interface IChatHandler {
   canHandle(providerId: string, channelType: ChannelTypeEnum);

packages/application-generic/src/factories/mail/handlers/email-webhook.handler.ts

@@ -1,6 +1,5 @@
-import { ChannelTypeEnum } from '@novu/shared';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 import { EmailWebhookProvider } from '@novu/email-webhook';
-import { ICredentials } from '@novu/dal';
 import { BaseHandler } from './base.handler';
 export class EmailWebhookHandler extends BaseHandler {
   constructor() {

packages/application-generic/src/factories/mail/handlers/emailjs.handler.ts

@@ -1,7 +1,6 @@
 import { IEmailJsConfig } from '@novu/emailjs/build/main/lib/emailjs.config';
 import { EmailJsProvider } from '@novu/emailjs';
-import { ChannelTypeEnum } from '@novu/shared';
-import { ICredentials } from '@novu/dal';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 import { BaseHandler } from './base.handler';
 
 /**

packages/application-generic/src/factories/mail/handlers/infobip.handler.ts

@@ -1,6 +1,5 @@
 import { InfobipEmailProvider } from '@novu/infobip';
-import { ChannelTypeEnum } from '@novu/shared';
-import { ICredentials } from '@novu/dal';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 import { BaseHandler } from './base.handler';
 
 export class InfobipEmailHandler extends BaseHandler {

packages/application-generic/src/factories/mail/handlers/mailersend.handler.ts

@@ -1,5 +1,4 @@
-import { ChannelTypeEnum } from '@novu/shared';
-import { ICredentials } from '@novu/dal';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 import { MailersendEmailProvider } from '@novu/mailersend';
 
 import { BaseHandler } from './base.handler';

packages/application-generic/src/factories/mail/handlers/mailgun.handler.ts

@@ -1,6 +1,5 @@
 import { MailgunEmailProvider } from '@novu/mailgun';
-import { ChannelTypeEnum } from '@novu/shared';
-import { ICredentials } from '@novu/dal';
+import { ChannelTypeEnum, ICredentials } from '@novu/shared';
 import { BaseHandler } from './base.handler';
 
 export class MailgunHandler extends BaseHandler {