Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Prevent orphan domains (#5732)
Oleg Isonen7cfaf5533bc8
diff --git a/packages/domain/src/db/domain.test.ts b/packages/domain/src/db/domain.test.tsindex 8b13b8ad8e..068fb4b63e 100644--- a/packages/domain/src/db/domain.test.ts+++ b/packages/domain/src/db/domain.test.ts@@ -7,18 +7,31 @@ import {testContext,} from "@webstudio-is/postgrest/testing";import type { AppContext } from "@webstudio-is/trpc-interface/index.server";-import { countTotalDomains, create } from "./domain";+import { countTotalDomains, create, remove } from "./domain";const server = createTestServer();-const createContext = (): AppContext =>+const createContext = (overrides: Partial<AppContext> = {}): AppContext =>({...testContext,authorization: { type: "user", userId: "owner-1" },getOwnerPlanFeatures: () => Promise.resolve({}),domain: {},- deployment: {},+ deployment: {+ deploymentTrpc: {+ unpublish: {+ mutate: () => Promise.resolve({ success: true }),+ },+ },+ env: {+ BUILDER_ORIGIN: "https://apps.webstudio.is",+ GITHUB_REF_NAME: "main",+ GITHUB_SHA: undefined,+ PUBLISHER_HOST: "wstd.io",+ },+ },entri: {},+ ...overrides,}) as unknown as AppContext;/**@@ -124,3 +137,124 @@ describe("create — domain limit guard (msw)", () => {expect(result).toEqual({ success: true });});});++// ---------------------------------------------------------------------------+// remove+// Detaches the domain only after unpublishing and marks unreferenced domains+// inactive so they do not remain ACTIVE orphans.+// ---------------------------------------------------------------------------++describe("remove (msw)", () => {+ test("unpublishes, detaches, and marks an unreferenced domain inactive", async () => {+ let unpublishedDomain: string | undefined;+ let projectDomainDeleted = false;+ let domainUpdate: unknown;++ server.use(+ projectHandler,+ db.get("ProjectDomain", ({ request }) => {+ const url = new URL(request.url);+ expect(url.searchParams.get("domainId")).toBe("eq.domain-id-1");+ expect(url.searchParams.get("projectId")).toBe("eq.proj-1");+ return json({+ domain: {+ id: "domain-id-1",+ domain: "example.com",+ },+ });+ }),+ db.get("Build", () => json([])),+ db.delete("ProjectDomain", () => {+ projectDomainDeleted = true;+ return empty({ status: 204 });+ }),+ db.head("ProjectDomain", () =>+ empty({ headers: { "Content-Range": "*/0" } })+ ),+ db.patch("Domain", async ({ request }) => {+ domainUpdate = await request.json();+ return json({ id: "domain-id-1" });+ })+ );++ const result = await remove(+ { projectId: "proj-1", domainId: "domain-id-1" },+ createContext({+ deployment: {+ deploymentTrpc: {+ publish: {+ mutate: () => Promise.resolve({ success: true }),+ },+ unpublish: {+ mutate: ({ domain }: { domain: string }) => {+ unpublishedDomain = domain;+ return Promise.resolve({ success: true });+ },+ },+ },+ env: {+ BUILDER_ORIGIN: "https://apps.webstudio.is",+ GITHUB_REF_NAME: "main",+ GITHUB_SHA: undefined,+ PUBLISHER_HOST: "wstd.io",+ },+ },+ })+ );++ expect(result).toEqual({ success: true });+ expect(unpublishedDomain).toBe("example.com");+ expect(projectDomainDeleted).toBe(true);+ expect(domainUpdate).toEqual({+ status: "INITIALIZING",+ error: "Removed from project",+ txtRecord: null,+ });+ });++ test("does not detach when unpublish fails", async () => {+ let projectDomainDeleted = false;++ server.use(+ projectHandler,+ db.get("ProjectDomain", () =>+ json({+ domain: {+ id: "domain-id-1",+ domain: "example.com",+ },+ })+ ),+ db.delete("ProjectDomain", () => {+ projectDomainDeleted = true;+ return empty({ status: 204 });+ })+ );++ const result = await remove(+ { projectId: "proj-1", domainId: "domain-id-1" },+ createContext({+ deployment: {+ deploymentTrpc: {+ publish: {+ mutate: () => Promise.resolve({ success: true }),+ },+ unpublish: {+ mutate: () =>+ Promise.resolve({ success: false, error: "Cloudflare failed" }),+ },+ },+ env: {+ BUILDER_ORIGIN: "https://apps.webstudio.is",+ GITHUB_REF_NAME: "main",+ GITHUB_SHA: undefined,+ PUBLISHER_HOST: "wstd.io",+ },+ },+ })+ );++ expect(result).toEqual({ success: false, error: "Cloudflare failed" });+ expect(projectDomainDeleted).toBe(false);+ });+});diff --git a/packages/domain/src/db/domain.ts b/packages/domain/src/db/domain.tsindex 5ae62c0977..e1d08d5070 100644--- a/packages/domain/src/db/domain.ts+++ b/packages/domain/src/db/domain.ts@@ -5,6 +5,7 @@ import {createErrorResponse,} from "@webstudio-is/trpc-interface/index.server";import * as projectApi from "@webstudio-is/project/index.server";+import { unpublishBuild } from "@webstudio-is/project-build/index.server";import { validateDomain } from "./validate";import { cnameFromUserId } from "./cname-from-user-id";import type { Project } from "@webstudio-is/project";@@ -196,6 +197,48 @@ export const remove = async (throw new Error("You don't have access to delete this project domains");}+ const projectDomainResult = await context.postgrest.client+ .from("ProjectDomain")+ .select("domain:Domain(id, domain)")+ .eq("domainId", props.domainId)+ .eq("projectId", props.projectId)+ .single();++ if (projectDomainResult.error) {+ return createErrorResponse(projectDomainResult.error);+ }++ const domain = projectDomainResult.data.domain;+ if (domain === null) {+ return createErrorResponse("Domain not found");+ }++ const deploymentResult = await context.deployment.deploymentTrpc.unpublish+ .mutate({+ domain: domain.domain,+ })+ .catch((error) => createErrorResponse(error));++ if (+ deploymentResult.success === false &&+ deploymentResult.error !== "NOT_IMPLEMENTED"+ ) {+ return deploymentResult;+ }++ await unpublishBuild(+ { projectId: props.projectId, domain: domain.domain },+ context+ ).catch((error) => {+ if (+ error instanceof Error &&+ error.message === `Domain ${domain.domain} is not published`+ ) {+ return;+ }+ throw error;+ });+const deleteResult = await context.postgrest.client.from("ProjectDomain").delete()@@ -206,6 +249,30 @@ export const remove = async (return createErrorResponse(deleteResult.error);}+ const remainingDomains = await context.postgrest.client+ .from("ProjectDomain")+ .select("domainId", { count: "exact", head: true })+ .eq("domainId", props.domainId);++ if (remainingDomains.error) {+ return createErrorResponse(remainingDomains.error);+ }++ if (remainingDomains.count === 0) {+ const updateResult = await context.postgrest.client+ .from("Domain")+ .update({+ status: "INITIALIZING",+ error: "Removed from project",+ txtRecord: null,+ })+ .eq("id", props.domainId);++ if (updateResult.error) {+ return createErrorResponse(updateResult.error);+ }+ }+return { success: true };};