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
chore: New Builder Auth (#4010)
Ivan Starkovf7487fd1bcf6
diff --git a/.github/actions/add-status/action.yaml b/.github/actions/add-status/action.yamlindex 9102cc7ccf..b90e6986a9 100644--- a/.github/actions/add-status/action.yaml+++ b/.github/actions/add-status/action.yaml@@ -15,7 +15,7 @@ runs:using: "composite"steps:- name: Add URL to vercel deployment through *.prs.webstudio.is- uses: actions/github-script@v6+ uses: actions/github-script@v7with:script: |const branch = context.payload.pull_request?.head?.ref ?? context.payload.ref?.replace('refs/heads/', '')diff --git a/.github/workflows/cli-r2.yaml b/.github/workflows/cli-r2.yamlindex a1dfbc3ca5..e3861b3881 100644--- a/.github/workflows/cli-r2.yaml+++ b/.github/workflows/cli-r2.yaml@@ -14,6 +14,7 @@ permissions:contents: read # to fetch code (actions/checkout)statuses: write # This is required for the GitHub Script createCommitStatus to workpackages: write+ deployments: writejobs:build:@@ -115,3 +116,9 @@ jobs:'./functions/[[path]].ts'working-directory: ${{ github.workspace }}/cloudflare-template++ delete-github-deployments:+ needs: checks+ uses: ./.github/workflows/delete-github-deployments.yml+ with:+ ref: ${{ github.ref_name }}diff --git a/.github/workflows/delete-github-deployments.yml b/.github/workflows/delete-github-deployments.ymlindex a03b73e1bc..26860f2613 100644--- a/.github/workflows/delete-github-deployments.yml+++ b/.github/workflows/delete-github-deployments.yml@@ -4,7 +4,7 @@ name: Delete github deploymentson:workflow_call:inputs:- sha:+ ref:type: stringrequired: true@@ -19,17 +19,23 @@ jobs:- name: Delete Previous deploymentsuses: actions/github-script@v7env:- SHA_HEAD: ${{ inputs.sha }}+ REF: ${{ inputs.ref }}with:script: |- const { SHA_HEAD } = process.env+ const { REF } = process.env;++ console.log(REF);const deployments = await github.rest.repos.listDeployments({owner: context.repo.owner,repo: context.repo.repo,- sha: SHA_HEAD+ ref: REF,+ per_page: 100});- await Promise.all(++ console.log(deployments);++ await Promise.allSettled(deployments.data.map(async (deployment) => {await github.rest.repos.createDeploymentStatus({owner: context.repo.owner,diff --git a/.github/workflows/vercel-deploy-staging.yml b/.github/workflows/vercel-deploy-staging.ymlindex 334330cb28..363a7af694 100644--- a/.github/workflows/vercel-deploy-staging.yml+++ b/.github/workflows/vercel-deploy-staging.yml@@ -11,6 +11,7 @@ concurrency:permissions:contents: read # to fetch code (actions/checkout)statuses: write # This is required for the GitHub Script createCommitStatus to work+ deployments: writejobs:deployment:@@ -82,3 +83,9 @@ jobs:uses: ./.github/workflows/fixtures-test.ymlwith:builder-url: ${{ needs.deployment.outputs.builder-url }}++ delete-github-deployments:+ needs: fixtures-test+ uses: ./.github/workflows/delete-github-deployments.yml+ with:+ ref: ${{ github.ref_name }}diff --git a/@types/canvas-iframe.d.ts b/@types/canvas-iframe.d.tsnew file mode 100644index 0000000000..05a1a4ed11--- /dev/null+++ b/@types/canvas-iframe.d.ts@@ -0,0 +1,10 @@+declare namespace JSX {+ interface IntrinsicElements {+ iframe: React.DetailedHTMLProps<+ React.IframeHTMLAttributes<HTMLIFrameElement> & {+ credentialless?: "true";+ },+ HTMLIFrameElement+ >;+ }+}diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex cbd3cbc542..3cee1f6ab8 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -311,9 +311,7 @@ export const Builder = ({return unsubscribe;}, []);- const canvasUrl = getCanvasUrl({- project,- });+ const canvasUrl = getCanvasUrl();/*** Prevents Lexical text editor from stealing focus during rendering.diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsxindex 2b60a6273f..4da5da70d0 100644--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx@@ -1,4 +1,3 @@-import { useNavigate } from "@remix-run/react";import { useStore } from "@nanostores/react";import {theme,@@ -21,7 +20,7 @@ import {$isShareDialogOpen,$isPublishDialogOpen,} from "~/builder/shared/nano-states";-import { dashboardPath } from "~/shared/router-utils";+import { dashboardUrl } from "~/shared/router-utils";import { $authPermit, $authTokenPermissions } from "~/shared/nano-states";import { emitCommand } from "~/builder/shared/commands";import { MenuButton } from "./menu-button";@@ -52,7 +51,6 @@ const ViewMenuItem = () => {};export const Menu = () => {- const navigate = useNavigate();const { hasProPlan } = useStore($userPlanFeatures);const authPermit = useStore($authPermit);const authTokenPermission = useStore($authTokenPermissions);@@ -80,7 +78,7 @@ export const Menu = () => {><DropdownMenuItemonSelect={() => {- navigate(dashboardPath());+ window.location.href = dashboardUrl({ origin: window.origin });}}>Dashboarddiff --git a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx b/apps/builder/app/builder/features/workspace/canvas-iframe.tsxindex e70010e4fe..63e1a17c27 100644--- a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx@@ -23,7 +23,14 @@ export const CanvasIframe = forwardRef<HTMLIFrameElement, CanvasIframeProps>($canvasIframeState.set("idle");});- return <iframe {...props} ref={ref} className={iframeStyle()} />;+ return (+ <iframe+ {...props}+ ref={ref}+ className={iframeStyle()}+ credentialless="true"+ />+ );});diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.tsindex 168798b734..7685eb8bdc 100644--- a/apps/builder/app/builder/shared/sync/sync-server.ts+++ b/apps/builder/app/builder/shared/sync/sync-server.ts@@ -180,7 +180,10 @@ const syncServer = async function () {}// when versions mismatched ask user to reload// user may cancel to copy own state before reloading- if (result.status === "version_mismatched") {+ if (+ result.status === "version_mismatched" ||+ result.status === "authorization_error"+ ) {const error =result.errors ?? "Unknown version mismatch. Please reload.";diff --git a/apps/builder/app/dashboard/projects/project-card.tsx b/apps/builder/app/dashboard/projects/project-card.tsxindex a8049eea50..1c3aa4eea3 100644--- a/apps/builder/app/dashboard/projects/project-card.tsx+++ b/apps/builder/app/dashboard/projects/project-card.tsx@@ -17,7 +17,7 @@ import {import { InfoCircleIcon, EllipsesIcon } from "@webstudio-is/icons";import { type KeyboardEvent, useRef, useState } from "react";import type { ImageLoader } from "@webstudio-is/image";-import { builderPath } from "~/shared/router-utils";+import { builderUrl } from "~/shared/router-utils";import {RenameProjectDialog,DeleteProjectDialog,@@ -181,7 +181,8 @@ export const ProjectCard = ({const { thumbnailRef, handleKeyDown } = useProjectCard();const handleCloneProject = useCloneProject(id);const { state, location } = useNavigation();- const linkPath = builderPath({ projectId: id });++ const linkPath = builderUrl({ origin: window.origin, projectId: id });// Transition to the project has started, we may need to show a spinnerconst isTransitioning = state !== "idle" && linkPath === location.pathname;return (diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsxindex 9ebd6ddae7..2c5442f98f 100644--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx@@ -1,6 +1,5 @@import { useRevalidator } from "@remix-run/react";import { useEffect, useState } from "react";-import { useNavigate } from "@remix-run/react";import {Box,Button,@@ -19,7 +18,7 @@ import {} from "@webstudio-is/design-system";import { PlusIcon } from "@webstudio-is/icons";import { Title } from "@webstudio-is/project";-import { builderPath } from "~/shared/router-utils";+import { builderUrl } from "~/shared/router-utils";import { ShareProjectContainer } from "~/shared/share-project";import { trpcClient } from "~/shared/trpc/trpc-client";@@ -118,10 +117,8 @@ const DialogContent = ({};const useCreateProject = () => {- const navigate = useNavigate();const { send, state } = trpcClient.dashboardProject.create.useMutation();const [errors, setErrors] = useState<string>();- const revalidator = useRevalidator();const handleSubmit = ({ title }: { title: string }) => {const parsed = Title.safeParse(title);@@ -132,9 +129,13 @@ const useCreateProject = () => {setErrors(errors);if (parsed.success) {send({ title }, (data) => {- revalidator.revalidate();+ console.info("data");+if (data?.id) {- navigate(builderPath({ projectId: data.id }));+ window.location.href = builderUrl({+ origin: window.origin,+ projectId: data.id,+ });}});}diff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.tsindex 6891f564ad..1feeb910b8 100644--- a/apps/builder/app/env/env.server.ts+++ b/apps/builder/app/env/env.server.ts@@ -101,8 +101,7 @@ const env = {POSTGREST_URL: process.env.POSTGREST_URL ?? "http://localhost:3000",POSTGREST_API_KEY: process.env.POSTGREST_API_KEY ?? "",- SECURE_COOKIE:- process.env.SSL === "true" || process.env.NODE_ENV === "production",+ SECURE_COOKIE: true,// Used for project oauth login flow @todo remove ??AUTH_WS_CLIENT_ID: process.env.AUTH_WS_CLIENT_ID ?? "12345",diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsxindex d5690008a8..9d684d72a1 100644--- a/apps/builder/app/routes/$.tsx+++ b/apps/builder/app/routes/$.tsx@@ -1,23 +1,26 @@import {type HeadersFunction,type LoaderFunctionArgs,- redirect,} from "@remix-run/server-runtime";-import { dashboardPath } from "~/shared/router-utils";+import { isRouteErrorResponse, useRouteError } from "@remix-run/react";+import { ErrorMessage } from "~/shared/error/error-message";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({ request }: LoaderFunctionArgs) => {+ preventCrossOriginCookie(request);+const url = new URL(request.url);// Redirecting asset files (e.g., .js, .css) to the dashboard should be avoided.// This is because immutable caching rules apply to redirects, causing these files// to become permanently inaccessible. Ensure asset files are served correctly// without redirects to maintain availability and proper caching behavior.- const publicPaths = ["/cgi/", "/assets/"];+ const publicPaths = ["/cgi/", "/assets/", "/apple-touch-icon-"];// In case of 404 on static assets, this route will be executedif (publicPaths.some((publicPath) => url.pathname.startsWith(publicPath))) {- throw new Response("Not found", {+ return new Response("Not found", {status: 404,headers: {"Cache-Control": "public, max-age=0, must-revalidate",@@ -25,7 +28,21 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {});}- return redirect(dashboardPath());+ const contentType = request.headers.get("Content-Type");++ if (contentType?.includes("application/json")) {+ // Return an error to not trigger the ErrorBoundary rendering (api request)+ return new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ // Throw an error to trigger the ErrorBoundary rendering+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });};export const headers: HeadersFunction = ({ errorHeaders, loaderHeaders }) => {@@ -43,3 +60,15 @@ export const headers: HeadersFunction = ({ errorHeaders, loaderHeaders }) => {}return loaderHeaders;};++export const ErrorBoundary = () => {+ const error = useRouteError();+ console.error({ error });+ const message = isRouteErrorResponse(error)+ ? `${error.status} ${error.statusText} ${error.data.message ?? error.data}`+ : error instanceof Error+ ? error.message+ : String(error);++ return <ErrorMessage message={`${message}`} />;+};diff --git a/apps/builder/app/routes/_canvas.canvas.tsx b/apps/builder/app/routes/_canvas.canvas.tsxindex 8bfa747656..675b6d180f 100644--- a/apps/builder/app/routes/_canvas.canvas.tsx+++ b/apps/builder/app/routes/_canvas.canvas.tsx@@ -1,21 +1,19 @@import { lazy } from "react";-import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";-import {- isRouteErrorResponse,- useLoaderData,- useRouteError,-} from "@remix-run/react";+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";+import { useLoaderData } from "@remix-run/react";import type { Params } from "@webstudio-is/react-sdk";import { Body } from "@webstudio-is/sdk-components-react-remix";import { createImageLoader } from "@webstudio-is/image";import env from "~/env/env.server";-import { ErrorMessage } from "~/shared/error";-import { dashboardPath, isCanvas } from "~/shared/router-utils";+import { isCanvas } from "~/shared/router-utils";import { ClientOnly } from "~/shared/client-only";export const loader = async ({ request }: LoaderFunctionArgs) => {if (isCanvas(request) === false) {- throw redirect(dashboardPath());+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });}const params: Params = {@@ -26,19 +24,6 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {return { params };};-export const ErrorBoundary = () => {- const error = useRouteError();-- console.error({ error });- const message = isRouteErrorResponse(error)- ? (error.data.message ?? error.data)- : error instanceof Error- ? error.message- : String(error);-- return <ErrorMessage message={message} />;-};-const Canvas = lazy(async () => {const { Canvas } = await import("~/canvas/index.client");return { default: Canvas };diff --git a/apps/builder/app/routes/_canvas.tsx b/apps/builder/app/routes/_canvas.tsxindex 7e8c10a990..d6a478f938 100644--- a/apps/builder/app/routes/_canvas.tsx+++ b/apps/builder/app/routes/_canvas.tsx@@ -1,6 +1,8 @@import { Links, Meta, Outlet } from "@remix-run/react";+import { ErrorMessage } from "~/shared/error";+import { isRouteErrorResponse, useRouteError } from "@remix-run/react";-export default function CanvasLayout() {+const Document = (props: { children: React.ReactNode }) => {return (<html lang="en"><head>@@ -9,7 +11,34 @@ export default function CanvasLayout() {<Meta /><Links /></head>- <Outlet />+ {props.children}</html>);+};++export const ErrorBoundary = () => {+ const error = useRouteError();++ console.error({ error });+ const message = isRouteErrorResponse(error)+ ? (error.data.message ?? error.data)+ : error instanceof Error+ ? error.message+ : String(error);++ return (+ <Document>+ <body>+ <ErrorMessage message={message} />+ </body>+ </Document>+ );+};++export default function CanvasLayout() {+ return (+ <Document>+ <Outlet />+ </Document>+ );}diff --git a/apps/builder/app/routes/_index.tsx b/apps/builder/app/routes/_index.tsxdeleted file mode 100644index 0c2f11cd21..0000000000--- a/apps/builder/app/routes/_index.tsx+++ /dev/null@@ -1,7 +0,0 @@-import { redirect } from "@remix-run/server-runtime";-import { dashboardPath } from "~/shared/router-utils";--// This is the builder path in the next PR-export const loader = async () => {- throw redirect(dashboardPath());-};diff --git a/apps/builder/app/routes/_ui.builder.$projectId.tsx b/apps/builder/app/routes/_ui.(builder).tsxsimilarity index 64%rename from apps/builder/app/routes/_ui.builder.$projectId.tsxrename to apps/builder/app/routes/_ui.(builder).tsxindex 73d2e41862..a460bdc0e5 100644--- a/apps/builder/app/routes/_ui.builder.$projectId.tsx+++ b/apps/builder/app/routes/_ui.(builder).tsx@@ -1,15 +1,12 @@+/**+ * The file is named _ui.(builder) instead of _ui._index due to an issue with Vercel.+ * The _ui._index route isn’t recognized on Vercel, even though it works perfectly in other environments.+ */+import { lazy } from "react";-import {- useLoaderData,- useRouteError,- isRouteErrorResponse,-} from "@remix-run/react";+import { useLoaderData } from "@remix-run/react";import type { ShouldRevalidateFunction } from "@remix-run/react";-import {- type LoaderFunctionArgs,- redirect,- json,-} from "@remix-run/server-runtime";+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";import { loadBuildIdAndVersionByProjectId } from "@webstudio-is/project-build/index.server";import { db } from "@webstudio-is/project/index.server";@@ -20,8 +17,7 @@ import {authorizeProject,} from "@webstudio-is/trpc-interface/index.server";import { createContext } from "~/shared/context.server";-import { ErrorMessage } from "~/shared/error";-import { loginPath } from "~/shared/router-utils";+import { dashboardPath, isBuilder, isDashboard } from "~/shared/router-utils";import env from "~/env/env.server";@@ -29,8 +25,9 @@ import builderStyles from "~/builder/builder.css?url";import prismStyles from "prismjs/themes/prism-solarizedlight.min.css?url";import { ClientOnly } from "~/shared/client-only";import type { BuilderProps } from "~/builder/builder";+import { parseBuilderUrl } from "~/shared/router-utils/origins";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";-// Can cause FOUC because of remix-island, be very accurate adding anything hereexport const links = () => {return [{ rel: "stylesheet", href: builderStyles },@@ -39,20 +36,67 @@ export const links = () => {};export const loader = async ({- params,request,}: LoaderFunctionArgs): Promise<BuilderProps> => {+ preventCrossOriginCookie(request);++ if (isDashboard(request)) {+ throw redirect(dashboardPath());+ }++ if (false === isBuilder(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+const context = await createContext(request);- try {- if (params.projectId === undefined) {- throw new Error("Project id undefined");+ if (+ context.authorization.userId === undefined &&+ context.authorization.authToken === undefined+ ) {+ // @todo just import loader from auth and call it+ throw redirect("/auth/ws");+ }++ if (+ context.authorization.userId !== undefined &&+ context.authorization.sessionCreatedAt !== undefined &&+ request.headers.get("sec-fetch-mode") === "navigate"+ ) {+ // If logout fails, or the session cookie in the dashboard is deleted or expired,+ // enforce reauthorization on builder reload or navigation (sec-fetch-mode === 'navigate') after a timeout.++ const RELOAD_ON_NAVIGATE_TIMEOUT =+ env.DEPLOYMENT_ENVIRONMENT === "production"+ ? 1000 * 60 * 3 // 3 minutes+ : 1000 * 30; // 30 seconds++ if (+ Date.now() - context.authorization.sessionCreatedAt >+ RELOAD_ON_NAVIGATE_TIMEOUT+ ) {+ throw redirect("/auth/ws");}+ }+ try {const url = new URL(request.url);+ const { projectId } = parseBuilderUrl(request.url);++ if (projectId === undefined) {+ throw new Error("Project ID is not defined");+ }+const start = Date.now();- const project = await db.project.loadById(params.projectId, context);+ const project = await db.project.loadById(projectId, context);++ if (project === null) {+ throw new Error(`Project "${projectId}" not found`);+ }const authPermit =(await authorizeProject.getProjectPermit(@@ -65,10 +109,6 @@ export const loader = async ({context)) ?? "view";- if (project === null) {- throw new Error(`Project "${params.projectId}" not found`);- }-const devBuild = await loadBuildIdAndVersionByProjectId(context,project.id@@ -120,36 +160,25 @@ export const loader = async ({};} catch (error) {if (error instanceof AuthorizationError) {- // try to login user if he is not logged in- if (context.authorization.userId === undefined) {- const url = new URL(request.url);-- throw redirect(- loginPath({- returnTo: url.pathname,- })- );- }-- const FORBIDDEN = 403;-- throw json({ message: error.message }, { status: FORBIDDEN });+ // try to re-login user if he has no access to the project+ throw redirect(`/auth/ws`);}throw error;}};-export const ErrorBoundary = () => {- const error = useRouteError();- console.error({ error });- const message = isRouteErrorResponse(error)- ? (error.data.message ?? error.data)- : error instanceof Error- ? error.message- : String(error);-- return <ErrorMessage message={message} />;+/**+ * When doing changes in a project, then navigating to a dashboard then pressing the back button,+ * the builder page may display stale data because it’s being retrieved from the browser’s back/forward cache (bfcache).+ *+ * https://web.dev/articles/bfcache+ *+ */+export const headers = () => {+ return {+ "Cache-Control": "no-store",+ };};const Builder = lazy(async () => {diff --git a/apps/builder/app/routes/_ui.dashboard._index.tsx b/apps/builder/app/routes/_ui.dashboard._index.tsxdeleted file mode 100644index f817fc4532..0000000000--- a/apps/builder/app/routes/_ui.dashboard._index.tsx+++ /dev/null@@ -1,76 +0,0 @@-import { lazy } from "react";-import { useLoaderData, useRouteError } from "@remix-run/react";-import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";-import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";-import { findAuthenticatedUser } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";-import { ErrorMessage } from "~/shared/error";-import { createContext } from "~/shared/context.server";-import env from "~/env/env.server";-import type { DashboardProps } from "~/dashboard/dashboard";-import { ClientOnly } from "~/shared/client-only";--export const loader = async ({- request,-}: LoaderFunctionArgs): Promise<DashboardProps> => {- const user = await findAuthenticatedUser(request);-- if (user === null) {- const url = new URL(request.url);- throw redirect(- loginPath({- returnTo: url.pathname,- })- );- }-- const context = await createContext(request);-- const projects = await dashboardProjectRouter- // @todo pass authorization context- .createCaller(context)- .findMany({ userId: user.id });-- const projectTemplates = await dashboardProjectRouter- .createCaller(context)- .findManyByIds({ projectIds: env.PROJECT_TEMPLATES });-- const { userPlanFeatures } = context;-- if (userPlanFeatures === undefined) {- throw new Error("User plan features are not defined");- }-- return {- user,- projects,- projectTemplates,- userPlanFeatures,- publisherHost: env.PUBLISHER_HOST,- imageBaseUrl: env.IMAGE_BASE_URL,- };-};--export const ErrorBoundary = () => {- const error = useRouteError();- console.error({ error });- const message = error instanceof Error ? error.message : String(error);- return <ErrorMessage message={message} />;-};--const Dashboard = lazy(async () => {- const { Dashboard } = await import("~/dashboard/index.client");- return { default: Dashboard };-});--const DashboardRoute = () => {- const data = useLoaderData<DashboardProps>();-- return (- <ClientOnly>- <Dashboard {...data} />- </ClientOnly>- );-};--export default DashboardRoute;diff --git a/apps/builder/app/routes/_ui.dashboard.tsx b/apps/builder/app/routes/_ui.dashboard.tsxnew file mode 100644index 0000000000..f63d85b3fd--- /dev/null+++ b/apps/builder/app/routes/_ui.dashboard.tsx@@ -0,0 +1,94 @@+import { lazy } from "react";+import { useLoaderData } from "@remix-run/react";+import {+ json,+ type LoaderFunctionArgs,+ redirect,+} from "@remix-run/server-runtime";+import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";+import { findAuthenticatedUser } from "~/services/auth.server";+import { isDashboard, loginPath } from "~/shared/router-utils";+import { createContext } from "~/shared/context.server";+import env from "~/env/env.server";+import { ClientOnly } from "~/shared/client-only";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { createCallerFactory } from "@webstudio-is/trpc-interface/index.server";++const dashboardProjectCaller = createCallerFactory(dashboardProjectRouter);++export const loader = async ({ request }: LoaderFunctionArgs) => {+ preventCrossOriginCookie(request);++ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ const user = await findAuthenticatedUser(request);++ if (user === null) {+ const url = new URL(request.url);+ throw redirect(+ loginPath({+ returnTo: url.pathname,+ })+ );+ }++ const context = await createContext(request);++ const projects = await dashboardProjectCaller(context).findMany({+ userId: user.id,+ });++ const projectTemplates = await dashboardProjectCaller(context).findManyByIds({+ projectIds: env.PROJECT_TEMPLATES,+ });++ const { userPlanFeatures } = context;++ if (userPlanFeatures === undefined) {+ throw new Error("User plan features are not defined");+ }++ return json({+ user,+ projects,+ projectTemplates,+ userPlanFeatures,+ publisherHost: env.PUBLISHER_HOST,+ imageBaseUrl: env.IMAGE_BASE_URL,+ });+};++/**+ * When deleting/adding a project, then navigating to a new project and pressing the back button,+ * the dashboard page may display stale data because it’s being retrieved from the browser’s back/forward cache (bfcache).+ *+ * https://web.dev/articles/bfcache+ *+ */+export const headers = () => {+ return {+ "Cache-Control": "no-store",+ };+};++const Dashboard = lazy(async () => {+ const { Dashboard } = await import("~/dashboard/index.client");+ return { default: Dashboard };+});++const DashboardRoute = () => {+ const data = useLoaderData<typeof loader>();++ return (+ <ClientOnly>+ <Dashboard {...data} />+ </ClientOnly>+ );+};++export default DashboardRoute;diff --git a/apps/builder/app/routes/_ui.error.tsx b/apps/builder/app/routes/_ui.error.tsxindex 0235f264ca..4edd4dd06a 100644--- a/apps/builder/app/routes/_ui.error.tsx+++ b/apps/builder/app/routes/_ui.error.tsx@@ -1,9 +1,6 @@import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import {- getAuthorizationServerOrigin,- isBuilderUrl,-} from "~/shared/router-utils/origins";+import { getAuthorizationServerOrigin } from "~/shared/router-utils/origins";import { builderSessionStorage } from "~/services/builder-session.server";import { sessionStorage } from "~/services/session.server";import { authenticator } from "~/services/auth.server";@@ -12,6 +9,8 @@ import { z } from "zod";import { fromError } from "zod-validation-error";import { lazy } from "react";import { ClientOnly } from "~/shared/client-only";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { isBuilder } from "~/shared/router-utils";const SessionError = z.object({message: z.string(),@@ -19,10 +18,10 @@ const SessionError = z.object({});export const loader = async ({ request }: LoaderFunctionArgs) => {- const storage = isBuilderUrl(request.url)- ? builderSessionStorage- : sessionStorage;- const sessionErrorKey = isBuilderUrl(request.url)+ preventCrossOriginCookie(request);++ const storage = isBuilder(request) ? builderSessionStorage : sessionStorage;+ const sessionErrorKey = isBuilder(request)? builderAuthenticator.sessionErrorKey: authenticator.sessionErrorKey;diff --git a/apps/builder/app/routes/_ui.login._index.tsx b/apps/builder/app/routes/_ui.login._index.tsxindex 473f6fcebb..70b399d6e9 100644--- a/apps/builder/app/routes/_ui.login._index.tsx+++ b/apps/builder/app/routes/_ui.login._index.tsx@@ -9,20 +9,28 @@ import { findAuthenticatedUser } from "~/services/auth.server";import env from "~/env/env.server";import type { LoginProps } from "~/auth/index.client";import { useLoginErrorMessage } from "~/shared/session";-import { dashboardPath } from "~/shared/router-utils";+import {+ comparePathnames,+ dashboardPath,+ isDashboard,+} from "~/shared/router-utils";import { returnToCookie } from "~/services/cookie.server";import { ClientOnly } from "~/shared/client-only";import { lazy } from "react";--const comparePathnames = (pathnameOrUrlA: string, pathnameOrUrlB: string) => {- const aPathname = new URL(pathnameOrUrlA, "http://localhost").pathname;- const bPathname = new URL(pathnameOrUrlB, "http://localhost").pathname;- return aPathname === bPathname;-};+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({request,}: LoaderFunctionArgs): Promise<TypedResponse<LoginProps>> => {+ preventCrossOriginCookie(request);++ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+const user = await findAuthenticatedUser(request);const url = new URL(request.url);@@ -40,9 +48,7 @@ export const loader = async ({const headers = new Headers();- if (returnTo) {- headers.append("Set-Cookie", await returnToCookie.serialize(returnTo));- }+ headers.append("Set-Cookie", await returnToCookie.serialize(returnTo));return json({diff --git a/apps/builder/app/routes/_ui.logout.tsx b/apps/builder/app/routes/_ui.logout.tsxnew file mode 100644index 0000000000..690b7f0136--- /dev/null+++ b/apps/builder/app/routes/_ui.logout.tsx@@ -0,0 +1,94 @@+import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";+import { createDebug } from "~/shared/debug";+import { authenticator } from "~/services/auth.server";+import { builderUrl, isDashboard, loginPath } from "~/shared/router-utils";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { createCallerFactory } from "@webstudio-is/trpc-interface/index.server";+import { logoutRouter } from "~/services/logout-router.server";+import { createContext } from "~/shared/context.server";+import { redirect, type ActionFunctionArgs } from "react-router-dom";+import { ClientOnly } from "~/shared/client-only";+import { useLoaderData } from "@remix-run/react";+import { lazy, useRef } from "react";++const logoutCaller = createCallerFactory(logoutRouter);++const debug = createDebug(import.meta.url);++export const loader = async ({ request }: LoaderFunctionArgs) => {+ if (false === isDashboard(request)) {+ throw new Error("Only Dashboard can logout at this endpoint");+ }++ preventCrossOriginCookie(request);++ const context = await createContext(request);++ const redirectTo = loginPath({});++ if (context.authorization.userId === undefined) {+ debug("User is not logged in redirecting to", redirectTo);+ throw redirect(redirectTo);+ }++ try {+ const buildProjectIdsToLogout =+ await logoutCaller(context).getLoggedInProjectIds();++ debug("buildProjectIdsToLogout", buildProjectIdsToLogout);++ const url = new URL(request.url);+ const logoutUrls = buildProjectIdsToLogout.map(+ (projectId) =>+ `${builderUrl({ projectId, origin: url.origin })}builder-logout`+ );++ return json({+ redirectTo,+ logoutUrls,+ });+ } catch (error) {+ if (error instanceof Response) {+ throw error;+ }++ console.error(error);+ throw error;+ }+};++export const action = async ({ request }: ActionFunctionArgs) => {+ if (false === isDashboard(request)) {+ throw new Error("Only Dashboard can logout at this endpoint");+ }++ preventCrossOriginCookie(request);++ const redirectTo = loginPath({});+ await authenticator.logout(request, {+ redirectTo,+ });+};++const LogoutPage = lazy(async () => {+ const { LogoutPage } = await import("~/shared/logout.client");+ return { default: LogoutPage };+});++export default function Logout() {+ const data = useLoaderData<typeof loader>();+ const formRef = useRef<HTMLFormElement>(null);++ return (+ <ClientOnly>+ <form action={"/logout"} method="post" ref={formRef}>+ <LogoutPage+ logoutUrls={data.logoutUrls}+ onFinish={() => {+ formRef.current?.submit();+ }}+ />+ </form>+ </ClientOnly>+ );+}diff --git a/apps/builder/app/routes/_ui.tmp.login.tsx b/apps/builder/app/routes/_ui.tmp.login.tsxdeleted file mode 100644index 310f3490f6..0000000000--- a/apps/builder/app/routes/_ui.tmp.login.tsx+++ /dev/null@@ -1,244 +0,0 @@-import { type MetaFunction, useLoaderData } from "@remix-run/react";-import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";-import { authenticator } from "~/services/auth.server";-import { builderAuthenticator } from "~/services/builder-auth.server";-import { returnToCookie } from "~/services/cookie.server";-import { createContext } from "~/shared/context.server";-import {- getAuthorizationServerOrigin,- isBuilderUrl,- parseBuilderUrl,-} from "~/shared/router-utils/origins";-import { builderUrlNew } from "~/shared/router-utils/path-utils";-import { createDebug } from "~/shared/debug";-import { ClientOnly } from "~/shared/client-only";--const debug = createDebug(import.meta.url);--export const meta: MetaFunction = () => {- return [- { title: "Temp login page (to delete)" },- { name: "description", content: "Temp login page!" },- ];-};--export const loader = async ({ request }: LoaderFunctionArgs) => {- debug("request.url", request.url);- debug("isBuildUrl", isBuilderUrl(request.url));- debug("Headers", [...request.headers.entries()]);- debug("Origin", getAuthorizationServerOrigin(request.url));-- const context = await createContext(request);-- const projectData = await context.postgrest.client- .from("Project")- .select("id")- .order("createdAt", { ascending: false })- .limit(1)- .single();- if (projectData.error) {- throw new Error(- `Failed to fetch project data: ${projectData.error.message}`- );- }-- const projectId = isBuilderUrl(request.url)- ? parseBuilderUrl(request.url).projectId!- : process.env.NODE_ENV === "production"- ? "264a609f-ce63-4197-a364-68d239c2f56a"- : projectData.data.id;-- const user = isBuilderUrl(request.url)- ? await builderAuthenticator.isAuthenticated(request)- : await authenticator.isAuthenticated(request);-- const headers = new Headers();-- if (isBuilderUrl(request.url)) {- debug("Temporary redirect to /tmp/login after login");- const returnTo = request.url;- headers.append("Set-Cookie", await returnToCookie.serialize(returnTo));- }-- return json(- {- user,- projectId,- isBuilderUrl: isBuilderUrl(request.url),- origin: getAuthorizationServerOrigin(request.url),- },- { headers }- );-};--const TmpLogin = () => {- const data = useLoaderData<typeof loader>();-- const projectUrl = new URL(- builderUrlNew({- origin: data.origin,- projectId: data.projectId,- })- );-- projectUrl.pathname = "/tmp/login";-- const noAccessProjectUrl = new URL(- builderUrlNew({- origin: data.origin,- projectId: "9ccd9600-de48-4f3f-898b-042e890ae805",- })- );-- noAccessProjectUrl.pathname = "/tmp/login";-- const fetchAllProjectIdsLoggedInAfterIssueDate = async (- _userId: string,- _issueDate: number- ) => {- return [- {- id: data.projectId,- },- ];- };-- return (- <ClientOnly>- <div className="font-sans p-4">- <h1 className="text-3xl">Welcome {data.user?.email ?? "Anon"}</h1>- <ul className="list-disc mt-4 pl-6 space-y-2">- {false === data.isBuilderUrl && (- <>- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={projectUrl.href}- rel="noreferrer"- >- Project link- </a>- </li>- {data.user != null && (- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href="#"- rel="noreferrer"- onClick={async () => {- if (data.user == null) {- return;- }-- const projectsToLogout =- await fetchAllProjectIdsLoggedInAfterIssueDate(- data.user.id,- 0- // data.user.sessionIssueDate- );-- // @todo use https://github.com/sindresorhus/p-all to execute in parallel like concurrency=5 stopOnError=false- // @todo remove /logout from rate limiter- for (const project of projectsToLogout) {- const logoutProjectUrl = new URL(- "/logout",- builderUrlNew({- origin: data.origin,- projectId: project.id,- })- );-- console.info(`Logout ${logoutProjectUrl.href}`);-- await fetch(logoutProjectUrl.href, {- method: "GET",- headers: {- "Content-Type": "application/json",- },- redirect: "manual",- credentials: "include",- });- }- }}- >- Logout from AllProjects {data.user.email}- </a>- </li>- )}-- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={noAccessProjectUrl.href}- rel="noreferrer"- >- Project link you have no access to- </a>- </li>- </>- )}- {false === data.isBuilderUrl && data.user == null && (- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={"/login"}- rel="noreferrer"- >- Login at authorizer app- </a>- </li>- )}-- {false === data.isBuilderUrl && data.user != null && (- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={"/logout"}- rel="noreferrer"- >- Logout at authorizer app- </a>- </li>- )}-- {data.isBuilderUrl && (- <>- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={`${data.origin}/tmp/login`}- rel="noreferrer"- >- Goto Auth Server- </a>- </li>-- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={"/auth/ws"}- rel="noreferrer"- >- Run Project Login- </a>- </li>- {data.user != null && (- <li>- <a- className="text-blue-700 underline visited:text-purple-900"- href={"/logout"}- rel="noreferrer"- >- Run Project Logout- </a>- </li>- )}- </>- )}- </ul>- </div>- </ClientOnly>- );-};--export default TmpLogin;diff --git a/apps/builder/app/routes/_ui.tsx b/apps/builder/app/routes/_ui.tsxindex 4e0e00e30c..8c85e64eff 100644--- a/apps/builder/app/routes/_ui.tsx+++ b/apps/builder/app/routes/_ui.tsx@@ -1,15 +1,18 @@import {+ isRouteErrorResponse,Links,Meta,Outlet,Scripts,ScrollRestoration,+ useRouteError,} from "@remix-run/react";import interFont from "@fontsource-variable/inter/index.css?url";import manropeVariableFont from "@fontsource-variable/manrope/index.css?url";import robotoMonoFont from "@fontsource/roboto-mono/index.css?url";import appCss from "../shared/app.css?url";import type { LinksFunction } from "@remix-run/server-runtime";+import { ErrorMessage } from "~/shared/error/error-message";export const links: LinksFunction = () => {// `links` returns an array of objects whose@@ -22,7 +25,7 @@ export const links: LinksFunction = () => {];};-export default function Layout() {+const Document = (props: { children: React.ReactNode }) => {return (<html lang="en"><head>@@ -32,10 +35,37 @@ export default function Layout() {<Links /></head><body>- <Outlet />+ {props.children}<ScrollRestoration /><Scripts /></body></html>);+};++export const ErrorBoundary = () => {+ const error = useRouteError();++ const message =+ error == null+ ? "Uknown error"+ : isRouteErrorResponse(error)+ ? `${error.status} ${error.statusText} ${error.data.message ?? error.data}`+ : typeof error === "object" && "message" in error+ ? error.message+ : JSON.stringify(error);++ return (+ <Document>+ <ErrorMessage message={`${message}`} />+ </Document>+ );+};++export default function Layout() {+ return (+ <Document>+ <Outlet />+ </Document>+ );}diff --git a/apps/builder/app/routes/auth.dev.tsx b/apps/builder/app/routes/auth.dev.tsxindex 0affd6106d..a85d0c5fdf 100644--- a/apps/builder/app/routes/auth.dev.tsx+++ b/apps/builder/app/routes/auth.dev.tsx@@ -1,27 +1,39 @@import { type ActionFunctionArgs, redirect } from "@remix-run/server-runtime";import { authenticator } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";+import { dashboardPath, isDashboard, loginPath } from "~/shared/router-utils";import { AUTH_PROVIDERS } from "~/shared/session";-import { returnToPath } from "~/services/cookie.server";+import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export default function Dev() {return null;}export const action = async ({ request }: ActionFunctionArgs) => {- const returnTo = await returnToPath(request);+ preventCrossOriginCookie(request);++ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ const returnTo = (await returnToPath(request)) ?? dashboardPath();try {- return await authenticator.authenticate("dev", request, {+ await authenticator.authenticate("dev", request, {successRedirect: returnTo,throwOnError: true,});} catch (error: unknown) {// all redirects are basically errors and in that case we don't want to catch itif (error instanceof Response) {- return error;+ return clearReturnToCookie(request, error);}+if (error instanceof Error) {+ console.error("Error authenticating with dev", error);return redirect(loginPath({error: AUTH_PROVIDERS.LOGIN_DEV,diff --git a/apps/builder/app/routes/auth.github.tsx b/apps/builder/app/routes/auth.github.tsxindex 9e72ef9914..af5e8d083b 100644--- a/apps/builder/app/routes/auth.github.tsx+++ b/apps/builder/app/routes/auth.github.tsx@@ -1,15 +1,25 @@import { type ActionFunctionArgs, redirect } from "@remix-run/server-runtime";import { authenticator } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";+import { dashboardPath, isDashboard, loginPath } from "~/shared/router-utils";import { AUTH_PROVIDERS } from "~/shared/session";-import { returnToPath } from "~/services/cookie.server";+import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export default function GH() {return null;}export const action = async ({ request }: ActionFunctionArgs) => {- const returnTo = await returnToPath(request);+ preventCrossOriginCookie(request);++ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ const returnTo = (await returnToPath(request)) ?? dashboardPath();try {return await authenticator.authenticate("github", request, {@@ -19,22 +29,24 @@ export const action = async ({ request }: ActionFunctionArgs) => {} catch (error) {// all redirects are basically errors and in that case we don't want to catch itif (error instanceof Response) {- return error;- }- if (error instanceof Error) {- console.error({- error,- extras: {- loginMethod: AUTH_PROVIDERS.LOGIN_GITHUB,- },- });- return redirect(- loginPath({- error: AUTH_PROVIDERS.LOGIN_GITHUB,- message: error?.message,- returnTo,- })- );+ return clearReturnToCookie(request, error);}++ const message = error instanceof Error ? error?.message : "unknown error";++ console.error({+ error,+ extras: {+ loginMethod: AUTH_PROVIDERS.LOGIN_GITHUB,+ },+ });++ return redirect(+ loginPath({+ error: AUTH_PROVIDERS.LOGIN_GITHUB,+ message: message,+ returnTo,+ })+ );}};diff --git a/apps/builder/app/routes/auth.github_.callback.tsx b/apps/builder/app/routes/auth.github_.callback.tsxindex 2811cf1887..e7ad63c2dc 100644--- a/apps/builder/app/routes/auth.github_.callback.tsx+++ b/apps/builder/app/routes/auth.github_.callback.tsx@@ -1,25 +1,48 @@import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";import { authenticator } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";+import { dashboardPath, isDashboard, loginPath } from "~/shared/router-utils";import { AUTH_PROVIDERS } from "~/shared/session";-import { returnToPath } from "~/services/cookie.server";+import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({ request }: LoaderFunctionArgs) => {- const returnTo = await returnToPath(request);- const url = new URL(request.url);- const error = url.searchParams.get("error");- const errorDescription = url.searchParams.get("error_description");- if (error) {+ preventCrossOriginCookie(request);++ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ const returnTo = (await returnToPath(request)) ?? dashboardPath();++ try {+ await authenticator.authenticate("github", request, {+ successRedirect: returnTo,+ throwOnError: true,+ });+ } catch (error) {+ // all redirects are basically errors and in that case we don't want to catch it+ if (error instanceof Response) {+ return clearReturnToCookie(request, error);+ }++ const message = error instanceof Error ? error?.message : "unknown error";++ console.error({+ error,+ extras: {+ loginMethod: AUTH_PROVIDERS.LOGIN_GITHUB,+ },+ });+return redirect(loginPath({error: AUTH_PROVIDERS.LOGIN_GITHUB,- message: errorDescription || error,+ message,returnTo,}));}- return authenticator.authenticate("github", request, {- successRedirect: returnTo,- failureRedirect: loginPath({}),- });};diff --git a/apps/builder/app/routes/auth.google.tsx b/apps/builder/app/routes/auth.google.tsxindex 01aa6ddeae..123c7717db 100644--- a/apps/builder/app/routes/auth.google.tsx+++ b/apps/builder/app/routes/auth.google.tsx@@ -4,9 +4,10 @@ import {redirect,} from "@remix-run/server-runtime";import { authenticator } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";+import { dashboardPath, isDashboard, loginPath } from "~/shared/router-utils";import { AUTH_PROVIDERS } from "~/shared/session";-import { returnToPath } from "~/services/cookie.server";+import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export default function Google() {return null;@@ -15,7 +16,16 @@ export default function Google() {export const loader = (_args: LoaderFunctionArgs) => redirect("/login");export const action = async ({ request }: ActionFunctionArgs) => {- const returnTo = await returnToPath(request);+ preventCrossOriginCookie(request);++ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ const returnTo = (await returnToPath(request)) ?? dashboardPath();try {return await authenticator.authenticate("google", request, {@@ -25,22 +35,23 @@ export const action = async ({ request }: ActionFunctionArgs) => {} catch (error) {// all redirects are basically errors and in that case we don't want to catch itif (error instanceof Response) {- return error;- }- if (error instanceof Error) {- console.error({- error,- extras: {- loginMethod: AUTH_PROVIDERS.LOGIN_GOOGLE,- },- });- return redirect(- loginPath({- error: AUTH_PROVIDERS.LOGIN_GOOGLE,- message: error?.message,- returnTo,- })- );+ return clearReturnToCookie(request, error);}++ const message = error instanceof Error ? error?.message : "unknown error";++ console.error({+ error,+ extras: {+ loginMethod: AUTH_PROVIDERS.LOGIN_GOOGLE,+ },+ });+ return redirect(+ loginPath({+ error: AUTH_PROVIDERS.LOGIN_GOOGLE,+ message: message,+ returnTo,+ })+ );}};diff --git a/apps/builder/app/routes/auth.google_.callback.tsx b/apps/builder/app/routes/auth.google_.callback.tsxindex 5a37c88a0a..463de7a148 100644--- a/apps/builder/app/routes/auth.google_.callback.tsx+++ b/apps/builder/app/routes/auth.google_.callback.tsx@@ -1,13 +1,47 @@-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";+import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";import { authenticator } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";-import { returnToPath } from "~/services/cookie.server";+import { dashboardPath, isDashboard, loginPath } from "~/shared/router-utils";+import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";+import { AUTH_PROVIDERS } from "~/shared/session";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({ request }: LoaderFunctionArgs) => {- const returnTo = await returnToPath(request);+ preventCrossOriginCookie(request);- return authenticator.authenticate("google", request, {- successRedirect: returnTo,- failureRedirect: loginPath({ returnTo }),- });+ if (false === isDashboard(request)) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }++ const returnTo = (await returnToPath(request)) ?? dashboardPath();++ try {+ await authenticator.authenticate("google", request, {+ successRedirect: returnTo,+ throwOnError: true,+ });+ } catch (error) {+ // all redirects are basically errors and in that case we don't want to catch it+ if (error instanceof Response) {+ return clearReturnToCookie(request, error);+ }++ const message = error instanceof Error ? error?.message : "unknown error";++ console.error({+ error,+ extras: {+ loginMethod: AUTH_PROVIDERS.LOGIN_GOOGLE,+ },+ });+ return redirect(+ loginPath({+ error: AUTH_PROVIDERS.LOGIN_GOOGLE,+ message,+ returnTo,+ })+ );+ }};diff --git a/apps/builder/app/routes/auth.ws.ts b/apps/builder/app/routes/auth.ws.tsindex bd4c79daf7..f00884e1bc 100644--- a/apps/builder/app/routes/auth.ws.ts+++ b/apps/builder/app/routes/auth.ws.ts@@ -1,13 +1,18 @@import type { LoaderFunction } from "@remix-run/node";import { createDebug } from "~/shared/debug";import { builderAuthenticator } from "~/services/builder-auth.server";-import { isBuilderUrl } from "~/shared/router-utils/origins";+import { comparePathnames, isBuilder } from "~/shared/router-utils";+import { isRedirectResponse, returnToCookie } from "~/services/cookie.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";const debug = createDebug(import.meta.url);+// Endpoint to force user reloginexport const loader: LoaderFunction = async ({ request }) => {+ preventCrossOriginCookie(request);+try {- if (false === isBuilderUrl(request.url)) {+ if (false === isBuilder(request)) {debug(`Request url is not the builder URL ${request.url}`);return new Response(null, {@@ -26,7 +31,25 @@ export const loader: LoaderFunction = async ({ request }) => {} catch (error) {// all redirects are basically errors and in that case we don't want to catch itif (error instanceof Response) {- return error;+ const response = error.clone();++ if (isRedirectResponse(response)) {+ const url = new URL(request.url);+ let returnTo = url.searchParams.get("returnTo");+ if (returnTo !== null && comparePathnames(returnTo, request.url)) {+ // avoid loops+ returnTo = "/";+ }++ const options = returnTo === null ? { maxAge: -1 } : {};++ response.headers.append(+ "Set-Cookie",+ await returnToCookie.serialize(returnTo, options)+ );+ }++ return response;}debug("error", error);diff --git a/apps/builder/app/routes/auth.ws_.callback.ts b/apps/builder/app/routes/auth.ws_.callback.tsindex ba98ec3d41..6d41bf8f58 100644--- a/apps/builder/app/routes/auth.ws_.callback.ts+++ b/apps/builder/app/routes/auth.ws_.callback.ts@@ -1,17 +1,20 @@import { type LoaderFunction, redirect } from "@remix-run/server-runtime";import { AuthorizationError } from "remix-auth";import { createDebug } from "~/shared/debug";-import { isBuilderUrl } from "~/shared/router-utils/origins";-import { returnToPath } from "~/services/cookie.server";+import { clearReturnToCookie, returnToPath } from "~/services/cookie.server";import { builderAuthenticator } from "~/services/builder-auth.server";import { OAuth2Error } from "remix-auth-oauth2";import { builderSessionStorage } from "~/services/builder-session.server";+import { builderPath, isBuilder } from "~/shared/router-utils";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";const debug = createDebug(import.meta.url);export const loader: LoaderFunction = async ({ request }) => {+ preventCrossOriginCookie(request);+try {- if (false === isBuilderUrl(request.url)) {+ if (false === isBuilder(request)) {debug(`Request url is not the builder URL ${request.url}`);return new Response(null, {@@ -20,7 +23,7 @@ export const loader: LoaderFunction = async ({ request }) => {});}- const returnTo = await returnToPath(request);+ const returnTo = (await returnToPath(request)) ?? builderPath({});debug("Start exchanging the code for the access token");@@ -31,7 +34,25 @@ export const loader: LoaderFunction = async ({ request }) => {} catch (error) {// all redirects are basically errors and in that case we don't want to catch itif (error instanceof Response) {- return error;+ debug("Response Cookie", error.headers.get("Set-Cookie"));++ const session = await builderSessionStorage.getSession(+ error.headers.get("Set-Cookie")+ );++ // Cleanup due to a bug in remix-auth-oauth2: https://github.com/sergiodxa/remix-auth-oauth2/issues/122+ const sessionStateKey = "oauth2:state";+ const sessionCodeVerifierKey = "oauth2:codeVerifier";+ session.unset(sessionStateKey);+ session.unset(sessionCodeVerifierKey);+ const response = error.clone();+ // Use set instead of append to overwrite the cookie+ response.headers.set(+ "Set-Cookie",+ await builderSessionStorage.commitSession(session)+ );++ return clearReturnToCookie(request, response);}if (error instanceof AuthorizationError) {diff --git a/apps/builder/app/routes/builder-logout.ts b/apps/builder/app/routes/builder-logout.tsnew file mode 100644index 0000000000..0c365e48dc--- /dev/null+++ b/apps/builder/app/routes/builder-logout.ts@@ -0,0 +1,61 @@+import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";+import { createDebug } from "~/shared/debug";+import { builderAuthenticator } from "~/services/builder-auth.server";+import { getAuthorizationServerOrigin } from "~/shared/router-utils/origins";+import { isBuilder, loginPath } from "~/shared/router-utils";+import { isRedirectResponse } from "~/services/cookie.server";++const debug = createDebug(import.meta.url);++export const action = async ({ request }: ActionFunctionArgs) => {+ // IMPORTANT: This route allows cross-origin cookies to enable dashboard logout from builders.+ // Enforcing preflight by checking Content-Type to be application/json.+ // At the SaaS proxy side, only the allowed "access-control-allow-origin" header is set for OPTIONS requests.++ if (false === isBuilder(request)) {+ throw new Error("Only Builder can logout at this endpoint");+ }++ if (request.method !== "POST") {+ return json(+ { message: "Method not allowed" },+ {+ status: 405,+ statusText: "Method Not Allowed",+ }+ );+ }++ if (+ false === request.headers.get("Content-Type")?.includes("application/json")+ ) {+ // Enforce preflight request, preflight is checked on allowed origin+ throw new Error("Invalid content type, only application/json is allowed");+ }++ const redirectTo = `${getAuthorizationServerOrigin(request.url)}${loginPath({})}`;++ try {+ debug("Logging out");++ await builderAuthenticator.logout(request, {+ redirectTo,+ });+ } catch (error) {+ if (error instanceof Response) {+ if (isRedirectResponse(error)) {+ return new Response(null, {+ status: 204,+ headers: error.headers,+ });+ }++ return error;+ }++ console.error(error);+ throw error;+ }++ throw new Error("Should not reach this point");+};diff --git a/apps/builder/app/routes/builder.$projectId.tsx b/apps/builder/app/routes/builder.$projectId.tsxnew file mode 100644index 0000000000..66731e69b1--- /dev/null+++ b/apps/builder/app/routes/builder.$projectId.tsx@@ -0,0 +1,17 @@+import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";+import { builderUrl } from "~/shared/router-utils";++// Support for Auth Token URLs generated by previous Builder versions+// @todo: Remove after 2024-12-31+export const loader = async ({ request, params }: LoaderFunctionArgs) => {+ if (params.projectId === undefined) {+ throw new Error("projectId is required");+ }++ return redirect(+ builderUrl({+ projectId: params.projectId,+ origin: request.url,+ })+ );+};diff --git a/apps/builder/app/routes/leak.ts b/apps/builder/app/routes/leak.tsnew file mode 100644index 0000000000..69b08581e6--- /dev/null+++ b/apps/builder/app/routes/leak.ts@@ -0,0 +1,43 @@+import { json, type LoaderFunction } from "@remix-run/server-runtime";+import { authenticator } from "~/services/auth.server";+import { builderAuthenticator } from "~/services/builder-auth.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import { isBuilder } from "~/shared/router-utils";+import { sessionStorage } from "~/services/session.server";+import { builderSessionStorage } from "~/services/builder-session.server";+import env from "~/env/env.server";++/**+ * This route is designed to test for potential data leakage.+ * Will be removed.+ * @todo Remove this route+ */+export const loader: LoaderFunction = async ({ request }) => {+ if (env.DEPLOYMENT_ENVIRONMENT === "production") {+ throw new Error("This route is only for development");+ }++ preventCrossOriginCookie(request);++ const authenticatorService = isBuilder(request)+ ? builderAuthenticator+ : authenticator;++ const user = authenticatorService.isAuthenticated(request);++ const session = await sessionStorage.getSession(+ request.headers.get("Cookie")+ );+ console.info("session", session.data);++ const builderSession = await builderSessionStorage.getSession(+ request.headers.get("Cookie")+ );++ return json({+ message: "If you see other user then data leaked",+ leak: user,+ data: session.data,+ builderData: builderSession.data,+ });+};diff --git a/apps/builder/app/routes/logout.tsx b/apps/builder/app/routes/logout.tsxdeleted file mode 100644index 68d81e66c7..0000000000--- a/apps/builder/app/routes/logout.tsx+++ /dev/null@@ -1,49 +0,0 @@-import { type LoaderFunctionArgs } from "@remix-run/server-runtime";-import { createDebug } from "~/shared/debug";-import { authenticator } from "~/services/auth.server";-import { builderAuthenticator } from "~/services/builder-auth.server";-import {- getAuthorizationServerOrigin,- isBuilderUrl,-} from "~/shared/router-utils/origins";--const debug = createDebug(import.meta.url);--export const loader = async ({ request }: LoaderFunctionArgs) => {- debug("Logout request received", request.url);-- try {- if (isBuilderUrl(request.url)) {- debug("Temporary redirect to /tmp/login after logout");- await builderAuthenticator.logout(request, {- redirectTo: `${getAuthorizationServerOrigin(request.url)}/tmp/login`,- });- } else {- await authenticator.logout(request, { redirectTo: "/" });- }- } catch (error) {- if (error instanceof Response) {- const contentType = request.headers.get("Content-Type");-- if (contentType?.includes("application/json")) {- const headers = new Headers(error.headers);- headers.set("Content-Type", "application/json");- return new Response(- JSON.stringify({- success: true,- }),- {- headers,- status: 200,- }- );- }-- return error;- }-- throw error;- }-- throw new Error("Should not reach this point");-};diff --git a/apps/builder/app/routes/n8n.$.tsx b/apps/builder/app/routes/n8n.$.tsxindex ba9285f5f6..0b2d5714ef 100644--- a/apps/builder/app/routes/n8n.$.tsx+++ b/apps/builder/app/routes/n8n.$.tsx@@ -6,9 +6,10 @@ import {import { isRouteErrorResponse, useRouteError } from "@remix-run/react";import { z } from "zod";import { findAuthenticatedUser } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";+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";const zN8NResponse = z.union([z.object({@@ -27,6 +28,15 @@ const zWebhookEnv = z.object({});export const loader = async ({ request, params }: LoaderFunctionArgs) => {+ preventCrossOriginCookie(request);++ if (isDashboard(request) === false) {+ throw new Response(null, {+ status: 404,+ statusText: "Not Found",+ });+ }+const user = await findAuthenticatedUser(request);if (user === null) {diff --git a/apps/builder/app/routes/oauth.ws.authorize.tsx b/apps/builder/app/routes/oauth.ws.authorize.tsxindex eef1b53fd7..d61afa7cf9 100644--- a/apps/builder/app/routes/oauth.ws.authorize.tsx+++ b/apps/builder/app/routes/oauth.ws.authorize.tsx@@ -5,9 +5,11 @@ import { fromError } from "zod-validation-error";import { getAuthorizationServerOrigin } from "~/shared/router-utils/origins";import env from "~/env/env.server";import { authenticator } from "~/services/auth.server";-import { returnToCookie } from "~/services/cookie.server";import { createCodeToken } from "~/services/token.server";import { isUserAuthorizedForProject } from "~/services/builder-access.server";+import { loginPath } from "~/shared/router-utils";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+import * as session from "~/services/session.server";const debug = createDebug(import.meta.url);@@ -68,6 +70,8 @@ const OAuthRedirectUri = z.object({* https://datatracker.ietf.org/doc/html/rfc7636*/export const loader: LoaderFunction = async ({ request }) => {+ preventCrossOriginCookie(request);+try {debug("Authorize request received", request.url);@@ -136,20 +140,20 @@ export const loader: LoaderFunction = async ({ request }) => {const oAuthParams = parsedOAuthParams.data;- const user = await authenticator.isAuthenticated(request);+ const sessionData = await authenticator.isAuthenticated(request);- if (user) {- debug(`User id=${user.id} is authenticated`);+ if (sessionData) {+ debug(`User id=${sessionData.userId} is authenticated`);const isAuthorized = await isUserAuthorizedForProject(- user.id,+ sessionData.userId,oAuthParams.scope.projectId);// scope: Ensure the requested scope is valid, authorized, and within the permissions granted to the client.if (false === isAuthorized) {debug(- `User ${user.id} is not the owner of ${oAuthParams.scope.projectId}, denying access`+ `User ${sessionData.userId} is not the owner of ${oAuthParams.scope.projectId}, denying access`);return oauthError("unauthorized_client",@@ -158,14 +162,14 @@ export const loader: LoaderFunction = async ({ request }) => {}debug(- `User ${user.id} is the owner of ${oAuthParams.scope.projectId}, creating token`+ `User ${sessionData.userId} is the owner of ${oAuthParams.scope.projectId}, creating token`);// We do not use database now.// https://datatracker.ietf.org/doc/html/rfc7636#section-4.4const code = await createCodeToken({- userId: user.id,+ userId: sessionData.userId,projectId: oAuthParams.scope.projectId,codeChallenge: oAuthParams.code_challenge,},@@ -184,27 +188,29 @@ export const loader: LoaderFunction = async ({ request }) => {`Code ${code} created, redirecting to redirect_uri: ${redirectUri.href}`);- return redirect(redirectUri.href);+ const bloomFilter = await session.readLoginSessionBloomFilter(request);++ await bloomFilter.add(oAuthParams.scope.projectId);++ return session.writeLoginSessionBloomFilter(+ request,+ new Response(null, {+ status: 302,+ headers: {+ Location: redirectUri.href,+ },+ }),+ bloomFilter+ );}- user satisfies null;+ sessionData satisfies null;debug("User is not authenticated, saving current url to returnTo cookie and redirecting to login");- const headers = new Headers();- // Issue with local development, so force https- const returnToUrl = new URL(request.url);- returnToUrl.protocol = "https";-- // We don't want to have all params above in the URL, so save in returnTo cookie immediately- headers.append(- "Set-Cookie",- await returnToCookie.serialize(returnToUrl.href)- );-- return redirect("/login", { headers });+ return redirect(loginPath({ returnTo: request.url }));} catch (error) {if (error instanceof Response) {return error;diff --git a/apps/builder/app/routes/oauth.ws.token.ts b/apps/builder/app/routes/oauth.ws.token.tsindex 247651f2f3..752fccea65 100644--- a/apps/builder/app/routes/oauth.ws.token.ts+++ b/apps/builder/app/routes/oauth.ws.token.ts@@ -11,6 +11,7 @@ import {verifyChallenge,} from "~/services/token.server";import { isUserAuthorizedForProject } from "~/services/builder-access.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";/*** OAuth 2.0 Token Request@@ -25,8 +26,6 @@ const TokenRequest = z.object({code: z.string(),redirect_uri: z.string().url(),code_verifier: z.string(),- client_id: z.string(),- client_secret: z.string(),});const debug = createDebug(import.meta.url);@@ -39,33 +38,38 @@ const debug = createDebug(import.meta.url);* https://datatracker.ietf.org/doc/html/rfc6749*/export const action = async ({ request }: ActionFunctionArgs) => {- debug("Token request received");- const jsonBody = Object.fromEntries((await request.formData()).entries());- debug("Token request received", jsonBody);+ preventCrossOriginCookie(request);- const parsedBody = TokenRequest.safeParse(jsonBody);+ debug("Token request received");- if (false === parsedBody.success) {- debug(fromError(parsedBody.error).toString());+ const authorizationHeader = request.headers.get("Authorization");+ if (authorizationHeader === null) {return json({error: "invalid_request",- error_description: fromError(parsedBody.error).toString(),+ error_description: "missing client credentials",error_uri: "https://tools.ietf.org/html/rfc6749#section-5.2",},- { status: 400 }+ { status: 401 });}- const body = parsedBody.data;+ const basicAuth = authorizationHeader.split(" ")[1] ?? "";++ const [clientId, clientSecret]: (string | undefined)[] = Buffer.from(+ basicAuth,+ "base64"+ )+ .toString("utf-8")+ .split(":");// Validate the client’s credentials (e.g., client_id and client_secret) using HTTP Basic Authentication or form-encoded parameters.if (- body.client_id !== env.AUTH_WS_CLIENT_ID ||- body.client_secret !== env.AUTH_WS_CLIENT_SECRET+ clientId !== env.AUTH_WS_CLIENT_ID ||+ clientSecret !== env.AUTH_WS_CLIENT_SECRET) {- debug("client_id and client_secret do not match", body.code);+ debug("client_id and client_secret do not match", clientId, clientSecret);return json({error: "invalid_client",@@ -76,6 +80,26 @@ export const action = async ({ request }: ActionFunctionArgs) => {);}+ const jsonBody = Object.fromEntries((await request.formData()).entries());+ debug("Token request received", jsonBody);++ const parsedBody = TokenRequest.safeParse(jsonBody);++ if (false === parsedBody.success) {+ debug(fromError(parsedBody.error).toString());++ return json(+ {+ error: "invalid_request",+ error_description: fromError(parsedBody.error).toString(),+ error_uri: "https://tools.ietf.org/html/rfc6749#section-5.2",+ },+ { status: 400 }+ );+ }++ const body = parsedBody.data;+// Ensure the code parameter is present and valid.const codeToken = await readCodeToken(body.code, env.AUTH_WS_CLIENT_SECRET);diff --git a/apps/builder/app/routes/rest.ai._index.ts b/apps/builder/app/routes/rest.ai._index.tsindex 931d97dc6c..8596ca66ff 100644--- a/apps/builder/app/routes/rest.ai._index.ts+++ b/apps/builder/app/routes/rest.ai._index.ts@@ -18,6 +18,7 @@ import env from "~/env/env.server";import { createContext } from "~/shared/context.server";import { authorizeProject } from "@webstudio-is/trpc-interface/index.server";import { loadDevBuildByProjectId } from "@webstudio-is/project-build/index.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const RequestParams = z.object({projectId: z.string().min(1, "nonempty"),@@ -41,6 +42,8 @@ export const config = {};export const action = async ({ request }: ActionFunctionArgs) => {+ preventCrossOriginCookie(request);+const context = await createContext(request);// @todo Reinstate isFeatureEnabled('ai')diff --git a/apps/builder/app/routes/rest.ai.audio.transcriptions.ts b/apps/builder/app/routes/rest.ai.audio.transcriptions.tsindex 2cb8b60787..08b9d6ef49 100644--- a/apps/builder/app/routes/rest.ai.audio.transcriptions.ts+++ b/apps/builder/app/routes/rest.ai.audio.transcriptions.ts@@ -1,5 +1,6 @@import type { ActionFunctionArgs } from "@remix-run/server-runtime";import { z } from "zod";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";const zTranscription = z.object({text: z.string().transform((value) => value.trim()),@@ -7,6 +8,8 @@ const zTranscription = z.object({// @todo: move to AI packageexport const action = async ({ request }: ActionFunctionArgs) => {+ preventCrossOriginCookie(request);+// @todo: validate requestconst formData = await request.formData();formData.append("model", "whisper-1");diff --git a/apps/builder/app/routes/rest.ai.detect.ts b/apps/builder/app/routes/rest.ai.detect.tsindex aac475b703..132b8ba810 100644--- a/apps/builder/app/routes/rest.ai.detect.ts+++ b/apps/builder/app/routes/rest.ai.detect.ts@@ -11,12 +11,15 @@ import {import env from "~/env/env.server";import { createContext } from "~/shared/context.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const RequestParams = z.object({prompt: z.string().max(1200),});export const action = async ({ request }: ActionFunctionArgs) => {+ preventCrossOriginCookie(request);+// @todo Reinstate isFeatureEnabled('ai')if (env.OPENAI_KEY === undefined) {diff --git a/apps/builder/app/routes/rest.assets.tsx b/apps/builder/app/routes/rest.assets.tsxindex 47fbfc355d..29aecf63ae 100644--- a/apps/builder/app/routes/rest.assets.tsx+++ b/apps/builder/app/routes/rest.assets.tsx@@ -10,6 +10,7 @@ import {} from "@webstudio-is/asset-uploader/index.server";import { createContext } from "~/shared/context.server";import env from "~/env/env.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({params,@@ -23,6 +24,8 @@ export const loader = async ({};export const action = async (props: ActionFunctionArgs) => {+ preventCrossOriginCookie(props.request);+const { request } = props;const context = await createContext(request);diff --git a/apps/builder/app/routes/rest.assets_.$name.tsx b/apps/builder/app/routes/rest.assets_.$name.tsxindex f8da9cd00e..eb874ea524 100644--- a/apps/builder/app/routes/rest.assets_.$name.tsx+++ b/apps/builder/app/routes/rest.assets_.$name.tsx@@ -5,6 +5,7 @@ import { uploadFile } from "@webstudio-is/asset-uploader/index.server";import type { ActionData } from "~/builder/shared/assets";import { createAssetClient } from "~/shared/asset-client";import { createContext } from "~/shared/context.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";const UrlBody = z.object({url: z.string(),@@ -13,6 +14,8 @@ const UrlBody = z.object({export const action = async (props: ActionFunctionArgs): Promise<ActionData | Array<Asset> | undefined> => {+ preventCrossOriginCookie(props.request);+const { request, params } = props;if (params.name === undefined) {diff --git a/apps/builder/app/routes/rest.build.$buildId.tsx b/apps/builder/app/routes/rest.build.$buildId.tsxindex 8da717bda9..2455aec99f 100644--- a/apps/builder/app/routes/rest.build.$buildId.tsx+++ b/apps/builder/app/routes/rest.build.$buildId.tsx@@ -4,6 +4,7 @@ import { db as projectDb } from "@webstudio-is/project/index.server";import { loadProductionCanvasData } from "~/shared/db";import { createContext } from "~/shared/context.server";import { getUserById, type User } from "~/shared/db/user.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({params,@@ -14,6 +15,8 @@ export const loader = async ({projectTitle: string;}> => {+ preventCrossOriginCookie(request);+try {const buildId = params.buildId;diff --git a/apps/builder/app/routes/rest.buildId.$projectId.tsx b/apps/builder/app/routes/rest.buildId.$projectId.tsxindex 307f666611..fde81395e1 100644--- a/apps/builder/app/routes/rest.buildId.$projectId.tsx+++ b/apps/builder/app/routes/rest.buildId.$projectId.tsx@@ -1,11 +1,14 @@import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";import { db as projectDb } from "@webstudio-is/project/index.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { createContext } from "~/shared/context.server";export const loader = async ({params,request,}: LoaderFunctionArgs): Promise<{ buildId: string | null }> => {+ preventCrossOriginCookie(request);+try {const projectId = params.projectId;diff --git a/apps/builder/app/routes/rest.current.products.ts b/apps/builder/app/routes/rest.current.products.tsindex 8ab15d15d7..95c1706848 100644--- a/apps/builder/app/routes/rest.current.products.ts+++ b/apps/builder/app/routes/rest.current.products.ts@@ -6,12 +6,15 @@ import {import { findAuthenticatedUser } from "~/services/auth.server";import { loginPath } from "~/shared/router-utils";import { prisma } from "@webstudio-is/prisma-client";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";/*** Created for ebugging purposes, to check that payments and products are working* Showing current user's checkouts with products.*/export const loader = async ({ request }: LoaderFunctionArgs) => {+ preventCrossOriginCookie(request);+const user = await findAuthenticatedUser(request);if (user === null) {diff --git a/apps/builder/app/routes/rest.data.$projectId.ts b/apps/builder/app/routes/rest.data.$projectId.tsindex c44344ca73..62e079e86d 100644--- a/apps/builder/app/routes/rest.data.$projectId.ts+++ b/apps/builder/app/routes/rest.data.$projectId.ts@@ -3,8 +3,11 @@ import { db } from "@webstudio-is/project/index.server";import { loadDevBuildByProjectId } from "@webstudio-is/project-build/index.server";import { loadAssetsByProject } from "@webstudio-is/asset-uploader/index.server";import { createContext } from "~/shared/context.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const loader = async ({ params, request }: LoaderFunctionArgs) => {+ preventCrossOriginCookie(request);+if (params.projectId === undefined) {throw new Error("Project id undefined");}diff --git a/apps/builder/app/routes/rest.patch.ts b/apps/builder/app/routes/rest.patch.tsindex 46db458c11..3fc2a8fa77 100644--- a/apps/builder/app/routes/rest.patch.ts+++ b/apps/builder/app/routes/rest.patch.ts@@ -34,11 +34,15 @@ import {} from "@webstudio-is/project-build/index.server";import { patchAssets } from "@webstudio-is/asset-uploader/index.server";import type { Project } from "@webstudio-is/project";-import { authorizeProject } from "@webstudio-is/trpc-interface/index.server";+import {+ AuthorizationError,+ authorizeProject,+} from "@webstudio-is/trpc-interface/index.server";import { createContext } from "~/shared/context.server";import { db } from "@webstudio-is/project/index.server";import type { Database } from "@webstudio-is/postrest/index.server";import { publicStaticEnv } from "~/env/env.static";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";type PatchData = {transactions: Array<SyncItem>;@@ -52,8 +56,11 @@ export const action = async ({}: ActionFunctionArgs): Promise<| { status: "ok" }| { status: "version_mismatched"; errors: string }+ | { status: "authorization_error"; errors: string }| { status: "error"; errors: string }> => {+ preventCrossOriginCookie(request);+enableMapSet();enablePatches();@@ -91,12 +98,29 @@ export const action = async ({}const context = await createContext(request);++ if (+ context.authorization.userId === undefined &&+ context.authorization.authToken === undefined+ ) {+ return {+ // We use version_mismatched here to support older browser client+ // @todo change on authorization_error after 15/09/2024+ status: "version_mismatched",+ errors:+ "Due to a recent update or a possible logout, you may need to log in again. Please reload the page and sign in to continue.",+ };+ }+const canEdit = await authorizeProject.hasProjectPermit({ projectId, permit: "edit" },context);if (canEdit === false) {- throw Error("You don't have edit access to this project");+ return {+ status: "authorization_error",+ errors: "You don't have permission to edit this project.",+ };}const build = await loadRawBuildById(context, buildId);@@ -357,6 +381,13 @@ export const action = async ({return { status: "ok" };} catch (error) {+ if (error instanceof AuthorizationError) {+ return {+ status: "authorization_error",+ errors: error.message,+ };+ }+console.error(error);return {status: "error",diff --git a/apps/builder/app/routes/rest.resources-loader.ts b/apps/builder/app/routes/rest.resources-loader.tsindex ca71a919c0..63f5c4c77e 100644--- a/apps/builder/app/routes/rest.resources-loader.ts+++ b/apps/builder/app/routes/rest.resources-loader.ts@@ -6,8 +6,11 @@ import {ResourceRequest,} from "@webstudio-is/sdk";import { loader as siteMapLoader } from "../shared/$resources/sitemap.xml.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const action = async ({ request }: ActionFunctionArgs) => {+ preventCrossOriginCookie(request);+// Hope Remix will have customFetch by default, see https://kit.svelte.dev/docs/load#making-fetch-requestsconst customFetch: typeof fetch = (input, init) => {if (typeof input !== "string") {diff --git a/apps/builder/app/routes/trpc.$.ts b/apps/builder/app/routes/trpc.$.tsindex f5dbdeb9ac..e25f5351df 100644--- a/apps/builder/app/routes/trpc.$.ts+++ b/apps/builder/app/routes/trpc.$.ts@@ -2,8 +2,11 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";import type { ActionFunctionArgs } from "@remix-run/server-runtime";import { createContext } from "~/shared/context.server";import { appRouter } from "~/services/trcp-router.server";+import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";export const action = async ({ request }: ActionFunctionArgs) => {+ preventCrossOriginCookie(request);+// https://trpc.io/docs/server/adapters/fetchconst response = await fetchRequestHandler({req: request,diff --git a/apps/builder/app/services/auth.server.ts b/apps/builder/app/services/auth.server.tsindex 510fdcf003..c7f4139e39 100644--- a/apps/builder/app/services/auth.server.ts+++ b/apps/builder/app/services/auth.server.ts@@ -5,14 +5,30 @@ import { GoogleStrategy, type GoogleProfile } from "remix-auth-google";import * as db from "~/shared/db";import { sessionStorage } from "~/services/session.server";import { AUTH_PROVIDERS } from "~/shared/session";-import { authCallbackPath } from "~/shared/router-utils";-import { getUserById, type User } from "~/shared/db/user.server";+import { authCallbackPath, isBuilder } from "~/shared/router-utils";+import { getUserById } from "~/shared/db/user.server";import env from "~/env/env.server";+import { builderAuthenticator } from "./builder-auth.server";+import { staticEnv } from "~/env/env.static.server";+import type { SessionData } from "./auth.server.utils";-const url =+const transformRefToAlias = (input: string) => {+ const rawAlias = input.endsWith(".staging") ? input.slice(0, -8) : input;++ return rawAlias+ .replace(/[^a-zA-Z0-9_-]/g, "") // Remove all characters except a-z, A-Z, 0-9, _ and -+ .toLowerCase() // Convert to lowercase+ .replace(/_/g, "-") // Replace underscores with hyphens+ .replace(/-+/g, "-"); // Replace multiple hyphens with a single hyphen+};++export const callbackOrigin =env.DEPLOYMENT_ENVIRONMENT === "production"? env.DEPLOYMENT_URL- : `http://localhost:${env.PORT || 3000}`;+ : env.DEPLOYMENT_ENVIRONMENT === "staging" ||+ env.DEPLOYMENT_ENVIRONMENT === "development"+ ? `https://${transformRefToAlias(staticEnv.GITHUB_REF_NAME ?? "main")}.${env.DEPLOYMENT_ENVIRONMENT}.webstudio.is`+ : `https://wstd.dev:${env.PORT || 5173}`;const strategyCallback = async ({profile,@@ -21,7 +37,7 @@ const strategyCallback = async ({}) => {try {const user = await db.user.createOrLoginWithOAuth(profile);- return user;+ return { userId: user.id, createdAt: Date.now() };} catch (error) {if (error instanceof Error) {console.error({@@ -37,7 +53,7 @@ const strategyCallback = async ({// Create an instance of the authenticator, pass a generic with what// strategies will return and will store in the session-export const authenticator = new Authenticator<User>(sessionStorage, {+export const authenticator = new Authenticator<SessionData>(sessionStorage, {throwOnError: true,});@@ -46,7 +62,7 @@ if (env.GH_CLIENT_ID && env.GH_CLIENT_SECRET) {{clientID: env.GH_CLIENT_ID,clientSecret: env.GH_CLIENT_SECRET,- callbackURL: `${url}${authCallbackPath({ provider: "github" })}`,+ callbackURL: `${callbackOrigin}${authCallbackPath({ provider: "github" })}`,},strategyCallback);@@ -58,7 +74,7 @@ if (env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET) {{clientID: env.GOOGLE_CLIENT_ID,clientSecret: env.GOOGLE_CLIENT_SECRET,- callbackURL: `${url}${authCallbackPath({ provider: "google" })}`,+ callbackURL: `${callbackOrigin}${authCallbackPath({ provider: "google" })}`,},strategyCallback);@@ -81,7 +97,10 @@ if (env.DEV_LOGIN === "true") {if (secret === env.AUTH_SECRET?.slice(0, 4)) {try {const user = await db.user.createOrLoginWithDev(email);- return user;+ return {+ userId: user.id,+ createdAt: Date.now(),+ };} catch (error) {if (error instanceof Error) {console.error({@@ -102,12 +121,16 @@ if (env.DEV_LOGIN === "true") {}export const findAuthenticatedUser = async (request: Request) => {- const user = await authenticator.isAuthenticated(request);+ const user = isBuilder(request)+ ? await builderAuthenticator.isAuthenticated(request)+ : await authenticator.isAuthenticated(request);+if (user == null) {return null;}+try {- return await getUserById(user.id);+ return await getUserById(user.userId);} catch (error) {return null;}diff --git a/apps/builder/app/services/auth.server.utils.ts b/apps/builder/app/services/auth.server.utils.tsnew file mode 100644index 0000000000..f2fac74756--- /dev/null+++ b/apps/builder/app/services/auth.server.utils.ts@@ -0,0 +1,18 @@+export type SessionData = {+ userId: string;+ createdAt: number;+};++export const getSessionCookieNameVersion = () => {+ // IMPORTANT: If you see an error here, you need to increase the version number.+ // Explanation:+ // Changing the SessionData type will cause all existing user sessions to not work as expected.+ // There is no logic to validate or clean up sessions, so we avoid session migration issues by changing the session cookie name.+ // This ensures that old sessions are invalidated and new sessions are created with the updated structure.+ const obj: SessionData = { userId: "", createdAt: 0 };+ obj.userId = "";++ // IMPORTANT: Change version in the SaaS platform as well!+ // IMPORTANT: Changing the version will cause all users to be logged out.+ return "2";+};diff --git a/apps/builder/app/services/bloom-filter.server.test.ts b/apps/builder/app/services/bloom-filter.server.test.tsnew file mode 100644index 0000000000..2baa8c9da4--- /dev/null+++ b/apps/builder/app/services/bloom-filter.server.test.ts@@ -0,0 +1,160 @@+import { test, expect, describe, beforeEach } from "@jest/globals";+import { BloomFilter } from "./bloom-filter.server";++describe("BloomFilter add/has", () => {+ let bloomFilter: BloomFilter;++ beforeEach(() => {+ bloomFilter = new BloomFilter(100, 0.01);+ });++ test("should initialize correctly", () => {+ expect(bloomFilter.numHashes).toBeGreaterThan(0);+ expect(bloomFilter.bitArray.length).toBeGreaterThan(0);+ });++ test("should add an item and check its existence", async () => {+ const item = "test-item";+ await bloomFilter.add(item);+ const hasItem = await bloomFilter.has(item);+ expect(hasItem).toBe(true);+ });++ test("should return false for non-existent items", async () => {+ const item = "non-existent-item";+ const hasItem = await bloomFilter.has(item);+ expect(hasItem).toBe(false);+ });++ test("should handle adding the same item multiple times", async () => {+ const item = "duplicate-item";+ await bloomFilter.add(item);+ await bloomFilter.add(item);+ const hasItem = await bloomFilter.has(item);+ expect(hasItem).toBe(true);+ });++ test("should handle multiple items", async () => {+ const items = ["item1", "item2", "item3"];+ for (const item of items) {+ await bloomFilter.add(item);+ }++ for (const item of items) {+ const hasItem = await bloomFilter.has(item);+ expect(hasItem).toBe(true);+ }++ const notExistedItems = ["na-item1", "na-item2", "na-item3"];+ for (const item of notExistedItems) {+ const hasItem = await bloomFilter.has(item);+ expect(hasItem).toBe(false);+ }+ });+});++describe("BloomFilter serialize/deserialize", () => {+ let bloomFilter: BloomFilter;++ beforeEach(() => {+ bloomFilter = new BloomFilter(100, 0.01);+ });++ test("should serialize and deserialize correctly", async () => {+ const items = ["item1", "item2", "item3", "item4", "item5"];++ for (const item of items) {+ await bloomFilter.add(item);+ }++ const serialized = bloomFilter.serialize();+ const deserialized = BloomFilter.deserialize(serialized);++ expect(deserialized.numHashes).toBe(bloomFilter.numHashes);+ expect(deserialized.bitArray).toEqual(bloomFilter.bitArray);+ });+});++describe("BloomFilter size", () => {+ test("should fail if out of params", async () => {+ expect(() => {+ new BloomFilter(1000, 0.00001);+ }).toThrowError("numHashes is too large");++ expect(() => {+ new BloomFilter(100000, 0.01);+ }).toThrowError(+ "Invariant failed: bitSize=958506 is too large, hash is 16-bit"+ );+ });++ test("Visual test bloom filter size", async () => {+ const bloomFilter = new BloomFilter(100, 0.02);+ for (let i = 0; i < 20; i++) {+ await bloomFilter.add(i.toString());+ }++ const serialized = bloomFilter.serialize();+ expect(serialized).toMatchInlineSnapshot(+ `"CAAQAQGCIIBVggEAADBCwABIFEAAAAAABGAAQCJoBEAAABAAAAgCACCAAIQEhIQ0gACAAAgIQAggAgUgEAAAgBETgAAQAECBFEUkAAMqRoIBkREQQMAAEEgIAFAAAACAAAGICAgGBg"`+ );+ });++ test("Visual test bloom filter size", async () => {+ const bloomFilter = new BloomFilter(50, 0.02);+ for (let i = 0; i < 20; i++) {+ await bloomFilter.add(i.toString());+ }++ const serialized = bloomFilter.serialize();+ expect(serialized).toMatchInlineSnapshot(+ `"CAgYQQmiIoV1kgEAgDFTwABYFECBFEUkBGMqRqJplVEQQNAAEEgKAHCAAISEhIW8iAiGBg"`+ );+ });+});++describe("real life test", () => {+ test.each([50, 100])("should work with real life data", async (maxItems) => {+ const falsePositiveProbability = 0.02;++ const bloomFilter = new BloomFilter(maxItems, falsePositiveProbability);++ // Fill with maxItems with 2/3+ const uuids = Array.from(Array(Math.ceil((maxItems * 2) / 3)), () =>+ crypto.randomUUID()+ );+ for (const uuid of uuids) {+ await bloomFilter.add(uuid);+ }++ for (const uuid of uuids) {+ expect(await bloomFilter.has(uuid)).toBe(true);+ }++ let falsePositives = 0;++ const notInSetCount = 1000;++ const notInSetUuid = Array.from(Array(notInSetCount), () =>+ crypto.randomUUID()+ );++ for (const uuid of notInSetUuid) {+ const isInSet = await bloomFilter.has(uuid);+ falsePositives += isInSet ? 1 : 0;+ }++ expect(falsePositives).toBeLessThan(+ notInSetCount * falsePositiveProbability+ );++ /*+ // Uncomment to play with parameters+ console.info(+ "False positives",+ falsePositives,+ bloomFilter.serialize().length+ );+ */+ });+});diff --git a/apps/builder/app/services/bloom-filter.server.ts b/apps/builder/app/services/bloom-filter.server.tsnew file mode 100644index 0000000000..64aa42f395--- /dev/null+++ b/apps/builder/app/services/bloom-filter.server.ts@@ -0,0 +1,104 @@+import invariant from "tiny-invariant";++const hash = async (input: string) => {+ const encoder = new TextEncoder();+ const data = encoder.encode(input);+ const hashBuffer = await crypto.subtle.digest("SHA-256", data);+ return hashBuffer;+};++const SHA_SIZE = 32;++const getBit = (arr: Uint8Array, i: number) => (arr[i >> 3] >> (i & 7)) & 1;++const setBit = (arr: Uint8Array, i: number) => {+ arr[i >> 3] = arr[i >> 3] | (1 << (i & 7));+};++export class BloomFilter {+ numHashes: number;+ bitArray: Uint8Array;++ constructor(maxItems: number, falsePositiveProbability: number) {+ if (maxItems === 0) {+ this.numHashes = 0;+ this.bitArray = new Uint8Array(0);+ return;+ }++ const bitSize = Math.ceil(+ (maxItems * Math.log(falsePositiveProbability)) /+ Math.log(1 / Math.pow(2, Math.log(2)))+ );++ this.numHashes = Math.round((bitSize / maxItems) * Math.log(2));++ invariant(+ SHA_SIZE >= this.numHashes * 2,+ "numHashes is too large, we are using SHA-256"+ );++ invariant(+ bitSize < 0xffff,+ `bitSize=${bitSize} is too large, hash is 16-bit`+ );++ const size = Math.ceil(bitSize / 8);++ this.bitArray = new Uint8Array(size);+ }++ async add(item: string) {+ const hashes = await this.#getHashes(item);+ const size = this.bitArray.length * 8;++ for (const hash of hashes) {+ setBit(this.bitArray, hash % size);+ }+ }++ async has(item: string) {+ const hashes = await this.#getHashes(item);+ const size = this.bitArray.length * 8;++ return hashes.every((hash) => getBit(this.bitArray, hash % size) === 1);+ }++ async #getHashes(item: string): Promise<number[]> {+ const hashes: number[] = [];+ const hashBuffer = await hash(item);+ const hashView = new DataView(hashBuffer);++ invariant(+ hashBuffer.byteLength > this.numHashes * 2,+ "numHashes is too large"+ );++ for (let i = 0; i < this.numHashes; i++) {+ const hashValue = hashView.getUint16(i * 2, true);++ hashes.push(hashValue);+ }++ return hashes;+ }++ serialize(): string {+ return Buffer.concat([+ Buffer.from(this.bitArray),+ Buffer.from([this.numHashes]),+ ]).toString("base64url");+ }++ static deserialize(serialized: string): BloomFilter {+ const buffer = Buffer.from(serialized, "base64url");+ const numHashes = buffer[buffer.length - 1];+ const bitArray = buffer.subarray(0, buffer.length - 1);++ const filter = new BloomFilter(0, 0);+ filter.numHashes = numHashes;+ filter.bitArray = new Uint8Array(bitArray);++ return filter;+ }+}diff --git a/apps/builder/app/services/builder-auth.server.ts b/apps/builder/app/services/builder-auth.server.tsindex 9b0d8e1ea9..0efc7d7d5f 100644--- a/apps/builder/app/services/builder-auth.server.ts+++ b/apps/builder/app/services/builder-auth.server.ts@@ -13,12 +13,12 @@ import {} from "~/shared/router-utils/origins";import { createDebug } from "~/shared/debug";import { readAccessToken } from "./token.server";-import { getUserById, type User } from "~/shared/db/user.server";import { isUserAuthorizedForProject } from "./builder-access.server";+import type { SessionData } from "./auth.server.utils";const debug = createDebug(import.meta.url);-export const builderAuthenticator = new Authenticator<User>(+export const builderAuthenticator = new Authenticator<SessionData>(builderSessionStorage,{throwOnError: true,@@ -26,7 +26,7 @@ export const builderAuthenticator = new Authenticator<User>();builderAuthenticator.use(- new WsStrategy<User>(+ new WsStrategy<SessionData>({clientId: env.AUTH_WS_CLIENT_ID,clientSecret: env.AUTH_WS_CLIENT_SECRET,@@ -34,7 +34,8 @@ builderAuthenticator.use(tokenEndpoint: "https://OVERRIDDEN_ENDPOINT/oauth2/token",redirectURI: "https://OVERRIDDEN_ENDPOINT/auth/callback",codeChallengeMethod: "S256",- authenticateWith: "request_body",+ // use http_basic_auth to bypass no-cross-origin-cookie.ts/preventCrossOriginCookie+ authenticateWith: "http_basic_auth",},async ({ tokens, request }) => {const accessToken = await readAccessToken(@@ -70,7 +71,7 @@ builderAuthenticator.use(debug("User authenticated", accessToken.userId);- return await getUserById(accessToken.userId);+ return await { userId: accessToken.userId, createdAt: Date.now() };},(request: Request): OAuth2StrategyOptionsOverrides => {const origin = getRequestOrigin(request.url);diff --git a/apps/builder/app/services/builder-session.server.ts b/apps/builder/app/services/builder-session.server.tsindex 9e60b5df91..adc21fda1c 100644--- a/apps/builder/app/services/builder-session.server.ts+++ b/apps/builder/app/services/builder-session.server.ts@@ -1,13 +1,17 @@import { createCookieSessionStorage } from "@remix-run/node";import env from "~/env/env.server";+import { getSessionCookieNameVersion } from "./auth.server.utils";export const builderSessionStorage = createCookieSessionStorage({cookie: {- name: "_builder_session", // use any name you want here- sameSite: "lax", // this helps with CSRF- path: "/", // remember to add this so the cookie will work in all routes- httpOnly: true, // for security reasons, make this cookie http only- secrets: env.AUTH_SECRET ? [env.AUTH_SECRET] : undefined, // replace this with an actual secret+ // Using the __Host- prefix to prevent a malicious user from setting another person's session cookie+ // on all subdomains of apps.webstudio.is, e.g., setting Domain=.apps.webstudio.is.+ // For more information, see: https://developer.mozilla.org/en-US/docs/Web/Security/Practical_implementation_guides/Cookies#name+ name: `__Host-_session_builder_session_${getSessionCookieNameVersion()}`,+ sameSite: "lax",+ path: "/",+ httpOnly: true,+ secrets: env.AUTH_SECRET ? [env.AUTH_SECRET] : undefined,secure: true,},});diff --git a/apps/builder/app/services/cookie.server.ts b/apps/builder/app/services/cookie.server.tsindex 5be6cd789b..0fa8522027 100644--- a/apps/builder/app/services/cookie.server.ts+++ b/apps/builder/app/services/cookie.server.ts@@ -1,19 +1,57 @@import { createCookie } from "@remix-run/node";-import env from "~/env/env.server";-import { dashboardPath } from "~/shared/router-utils";+import { compareUrls } from "~/shared/router-utils";-export const returnToCookie = createCookie("returnTo", {+// https://developer.mozilla.org/en-US/docs/Web/Security/Practical_implementation_guides/Cookies#name+export const returnToCookie = createCookie("__Host-_returnTo", {path: "/",httpOnly: true,sameSite: "lax",- maxAge: 60 * 5, // 5 minutes because it makes no sense to keep it for a long time- secure: env.SECURE_COOKIE,+ // Set the expiration to 5 minutes as it is unnecessary to retain the cookie for a longer duration.+ maxAge: 60 * 5,+ secure: true,});-export const returnToPath = async (request: Request) => {- const returnTo =- (await returnToCookie.parse(request.headers.get("Cookie"))) ??- dashboardPath();+export const returnToPath = async (+ request: Request+): Promise<string | null> => {+ const returnTo = await returnToCookie.parse(request.headers.get("Cookie"));- return returnTo;+ if (returnTo === null || typeof returnTo === "string") {+ return returnTo;+ }+ return null;+};++export const isRedirectResponse = (response: Response) => {+ return (+ response.status >= 300 &&+ response.status < 400 &&+ response.headers.get("Location") !== null+ );+};++export const clearReturnToCookie = async (+ request: Request,+ response: Response+) => {+ const returnTo = await returnToPath(request);++ if (returnTo === null) {+ return response;+ }++ if (false === isRedirectResponse(response)) {+ return response;+ }++ if (false === compareUrls(returnTo, response.headers.get("Location")!)) {+ return response;+ }++ const resultResponse = response.clone();+ resultResponse.headers.append(+ "Set-Cookie",+ await returnToCookie.serialize(null, { maxAge: -1 })+ );+ return resultResponse;};diff --git a/apps/builder/app/services/logout-router.server.ts b/apps/builder/app/services/logout-router.server.tsnew file mode 100644index 0000000000..79974f3a37--- /dev/null+++ b/apps/builder/app/services/logout-router.server.ts@@ -0,0 +1,38 @@+import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";+import {+ router,+ procedure,+ createCallerFactory,+} from "@webstudio-is/trpc-interface/index.server";+import invariant from "tiny-invariant";++const dashboardProjectCaller = createCallerFactory(dashboardProjectRouter);++export const logoutRouter = router({+ /**+ * The builderUrl can be derived/constructed using the projectId.+ * Therefore, instead of returning builder app endpoints, we are using projectIds.+ */+ getLoggedInProjectIds: procedure.query(async ({ ctx }) => {+ const { isLoggedInToBuilder } = ctx.authorization;++ invariant(+ isLoggedInToBuilder !== undefined,+ "isLoggedInToBuilder is not defined, check the context"+ );++ const projectIds =+ await dashboardProjectCaller(ctx).findCurrentUserProjectIds();++ const loggedInIds = (+ await Promise.all(+ projectIds.map(async (projectId) => {+ const isLoggedIn = await isLoggedInToBuilder(projectId);+ return isLoggedIn ? projectId : undefined;+ })+ )+ ).filter((id) => id !== undefined);++ return loggedInIds;+ }),+});diff --git a/apps/builder/app/services/no-cross-origin-cookie.ts b/apps/builder/app/services/no-cross-origin-cookie.tsnew file mode 100644index 0000000000..36fa78c84d--- /dev/null+++ b/apps/builder/app/services/no-cross-origin-cookie.ts@@ -0,0 +1,59 @@+import { json } from "@remix-run/server-runtime";++/**+ * https://kevincox.ca/2024/08/24/cors/+ *+ * The function is specifically needed to handle “simple” CORS requests,+ * which are more prone to bypassing the stricter CORS preflight checks.+ * By clearing cookies from these cross-origin requests,+ * it reduces the risk of CSRF attacks and other vulnerabilities associated with simple CORS requests.+ *+ * Warning: There is no combination of Access-Control-Allow-* headers that you can set that solves simple requests,+ * they are made before any policy is checked. You need to handle them in another way.+ * Do not try to fix this by setting a CORS policy+ **/+export const preventCrossOriginCookie = (+ request: Request,+ throwError: boolean = true+) => {+ if (request.headers.get("sec-fetch-site") === "same-origin") {+ // Same origin, OK+ return;+ }++ if (+ request.headers.get("sec-fetch-mode") === "navigate" &&+ request.method === "GET"+ ) {+ // GET requests shouldn't mutate state so this is safe.+ return;+ }++ request.headers.delete("cookie");++ if (+ request.headers.has("Authorization") ||+ request.headers.has("x-auth-token")+ ) {+ // Do not throw an error if the request has an Authorization or x-auth-token header.+ // In that case, it is not a simple CORS request and will be prevented by a preflight check.+ return;+ }++ if (throwError) {+ console.error(`Cross-origin request to ${request.url} blocked`, [+ ...request.headers.entries(),+ ]);++ // allow service calls+ throw json(+ {+ message: `Cross-origin request to ${request.url}`,+ },+ {+ status: 403,+ statusText: "Forbidden",+ }+ );+ }+};diff --git a/apps/builder/app/services/session.server.ts b/apps/builder/app/services/session.server.tsindex a9ba821f3c..915a75d2b5 100644--- a/apps/builder/app/services/session.server.ts+++ b/apps/builder/app/services/session.server.ts@@ -1,15 +1,64 @@import { createCookieSessionStorage } from "@remix-run/node";import env from "~/env/env.server";+import { BloomFilter } from "./bloom-filter.server";+import { getSessionCookieNameVersion } from "./auth.server.utils";// export the whole sessionStorage objectexport const sessionStorage = createCookieSessionStorage({cookie: {+ // Using the __Host- prefix to prevent a malicious user from setting another person's session cookie+ // on all subdomains of apps.webstudio.is, e.g., setting Domain=.apps.webstudio.is.+ // For more information, see: https://developer.mozilla.org/en-US/docs/Web/Security/Practical_implementation_guides/Cookies#name+ name: `__Host-_session_${getSessionCookieNameVersion()}`,maxAge: 60 * 60 * 24 * 30,- name: "_session", // use any name you want here- sameSite: "lax", // this helps with CSRF- path: "/", // remember to add this so the cookie will work in all routes- httpOnly: true, // for security reasons, make this cookie http only- secrets: env.AUTH_SECRET ? [env.AUTH_SECRET] : undefined, // replace this with an actual secret- secure: env.SECURE_COOKIE,+ sameSite: "lax",+ path: "/",+ httpOnly: true,+ secrets: env.AUTH_SECRET ? [env.AUTH_SECRET] : undefined,+ secure: true,},});++// Bloom filter: probabilistic data structure to efficiently check if session IDs are logged in.+// Allowing tracking of user login status for specific projects+const bloomFilterKey = "login_session_bloom_filter";++export const readLoginSessionBloomFilter = async (request: Request) => {+ try {+ const session = await sessionStorage.getSession(+ request.headers.get("Cookie")+ );++ const bloomFilter = session.get(bloomFilterKey);++ if (typeof bloomFilter === "string") {+ return BloomFilter.deserialize(bloomFilter);+ }++ return new BloomFilter(50, 0.02);+ } catch (error) {+ console.error("Error reading bloom filter", error);+ return new BloomFilter(50, 0.02);+ }+};++export const writeLoginSessionBloomFilter = async (+ request: Request,+ response: Response,+ bloomFilter: BloomFilter+) => {+ const session = await sessionStorage.getSession(+ request.headers.get("Cookie")+ );++ session.set(bloomFilterKey, bloomFilter.serialize());++ const result = response.clone();++ result.headers.append(+ "Set-Cookie",+ await sessionStorage.commitSession(session)+ );++ return result;+};diff --git a/apps/builder/app/services/trcp-router.server.ts b/apps/builder/app/services/trcp-router.server.tsindex 1a9dcba255..1805d9370a 100644--- a/apps/builder/app/services/trcp-router.server.ts+++ b/apps/builder/app/services/trcp-router.server.ts@@ -4,6 +4,7 @@ import { domainRouter } from "@webstudio-is/domain/index.server";import { projectRouter } from "@webstudio-is/project/index.server";import { authorizationTokenRouter } from "@webstudio-is/authorization-token/index.server";import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";+import { logoutRouter } from "./logout-router.server";export const appRouter = router({marketplace: marketplaceRouter,@@ -11,6 +12,7 @@ export const appRouter = router({project: projectRouter,authorizationToken: authorizationTokenRouter,dashboardProject: dashboardProjectRouter,+ logout: logoutRouter,});export type AppRouter = typeof appRouter;diff --git a/apps/builder/app/shared/clone-project.tsx b/apps/builder/app/shared/clone-project.tsxindex b8ff25c3cf..848c16a989 100644--- a/apps/builder/app/shared/clone-project.tsx+++ b/apps/builder/app/shared/clone-project.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { useNavigate, useRevalidator } from "@remix-run/react";import {Box,Button,@@ -15,7 +14,7 @@ import {DialogActions,} from "@webstudio-is/design-system";import { Title, Project } from "@webstudio-is/project";-import { builderPath } from "~/shared/router-utils";+import { builderUrl } from "~/shared/router-utils";import { trpcClient } from "./trpc/trpc-client";const useCloneProject = ({@@ -25,8 +24,6 @@ const useCloneProject = ({projectId: Project["id"];onOpenChange: (isOpen: boolean) => void;}) => {- const revalidator = useRevalidator();- const navigate = useNavigate();const { send, state } = trpcClient.project.clone.useMutation();const [errors, setErrors] = useState<string>();@@ -41,9 +38,12 @@ const useCloneProject = ({if (parsed.success) {send({ projectId, title }, (data) => {- revalidator.revalidate();if (data?.id) {- navigate(builderPath({ projectId: data.id }));+ window.location.href = builderUrl({+ origin: window.origin,+ projectId: data.id,+ });+onOpenChange(false);}});diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex fc45f7bf3b..ad5499ba83 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -8,20 +8,27 @@ import { getUserPlanFeatures } from "./db/user-plan-features.server";import { staticEnv } from "~/env/env.static.server";import { createClient } from "@webstudio-is/postrest/index.server";import { prisma } from "@webstudio-is/prisma-client";-import { isBuilderUrl } from "./router-utils/origins";import { builderAuthenticator } from "~/services/builder-auth.server";+import { readLoginSessionBloomFilter } from "~/services/session.server";+import type { BloomFilter } from "~/services/bloom-filter.server";+import { isBuilder, isCanvas, isDashboard } from "./router-utils";+import { parseBuilderUrl } from "./router-utils/origins";const createAuthorizationContext = async (request: Request): Promise<AppContext["authorization"]> => {const url = new URL(request.url);+ if (isCanvas(request)) {+ throw new Error("Canvas requests can't have authorization context");+ }+const authToken =url.searchParams.get("authToken") ??request.headers.get("x-auth-token") ??undefined;- const user = isBuilderUrl(request.url)+ const sessionData = isBuilder(request)? await builderAuthenticator.isAuthenticated(request): await authenticator.isAuthenticated(request);@@ -29,7 +36,7 @@ const createAuthorizationContext = async (request.headers.has("Authorization") &&request.headers.get("Authorization") === env.TRPC_SERVER_API_TOKEN;- let ownerId = user?.id;+ let ownerId = sessionData?.userId;if (authToken != null) {const projectOwnerIdByToken = await prisma.authorizationToken.findUnique({@@ -59,11 +66,35 @@ const createAuthorizationContext = async (ownerId = projectOwnerId;}+ let loginBloomFilter: BloomFilter | undefined = undefined;+ let isLoggedInToBuilder:+ | AppContext["authorization"]["isLoggedInToBuilder"]+ | undefined = undefined;++ if (isDashboard(request) && sessionData?.userId !== undefined) {+ isLoggedInToBuilder = async (projectId: string) => {+ if (loginBloomFilter === undefined) {+ loginBloomFilter = await readLoginSessionBloomFilter(request);+ }++ return await loginBloomFilter.has(projectId);+ };+ }++ if (isBuilder(request) && sessionData?.userId !== undefined) {+ isLoggedInToBuilder = async (projectId: string) => {+ const parsedUrl = parseBuilderUrl(request.url);+ return parsedUrl.projectId === projectId;+ };+ }+const context: AppContext["authorization"] = {- userId: user?.id,+ userId: sessionData?.userId,+ sessionCreatedAt: sessionData?.createdAt,authToken,isServiceCall,ownerId,+ isLoggedInToBuilder,};return context;diff --git a/apps/builder/app/shared/logout.client.tsx b/apps/builder/app/shared/logout.client.tsxnew file mode 100644index 0000000000..e3475ce530--- /dev/null+++ b/apps/builder/app/shared/logout.client.tsx@@ -0,0 +1,74 @@+import { Text, Grid } from "@webstudio-is/design-system";+import { useEffect, useState } from "react";++export type LogoutPageProps = {+ logoutUrls: string[];+ onFinish: () => void;+};++export const LogoutPage = (props: LogoutPageProps) => {+ const [logoutState, setLogoutState] = useState({+ retries: 3,+ logoutUrls: props.logoutUrls,+ });++ useEffect(() => {+ Promise.allSettled(+ logoutState.logoutUrls.map(async (url) => {+ const response = await fetch(url, {+ method: "POST",+ credentials: "include",+ headers: { "content-type": "application/json" },+ });++ if (response.ok) {+ return response;+ }++ console.error(`Logout failed for URL: ${url}`, response);+ throw new Error(`Logout failed for URL: ${url}`);+ })+ ).then((results) => {+ const failedUrls: string[] = [];++ results.forEach((result, index) => {+ if (result.status === "rejected") {+ failedUrls.push(logoutState.logoutUrls[index]);+ }+ });++ if (failedUrls.length === 0) {+ props.onFinish();+ return;+ }++ if (logoutState.retries === 0) {+ console.error(+ "Logout failed for the following URLs:",+ failedUrls.join(", ")+ );+ props.onFinish();+ return;+ }++ setLogoutState({+ retries: logoutState.retries - 1,+ logoutUrls: failedUrls,+ });+ });+ }, [logoutState, props]);++ return (+ <Grid+ gap={2}+ css={{+ position: "fixed",+ inset: 0,+ alignContent: "center",+ justifyItems: "center",+ }}+ >+ <Text variant={"bigTitle"}>Logging out ...</Text>+ </Grid>+ );+};diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.tsindex b65bff4d95..f38cce4509 100644--- a/apps/builder/app/shared/pages/use-switch-page.ts+++ b/apps/builder/app/shared/pages/use-switch-page.ts@@ -105,7 +105,6 @@ export const useSyncPageUrl = () => {navigate(builderPath({- projectId: project.id,pageId: page.id === pages.homePage.id ? undefined : page.id,authToken: $authToken.get(),pageHash: pageHash === "" ? undefined : pageHash,diff --git a/apps/builder/app/shared/router-utils/is-canvas.ts b/apps/builder/app/shared/router-utils/is-canvas.tsindex 245f1f1227..42177b848a 100644--- a/apps/builder/app/shared/router-utils/is-canvas.ts+++ b/apps/builder/app/shared/router-utils/is-canvas.ts@@ -1,18 +1,36 @@-// These are the utils for manipulating "build" params.-// "Build" means user generated content — what user builds.+import { isBuilderUrl } from "./origins";-export type BuildParams = ({ pagePath: string } | { pageId: string }) &- ({ projectId: string } | { projectDomain: string });--// A subtype of Request. To make testing easier.-type MinimalRequest = {- url: string;- headers: { get: (name: string) => string | null };+export const isBuilder = (request: Request): boolean => {+ return isBuilderUrl(request.url) && false === isCanvas(request);};-export const isCanvas = (request: MinimalRequest): boolean => {+export const isCanvas = (request: Request): boolean => {const url = new URL(request.url);- const projectId = url.searchParams.get("projectId");+ if (isBuilderUrl(url.origin) && url.pathname === "/canvas") {+ return true;+ }++ return false;+};++export const isDashboard = (request: Request): boolean => {+ if (isBuilder(request) || isCanvas(request)) {+ return false;+ }+ return true;+};++export const comparePathnames = (+ pathnameOrUrlA: string,+ pathnameOrUrlB: string+) => {+ const aPathname = new URL(pathnameOrUrlA, "http://localhost").pathname;+ const bPathname = new URL(pathnameOrUrlB, "http://localhost").pathname;+ return aPathname === bPathname;+};- return projectId !== null;+export const compareUrls = (urlA: string, urlB: string) => {+ const aPathname = new URL(urlA, "http://localhost").href;+ const bPathname = new URL(urlB, "http://localhost").href;+ return aPathname === bPathname;};diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 2e5dff9839..1b072c375f 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -1,5 +1,4 @@import type { AUTH_PROVIDERS } from "~/shared/session";-import type { Project } from "@webstudio-is/project";import { $authToken } from "../nano-states";import { publicStaticEnv } from "~/env/env.static";import { getAuthorizationServerOrigin } from "./origins";@@ -16,19 +15,17 @@ const searchParams = (params: Record<string, string | undefined | null>) => {};export const builderPath = ({- projectId,pageId,authToken,pageHash,mode,}: {- projectId: string;pageId?: string;authToken?: string;pageHash?: string;mode?: "preview";}) => {- return `/builder/${projectId}${searchParams({+ return `/${searchParams({pageId,authToken,pageHash,@@ -42,32 +39,11 @@ export const builderUrl = (props: {origin: string;authToken?: string;mode?: "edit" | "preview";-}) => {- const { projectId, pageId, authToken } = props;- const url = new URL(- builderPath({ projectId, pageId, authToken }),- props.origin- );-- if (props.mode !== undefined) {- url.searchParams.set("mode", props.mode);- }-- return url.href;-};--export const builderUrlNew = (props: {- projectId: string;- pageId?: string;- origin: string;- authToken?: string;- mode?: "edit" | "preview";}) => {const authServerOrigin = getAuthorizationServerOrigin(props.origin);- // const { projectId, pageId, authToken } = props;const url = new URL(- "/", // builderPath({ projectId, pageId, authToken }),+ builderPath({ pageId: props.pageId, authToken: props.authToken }),authServerOrigin);@@ -92,6 +68,12 @@ export const dashboardPath = () => {return "/dashboard";};+export const dashboardUrl = (props: { origin: string }) => {+ const authServerOrigin = getAuthorizationServerOrigin(props.origin);++ return `${authServerOrigin}/dashboard`;+};+export const builderDomainsPath = (method: string) => {const authToken = $authToken.get();const urlSearchParams = new URLSearchParams();@@ -118,12 +100,6 @@ export const projectsPath = (return path + `?${urlSearchParams.toString()}`;};-export const dashboardProjectsPath = (method: string) =>- `${dashboardPath()}/projects/${method}`;--export const authorizationTokenPath = (method: string) =>- `/rest/authorization-token/${method}`;-export const loginPath = (params: {error?: (typeof AUTH_PROVIDERS)[keyof typeof AUTH_PROVIDERS];message?: string;@@ -182,12 +158,8 @@ export const restPatchPath = (props: { authToken?: string }) => {}`;};-export const getCanvasUrl = ({ project }: { project: Project }) => {- // const url = new URL(buildOrigin);- const searchParams = new URLSearchParams();- searchParams.set("projectId", project.id);-- return `/canvas?${searchParams.toString()}`;+export const getCanvasUrl = () => {+ return `/canvas`;};export const restAi = (subEndpoint?: "detect" | "audio/transcriptions") =>diff --git a/apps/builder/vite.config.ts b/apps/builder/vite.config.tsindex 6631a34afc..c0d47edc8d 100644--- a/apps/builder/vite.config.ts+++ b/apps/builder/vite.config.ts@@ -58,12 +58,12 @@ export default defineConfig(({ mode }) => {callback: (error: Error | null, options: CorsOptions | null) => void) => {// Handle CORS preflight requests in development to mimic Remix production behavior- if (req.method === "OPTIONS" || req.method === "GET") {+ if (req.method === "OPTIONS" || req.method === "POST") {if (req.headers.origin != null && req.url != null) {const url = new URL(req.url, `https://${req.headers.host}`);- // Allow CORS for /logout path when requested from the authorization server- if (url.pathname === "/logout" && isBuilderUrl(url.href)) {+ // Allow CORS for /builder-logout path when requested from the authorization server+ if (url.pathname === "/builder-logout" && isBuilderUrl(url.href)) {return callback(null, {origin: getAuthorizationServerOrigin(url.href),preflightContinue: false,diff --git a/packages/dashboard/src/db/projects.ts b/packages/dashboard/src/db/projects.tsindex bc6b0a39b3..a3a24be6c2 100644--- a/packages/dashboard/src/db/projects.ts+++ b/packages/dashboard/src/db/projects.ts@@ -1,8 +1,17 @@import type { SetNonNullable } from "type-fest";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import {+ AuthorizationError,+ type AppContext,+} from "@webstudio-is/trpc-interface/index.server";import type { DashboardProjects } from "./schema";export const findMany = async (userId: string, context: AppContext) => {+ if (userId !== context.authorization.userId) {+ throw new AuthorizationError(+ "Only the project owner can view the project list"+ );+ }+const data = await context.postgrest.client.from("DashboardProject").select("*, previewImageAsset:Asset (*)")diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex ce30111cdd..5fe67d2b5b 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -9,6 +9,30 @@ import { MarketplaceApprovalStatus, Project, Title } from "../shared/schema";import { generateDomain, validateProjectDomain } from "./project-domain";import type { SetNonNullable } from "type-fest";+export const findProjectIdsByUserId = async (+ userId: string,+ context: AppContext+) => {+ if (userId !== context.authorization.userId) {+ throw new AuthorizationError(+ "Only the project owner can view the project list"+ );+ }++ const result = await context.postgrest.client+ .from("Project")+ .select("id")+ .eq("userId", userId)+ .eq("isDeleted", false)+ .order("id");++ if (result.error) {+ throw result.error;+ }++ return result.data;+};+export const loadById = async (projectId: Project["id"],context: AppContextdiff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.tsindex c5f11773f6..6cdfdf7a5d 100644--- a/packages/project/src/trpc/project-router.ts+++ b/packages/project/src/trpc/project-router.ts@@ -41,6 +41,18 @@ export const projectRouter = router({.mutation(async ({ input, ctx }) => {return await db.project.setMarketplaceApprovalStatus(input, ctx);}),+ findCurrentUserProjectIds: procedure.query(async ({ ctx }) => {+ if (ctx.authorization.userId === undefined) {+ return [];+ }++ const projectIds = await db.project.findProjectIdsByUserId(+ ctx.authorization.userId,+ ctx+ );++ return projectIds.map((project) => project.id);+ }),});export type ProjectRouter = typeof projectRouter;diff --git a/packages/trpc-interface/src/authorize/project.server.ts b/packages/trpc-interface/src/authorize/project.server.tsindex 93ea7ce79f..fcf9eedea0 100644--- a/packages/trpc-interface/src/authorize/project.server.ts+++ b/packages/trpc-interface/src/authorize/project.server.ts@@ -101,8 +101,8 @@ export const checkProjectPermit = async ("05954204-fcee-407e-b47f-77a38de74431","afc162c2-6396-41b7-a855-8fc04604a7b1",// Staging IDs- "e3dd56f9-ffd9-4692-8a61-e835de822e21",- "90b41d4e-f5e9-48d6-a954-6249b146852a",+ "c236999d-be6b-43fb-9edc-78a2ba59e56d",+ "a1371dce-752c-4ccf-8ea4-88bab577fe50",];// @todo Delete and use tokensdiff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex e42c5b6266..3125f9ae08 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -9,6 +9,7 @@ type AuthorizationContext = {* userId of the current authenticated user*/userId: string | undefined;+ sessionCreatedAt: number | undefined;/*** token URLSearchParams or hostname@@ -24,6 +25,11 @@ type AuthorizationContext = {* Allow service 2 service communications to skip authorization for view calls*/isServiceCall: boolean;++ /**+ * Has projectId in the tracked sessions+ */+ isLoggedInToBuilder: undefined | ((projectId: string) => Promise<boolean>);};type DomainContext = {diff --git a/packages/trpc-interface/src/context/router.server.ts b/packages/trpc-interface/src/context/router.server.tsindex 4974982e1a..670d2ae6d6 100644--- a/packages/trpc-interface/src/context/router.server.ts+++ b/packages/trpc-interface/src/context/router.server.ts@@ -1,9 +1,13 @@import { initTRPC } from "@trpc/server";import type { AppContext } from "./context.server";-export const { router, procedure, middleware, mergeRouters } = initTRPC- .context<AppContext>()- .create();+export const {+ router,+ procedure,+ middleware,+ mergeRouters,+ createCallerFactory,+} = initTRPC.context<AppContext>().create();export const createCacheMiddleware = (seconds: number) =>middleware(async ({ path, ctx, next }) => {diff --git a/packages/trpc-interface/src/index.server.ts b/packages/trpc-interface/src/index.server.tsindex 93dcdff447..2661ce71d5 100644--- a/packages/trpc-interface/src/index.server.ts+++ b/packages/trpc-interface/src/index.server.ts@@ -13,4 +13,5 @@ export {middleware,mergeRouters,createCacheMiddleware,+ createCallerFactory,} from "./context/router.server";