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
feat: Migrate billing portal from n8n to payment worker (#5653)
Oleg Isonena7329a645297
diff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.tsindex 1a88e0a5b6..4ceaaa1777 100644--- a/apps/builder/app/env/env.server.ts+++ b/apps/builder/app/env/env.server.ts@@ -54,6 +54,9 @@ const env = {N8N_WEBHOOK_URL: process.env.N8N_WEBHOOK_URL,N8N_WEBHOOK_TOKEN: process.env.N8N_WEBHOOK_TOKEN,+ PAYMENT_WORKER_URL: process.env.PAYMENT_WORKER_URL,+ PAYMENT_WORKER_TOKEN: process.env.PAYMENT_WORKER_TOKEN,+PUBLISHER_HOST: process.env.PUBLISHER_HOST || "wstd.work",STAGING_USERNAME: process.env.STAGING_USERNAME ?? "admin",diff --git a/apps/builder/app/routes/payments.$.tsx b/apps/builder/app/routes/payments.$.tsxnew file mode 100644index 0000000000..a92e045117--- /dev/null+++ b/apps/builder/app/routes/payments.$.tsx@@ -0,0 +1,128 @@+import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";+import { isRouteErrorResponse, useRouteError } from "@remix-run/react";+import { z } from "zod";+import { findAuthenticatedUser } from "~/services/auth.server";+import { isDashboard, loginPath } from "~/shared/router-utils";+import env from "~/env/env.server";+import cookie from "cookie";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { redirect } from "~/services/no-store-redirect";+import { allowedDestinations } from "~/services/destinations.server";++const zWorkerResponse = z.union([+ z.object({+ type: z.literal("error"),+ error: z.string(),+ }),+ z.object({+ type: z.literal("redirect"),+ to: z.string(),+ }),+]);++const zWorkerEnv = z.object({+ PAYMENT_WORKER_URL: z.string(),+ PAYMENT_WORKER_TOKEN: z.string(),+});++export const loader = async ({ request, params }: LoaderFunctionArgs) => {+ if (isDashboard(request) === false) {+ throw new Response("Not Found", {+ status: 404,+ });+ }++ preventCrossOriginCookie(request);+ allowedDestinations(request, ["document", "empty"]);++ const user = await findAuthenticatedUser(request);++ if (user === null) {+ const url = new URL(request.url);+ throw redirect(+ loginPath({+ returnTo: `${url.pathname}?${url.searchParams.toString()}`,+ })+ );+ }++ const workerEnvParsed = zWorkerEnv.safeParse(env);+ if (workerEnvParsed.success === false) {+ throw new Response(workerEnvParsed.error.message, {+ status: 400,+ });+ }++ const workerEnv = workerEnvParsed.data;++ const workerUrl = new URL(workerEnv.PAYMENT_WORKER_URL);+ workerUrl.pathname = `${workerUrl.pathname}/${params["*"]}`+ .split("/")+ .filter(Boolean)+ .join("/");+ workerUrl.search = new URL(request.url).search;++ const requestUrl = new URL(request.url);++ const response = await fetch(workerUrl.href, {+ method: "POST",+ headers: {+ "Content-Type": "application/json",+ Authorization: `Bearer ${workerEnv.PAYMENT_WORKER_TOKEN}`,+ },+ body: JSON.stringify({+ userId: user.id,+ cookies: cookie.parse(request.headers.get("cookie") ?? ""),+ requestUrl: requestUrl.href,+ }),+ });++ if (response.ok === false) {+ const text = await response.text();++ throw new Response(+ `Fetch error status="${response.status}"\nMessage:\n${text.slice(+ 0,+ 1000+ )}"`,+ {+ status: response.status,+ }+ );+ }++ const responseJson = await response.json();+ const workerResponseParsed = zWorkerResponse.safeParse(responseJson);++ if (workerResponseParsed.success === false) {+ throw new Response(workerResponseParsed.error.message, {+ status: 400,+ });+ }++ const workerResponse = workerResponseParsed.data;++ if (workerResponse.type === "error") {+ throw new Response(workerResponse.error, {+ status: 400,+ });+ }++ if (workerResponse.type === "redirect") {+ throw redirect(workerResponse.to);+ }++ workerResponse satisfies never;++ return json({});+};++export const ErrorBoundary = () => {+ const error = useRouteError();++ if (isRouteErrorResponse(error)) {+ return <div style={{ whiteSpace: "pre-wrap" }}>{error.data}</div>;+ }++ return <div>Unexpected error</div>;+};diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 9606b7b842..50453ab1e3 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -2,6 +2,7 @@ import type { AUTH_PROVIDERS } from "~/shared/session";import { publicStaticEnv } from "~/env/env.static";import { getAuthorizationServerOrigin } from "./origins";import type { BuilderMode } from "../nano-states/misc";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";const searchParams = (params: Record<string, string | undefined | null>) => {const searchParams = new URLSearchParams();@@ -115,6 +116,10 @@ export const userPlanSubscriptionPath = (subscriptionId?: string) => {urlSearchParams.set("subscription", subscriptionId);}+ if (isFeatureEnabled("paymentWorker")) {+ return `/payments/billing-portal/sessions?${urlSearchParams.toString()}`;+ }+return `/n8n/billing_portal/sessions?${urlSearchParams.toString()}`;};diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 0a952b87c8..0169eb1541 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -3,3 +3,4 @@ export const internalComponents = false;export const unsupportedBrowsers = false;export const resourceProp = false;export const tailwind = false;+export const paymentWorker = false;