The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): allow transactional email without unsubscribe hostname (#26395)
neo77370de8f4ca0a2
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.tsindex b374bda78b5..0abfede73e4 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/aws-ses/services/aws-ses-driver.service.ts@@ -157,7 +157,10 @@ export class AwsSesDriver implements EmailingDomainDriverInterface {async sendEmail(input: EmailingDomainSendEmailRequest,): Promise<EmailingDomainSendEmailResult> {- const unsubscribeBaseUrl = getUnsubscribeBaseUrl(input.emailingDomain);+ const unsubscribeBaseUrl = getUnsubscribeBaseUrl(+ input.emailingDomain,+ input.sendKind,+ );const emailToSend = this.unsubscribeContentService.addTo(input,unsubscribeBaseUrl,@@ -172,7 +175,10 @@ export class AwsSesDriver implements EmailingDomainDriverInterface {async sendEmailBatch(input: EmailingDomainSendEmailBatchRequest,): Promise<EmailingDomainSendEmailBatchResult> {- const unsubscribeBaseUrl = getUnsubscribeBaseUrl(input.emailingDomain);+ const unsubscribeBaseUrl = getUnsubscribeBaseUrl(+ input.emailingDomain,+ input.sendKind,+ );const batchToSend = this.unsubscribeContentService.addToBatch(input,unsubscribeBaseUrl,diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/services/resend-driver.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/services/resend-driver.service.tsindex 7032811e169..4dae42daaaf 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/services/resend-driver.service.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/resend/services/resend-driver.service.ts@@ -128,7 +128,10 @@ export class ResendDriver implements EmailingDomainDriverInterface {);}- const unsubscribeBaseUrl = getUnsubscribeBaseUrl(input.emailingDomain);+ const unsubscribeBaseUrl = getUnsubscribeBaseUrl(+ input.emailingDomain,+ input.sendKind,+ );const emailToSend = this.unsubscribeContentService.addTo(input,unsubscribeBaseUrl,@@ -190,7 +193,10 @@ export class ResendDriver implements EmailingDomainDriverInterface {);}- const unsubscribeBaseUrl = getUnsubscribeBaseUrl(input.emailingDomain);+ const unsubscribeBaseUrl = getUnsubscribeBaseUrl(+ input.emailingDomain,+ input.sendKind,+ );const batchToSend = this.unsubscribeContentService.addToBatch(input,unsubscribeBaseUrl,diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/utils/get-unsubscribe-base-url.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/utils/get-unsubscribe-base-url.util.tsindex cdeb0b8ef67..6a546c41a2e 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/utils/get-unsubscribe-base-url.util.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/drivers/utils/get-unsubscribe-base-url.util.ts@@ -5,11 +5,17 @@ import {EmailingDomainDriverExceptionCode,} from 'src/engine/core-modules/emailing-domain/drivers/exceptions/emailing-domain-driver.exception';import { UnsubscribeHostnameStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/unsubscribe-hostname-status.type';+import { type EmailingDomainSendKind } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-kind.type';import { type EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';export const getUnsubscribeBaseUrl = (emailingDomain: EmailingDomainEntity,-): string => {+ sendKind: EmailingDomainSendKind,+): string | null => {+ if (sendKind === 'TRANSACTIONAL') {+ return null;+ }+if (emailingDomain.unsubscribeHostnameStatus !==UnsubscribeHostnameStatus.ACTIVE ||