Skip to content

The open alternative to Salesforce, designed for AI.

Serve unsubscribe links from the server host when Cloudflare is not configured (#26898)

neo773921c71075d55
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts
index fdba8fa79ad..c9fdf23ec1d 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service.ts
@@ -13,6 +13,7 @@ import { UnsubscribeHostnameStatus } from 'src/engine/core-modules/emailing-doma
import { type VerificationRecord } from 'src/engine/core-modules/emailing-domain/drivers/types/verifications-record.type';
import { EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';
import { DnsManagerService } from 'src/engine/core-modules/dns-manager/services/dns-manager.service';
+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@@ -24,6 +25,7 @@ export class UnsubscribeHostnameService {
@InjectWorkspaceScopedRepository(EmailingDomainEntity)
private readonly emailingDomainRepository: WorkspaceScopedRepository<EmailingDomainEntity>,
private readonly dnsManagerService: DnsManagerService,
+ private readonly twentyConfigService: TwentyConfigService,
) {}
async provision(emailingDomain: EmailingDomainEntity): Promise<void> {
@@ -107,11 +109,13 @@ export class UnsubscribeHostnameService {
emailingDomainId: string,
{ provision }: { provision: boolean },
): Promise<void> {
- if (!this.dnsManagerService.isConfigured()) {
- return;
- }
-
try {
+ if (!this.dnsManagerService.isConfigured()) {
+ await this.useServerHostname(workspaceId, emailingDomainId);
+
+ return;
+ }
+
const emailingDomain = await this.emailingDomainRepository.findOneOrFail(
workspaceId,
{ where: { id: emailingDomainId } },
@@ -154,7 +158,10 @@ export class UnsubscribeHostnameService {
async getDnsRecords(
emailingDomain: EmailingDomainEntity,
): Promise<VerificationRecord[]> {
- if (!isNonEmptyString(emailingDomain.unsubscribeHostname)) {
+ if (
+ !this.dnsManagerService.isConfigured() ||
+ !isNonEmptyString(emailingDomain.unsubscribeHostname)
+ ) {
return [];
}
@@ -183,6 +190,27 @@ export class UnsubscribeHostnameService {
}
}
+ private async useServerHostname(
+ workspaceId: string,
+ emailingDomainId: string,
+ ): Promise<void> {
+ const serverUrl = new URL(this.twentyConfigService.get('SERVER_URL'));
+
+ if (serverUrl.protocol !== 'https:') {
+ return;
+ }
+
+ await this.emailingDomainRepository.update(
+ workspaceId,
+ { id: emailingDomainId },
+ {
+ unsubscribeHostname: serverUrl.host,
+ unsubscribeHostnameId: null,
+ unsubscribeHostnameStatus: UnsubscribeHostnameStatus.ACTIVE,
+ },
+ );
+ }
+
private buildHostname(domain: string): string {
return `${UNSUBSCRIBE_HOSTNAME_PREFIX}.${domain}`;
}