Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions apps/backend/src/lib/managed-email-domains.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,22 @@ export async function updateManagedEmailDomainWebhookStatus(options: {
return mapRow(rows[0]!);
}

export async function demoteOtherAppliedManagedEmailDomains(options: {
tenancyId: string,
keepId: string,
}): Promise<void> {
await globalPrismaClient.$queryRaw(Prisma.sql`
UPDATE "ManagedEmailDomain"
SET
"status" = 'VERIFIED'::"ManagedEmailDomainStatus",
"appliedAt" = NULL,
"updatedAt" = CURRENT_TIMESTAMP
WHERE "tenancyId" = ${options.tenancyId}
AND "id" <> ${options.keepId}
AND "status" = 'APPLIED'::"ManagedEmailDomainStatus"
`);
}

export async function markManagedEmailDomainApplied(id: string): Promise<ManagedEmailDomain> {
const rows = await globalPrismaClient.$queryRaw<ManagedEmailDomainRow[]>(Prisma.sql`
UPDATE "ManagedEmailDomain"
Expand Down
17 changes: 16 additions & 1 deletion apps/backend/src/lib/managed-email-onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
ManagedEmailDomain,
ManagedEmailDomainStatus,
createManagedEmailDomain,
demoteOtherAppliedManagedEmailDomains,
getManagedEmailDomainByResendDomainId,
getManagedEmailDomainByTenancyAndSubdomain,
listManagedEmailDomainsForTenancy,
Expand All @@ -12,6 +13,7 @@ import {
import { Tenancy } from "@/lib/tenancies";
import { getNodeEnvironment, getEnvVariable } from "@stackframe/stack-shared/dist/utils/env";
import { StackAssertionError, StatusError } from "@stackframe/stack-shared/dist/utils/errors";
import { runAsynchronously, wait } from "@stackframe/stack-shared/dist/utils/promises";

type ResendDomainRecord = {
record: string,
Expand Down Expand Up @@ -543,7 +545,16 @@ export async function setupManagedEmailProvider(options: { subdomain: string, se
senderLocalPart: options.senderLocalPart,
resendDomainId: `managed_mock_${options.tenancy.id}_${normalizedSubdomain}`.replace(/[^a-zA-Z0-9_-]/g, "_"),
nameServerRecords: ["ns1.dnsimple.com", "ns2.dnsimple.com"],
status: "verified",
status: "pending_verification",
});
runAsynchronously(async () => {
await wait(1000);
await updateManagedEmailDomainWebhookStatus({
resendDomainId: row.resendDomainId,
providerStatusRaw: "verified",
status: "verified",
lastError: null,
});
});
return managedDomainToSetupResult(row);
}
Expand Down Expand Up @@ -631,6 +642,10 @@ export async function applyManagedEmailProvider(options: {
senderLocalPart: domain.senderLocalPart,
});

await demoteOtherAppliedManagedEmailDomains({
tenancyId: options.tenancy.id,
keepId: domain.id,
});
await markManagedEmailDomainApplied(domain.id);
return { status: "applied" };
}
Expand Down
3 changes: 3 additions & 0 deletions apps/dashboard/public/assets/resend-icon-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions apps/dashboard/public/assets/resend-icon-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading