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
Add assets permissions checks (#948)
Ivan Starkovc0c58e23cb66
diff --git a/apps/designer/app/designer/designer.tsx b/apps/designer/app/designer/designer.tsxindex a6f5255592..d0f09154bf 100644--- a/apps/designer/app/designer/designer.tsx+++ b/apps/designer/app/designer/designer.tsx@@ -306,7 +306,7 @@ export const Designer = ({});return (- <AssetsProvider>+ <AssetsProvider authToken={authToken}><ChromeWrapper isPreviewMode={isPreviewMode}><TopbargridArea="header"diff --git a/apps/designer/app/designer/shared/assets/use-assets.tsx b/apps/designer/app/designer/shared/assets/use-assets.tsxindex 9bf40095a2..547c2448d6 100644--- a/apps/designer/app/designer/shared/assets/use-assets.tsx+++ b/apps/designer/app/designer/shared/assets/use-assets.tsx@@ -29,14 +29,10 @@ import type {} from "./types";import { usePersistentFetcher } from "~/shared/fetcher";import type { ActionData } from "~/designer/shared/assets";-import {- FetcherData,- normalizeErrors,- toastUnknownFieldErrors,-} from "~/shared/form-utils";+import { normalizeErrors, toastUnknownFieldErrors } from "~/shared/form-utils";import { updateStateAssets } from "./update-asset-containers";-export type UploadData = FetcherData<ActionData>;+export type UploadData = ActionData;const toUploadingAssetsAndFormData = (type: AssetType,@@ -112,14 +108,21 @@ type AssetsContext = {const Context = createContext<AssetsContext | undefined>(undefined);-export const AssetsProvider = ({ children }: { children: ReactNode }) => {+export const AssetsProvider = ({+ children,+ authToken,+}: {+ children: ReactNode;+ authToken: string | undefined;+}) => {const [project] = useProject();const assetContainers = useStore(assetContainersStore);const { submit: load, data: serverAssets } = useFetcher<Asset[]>();const submit = usePersistentFetcher();const assetContainersRef = useRef(assetContainers);- const action = project && restAssetsPath({ projectId: project.id });+ const action =+ project && restAssetsPath({ projectId: project.id, authToken });assetContainersRef.current = assetContainers;useEffect(() => {@@ -153,7 +156,8 @@ export const AssetsProvider = ({ children }: { children: ReactNode }) => {load({}, { action, method: "put" });}- if (data.status === "error") {+ const { errors } = data;+ if (errors !== undefined) {// We don't know what's wrong, remove the "deleting" status from assets and wait for the load to fix itconst assetContainers = assetContainersRef.current;const nextAssetContainers = assetContainers.map((assetContainer) => {@@ -170,7 +174,7 @@ export const AssetsProvider = ({ children }: { children: ReactNode }) => {assetContainersStore.set(nextAssetContainers);- return toastUnknownFieldErrors(normalizeErrors(data.errors), []);+ return toastUnknownFieldErrors(normalizeErrors(errors), []);}};@@ -181,7 +185,7 @@ export const AssetsProvider = ({ children }: { children: ReactNode }) => {load({}, { action, method: "put" });}- if (data.status === "error" || data.errors !== undefined) {+ if (data.errors !== undefined) {// We don't know what's wrong, remove uploading asset and wait for the load to fix itassetContainersStore.set(assetContainers.filter(diff --git a/apps/designer/app/routes/$.tsx b/apps/designer/app/routes/$.tsxindex c577cd5593..333df2a05a 100644--- a/apps/designer/app/routes/$.tsx+++ b/apps/designer/app/routes/$.tsx@@ -67,9 +67,13 @@ export const loader = async ({ request }: LoaderArgs): Promise<Data> => {}const canvasData = await loadCanvasData(- project,- buildEnv,- "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath+ {+ project,+ env: buildEnv,+ pageIdOrPath:+ "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath,+ },+ context);if (canvasData === undefined) {diff --git a/apps/designer/app/routes/rest/assets.$projectId.tsx b/apps/designer/app/routes/rest/assets.$projectId.tsxindex 0621973a69..42a9638cbb 100644--- a/apps/designer/app/routes/rest/assets.$projectId.tsx+++ b/apps/designer/app/routes/rest/assets.$projectId.tsx@@ -11,16 +11,21 @@ import { useEffect } from "react";import { zfd } from "zod-form-data";import type { ActionData } from "~/designer/shared/assets";import { sentryException } from "~/shared/sentry";+import { createContext } from "~/shared/context.server";const DeleteAssets = zfd.formData({assetId: zfd.repeatableOfType(zfd.text()),});-export const loader = async ({ params }: LoaderArgs): Promise<Array<Asset>> => {+export const loader = async ({+ params,+ request,+}: LoaderArgs): Promise<Array<Asset>> => {if (params.projectId === undefined) {throw new Error("Project id undefined");}- return await loadByProject(params.projectId);+ const context = await createContext(request);+ return await loadByProject(params.projectId, context);};export const action = async (@@ -31,6 +36,9 @@ export const action = async (if (params.projectId === undefined) {throw new Error("Project id undefined");}++ const context = await createContext(request);+try {/*** To prevent the AssetsProvider from being redrawn every time an action is requested, we use PUT instead of GET@@ -42,15 +50,21 @@ export const action = async (if (request.method === "DELETE") {const { assetId: ids } = DeleteAssets.parse(await request.formData());- const deletedAssets = await deleteAssets(ids);+ const deletedAssets = await deleteAssets(+ { ids, projectId: params.projectId },+ context+ );return { deletedAssets };}if (request.method === "POST") {- const assets = await uploadAssets({- request,- projectId: params.projectId,- });+ const assets = await uploadAssets(+ {+ request,+ projectId: params.projectId,+ },+ context+ );return {uploadedAssets: assets.map((asset) => ({...asset,diff --git a/apps/designer/app/routes/rest/project.$projectId.tsx b/apps/designer/app/routes/rest/project.$projectId.tsxindex 96a7795281..109f423d0f 100644--- a/apps/designer/app/routes/rest/project.$projectId.tsx+++ b/apps/designer/app/routes/rest/project.$projectId.tsx@@ -35,13 +35,23 @@ export const loader = async ({if (project === null) {throw json("Project not found", { status: 404 });}- const canvasData = await loadCanvasData(project, "prod", homePage.path);+ const canvasData = await loadCanvasData(+ {+ project,+ env: "prod",+ pageIdOrPath: homePage.path,+ },+ context+ );pages.push(canvasData);if (otherPages.length > 0) {for (const page of otherPages) {- const canvasData = await loadCanvasData(project, "prod", page.path);+ const canvasData = await loadCanvasData(+ { project, env: "prod", pageIdOrPath: page.path },+ context+ );pages.push(canvasData);}}diff --git a/apps/designer/app/shared/css-utils/generate-css-text.ts b/apps/designer/app/shared/css-utils/generate-css-text.tsindex fcc66b8a3b..4665bc993a 100644--- a/apps/designer/app/shared/css-utils/generate-css-text.ts+++ b/apps/designer/app/shared/css-utils/generate-css-text.ts@@ -22,9 +22,13 @@ export const generateCssText = async (}const canvasData = await loadCanvasData(- project,- buildParams.mode === "published" ? "prod" : "dev",- "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath+ {+ project,+ env: buildParams.mode === "published" ? "prod" : "dev",+ pageIdOrPath:+ "pageId" in buildParams ? buildParams.pageId : buildParams.pagePath,+ },+ context);if (canvasData === undefined) {diff --git a/apps/designer/app/shared/db/canvas.server.ts b/apps/designer/app/shared/db/canvas.server.tsindex 1e308794ec..ae432d1e5b 100644--- a/apps/designer/app/shared/db/canvas.server.ts+++ b/apps/designer/app/shared/db/canvas.server.ts@@ -2,34 +2,45 @@ import type { CanvasData, Project } from "@webstudio-is/project";import { db as projectDb } from "@webstudio-is/project/server";import { utils } from "@webstudio-is/project";import { loadByProject } from "@webstudio-is/asset-uploader/server";+import type { AppContext } from "@webstudio-is/trpc-interface/server";export const loadCanvasData = async (- project: Project,- env: "dev" | "prod",- pageIdOrPath = ""+ props: {+ project: Project;+ env: "dev" | "prod";+ pageIdOrPath: string;+ },+ context: AppContext): Promise<CanvasData> => {const build =- env === "dev"- ? await projectDb.build.loadByProjectId(project.id, "dev")- : await projectDb.build.loadByProjectId(project.id, "prod");+ props.env === "dev"+ ? await projectDb.build.loadByProjectId(props.project.id, "dev")+ : await projectDb.build.loadByProjectId(props.project.id, "prod");if (build === undefined) {throw new Error("The project is not published");}- const page = utils.pages.findByIdOrPath(build.pages, pageIdOrPath);+ const page = utils.pages.findByIdOrPath(build.pages, props.pageIdOrPath);if (page === undefined) {- throw new Error(`Page ${pageIdOrPath} not found`);+ throw new Error(`Page ${props.pageIdOrPath} not found`);}const [tree, assets] = await Promise.all([- projectDb.tree.loadById({ projectId: project.id, treeId: page.treeId }),- loadByProject(project.id),+ projectDb.tree.loadById(+ {+ projectId: props.project.id,+ treeId: page.treeId,+ },+ context+ ),++ loadByProject(props.project.id, context),]);if (tree === null) {- throw new Error(`Tree not found for project ${project.id}`);+ throw new Error(`Tree not found for project ${props.project.id}`);}return {diff --git a/apps/designer/app/shared/db/misc.server.ts b/apps/designer/app/shared/db/misc.server.tsindex 6973ccd423..414ca55c5a 100644--- a/apps/designer/app/shared/db/misc.server.ts+++ b/apps/designer/app/shared/db/misc.server.ts@@ -31,7 +31,11 @@ export const publish = async (const devBuild = await db.build.loadByProjectId(projectId, "dev");await prisma.$transaction(async (client) => {- await db.build.create(project.id, "prod", devBuild, client);+ await db.build.create(+ { projectId: project.id, env: "prod", sourceBuild: devBuild },+ context,+ client+ );});const updatedProject = await db.project.updateDomain(diff --git a/apps/designer/app/shared/router-utils/path-utils.ts b/apps/designer/app/shared/router-utils/path-utils.tsindex 56ab4288d6..568d4ac66b 100644--- a/apps/designer/app/shared/router-utils/path-utils.ts+++ b/apps/designer/app/shared/router-utils/path-utils.ts@@ -77,8 +77,23 @@ export const authPath = ({export const restPagesPath = ({ projectId }: { projectId: string }) =>`/rest/pages/${projectId}`;-export const restAssetsPath = ({ projectId }: { projectId: string }) =>- `/rest/assets/${projectId}`;+export const restAssetsPath = ({+ projectId,+ authToken,+}: {+ projectId: string;+ authToken?: string;+}) => {+ const urlSearchParams = new URLSearchParams();+ if (authToken !== undefined) {+ urlSearchParams.set("authToken", authToken);+ }+ const urlSearchParamsString = urlSearchParams.toString();++ return `/rest/assets/${projectId}${+ urlSearchParamsString ? `?${urlSearchParamsString}` : ""+ }`;+};export const restThemePath = ({ setting }: { setting: ThemeSetting }) =>`/rest/theme/${setting}`;diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.jsonindex d9407a52b0..755ea8a1ec 100644--- a/packages/asset-uploader/package.json+++ b/packages/asset-uploader/package.json@@ -19,6 +19,7 @@"@remix-run/node": "1.12.0","@webstudio-is/fonts": "workspace:^","@webstudio-is/prisma-client": "workspace:^",+ "@webstudio-is/trpc-interface": "workspace:^0.24.0","app-root-path": "^3.0.0","nanoid": "^3.2.0","sharp": "^0.30.7"diff --git a/packages/asset-uploader/src/db/create.ts b/packages/asset-uploader/src/db/create.tsindex f72f4e383f..330afc36bc 100644--- a/packages/asset-uploader/src/db/create.ts+++ b/packages/asset-uploader/src/db/create.ts@@ -7,6 +7,10 @@ import {} from "@webstudio-is/prisma-client";import { Env, type ImageMeta } from "../schema";import { formatAsset } from "../utils/format-asset";+import {+ authorizeProject,+ type AppContext,+} from "@webstudio-is/trpc-interface/server";const env = Env.parse(process.env);@@ -28,10 +32,20 @@ type Options =export const createAssetWithLimit = async (projectId: Project["id"],- uploadAsset: () => Promise<Options>+ uploadAsset: () => Promise<Options>,+ context: AppContext) => {let updated: { id: string } | undefined;+ const canEdit = await authorizeProject.hasProjectPermit(+ { projectId, permit: "edit" },+ context+ );++ if (canEdit === false) {+ throw new Error("You don't have access to create this project assets");+ }+try {/*** sometimes for example on request timeout we don't know what happened to the "UPLOADING" asset,diff --git a/packages/asset-uploader/src/db/delete.ts b/packages/asset-uploader/src/db/delete.tsindex b3172cd450..245037c164 100644--- a/packages/asset-uploader/src/db/delete.ts+++ b/packages/asset-uploader/src/db/delete.ts@@ -1,12 +1,31 @@-import { prisma } from "@webstudio-is/prisma-client";+import { prisma, type Project } from "@webstudio-is/prisma-client";import { Asset } from "../schema";+import {+ authorizeProject,+ type AppContext,+} from "@webstudio-is/trpc-interface/server";-export const deleteFromDb = async (ids: Array<Asset["id"]>) => {- if (ids.length === 0) {+export const deleteFromDb = async (+ props: {+ ids: Array<Asset["id"]>;+ projectId: Project["id"];+ },+ context: AppContext+) => {+ if (props.ids.length === 0) {throw new Error("Asset IDs required");}+ const canDelete = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "edit" },+ context+ );++ if (canDelete === false) {+ throw new Error("You don't have access to create this project assets");+ }+return await prisma.asset.deleteMany({- where: { id: { in: ids } },+ where: { id: { in: props.ids }, projectId: props.projectId },});};diff --git a/packages/asset-uploader/src/db/load.ts b/packages/asset-uploader/src/db/load.tsindex 3643b3add5..5f6e8932d3 100644--- a/packages/asset-uploader/src/db/load.ts+++ b/packages/asset-uploader/src/db/load.ts@@ -1,12 +1,22 @@import { prisma, Project } from "@webstudio-is/prisma-client";import { Asset } from "../schema";import { formatAsset } from "../utils/format-asset";+import {+ authorizeProject,+ type AppContext,+} from "@webstudio-is/trpc-interface/server";export const loadByProject = async (- projectId?: Project["id"]+ projectId: Project["id"],+ context: AppContext): Promise<Asset[]> => {- if (typeof projectId !== "string") {- throw new Error("Project ID required");+ const canRead = await authorizeProject.hasProjectPermit(+ { projectId, permit: "view" },+ context+ );++ if (canRead === false) {+ throw new Error("You don't have access to this project assets");}const assets = await prisma.asset.findMany({@@ -18,3 +28,29 @@ export const loadByProject = async (return assets.map(formatAsset);};++export const loadByIds = async (+ props: {+ ids: Array<Asset["id"]>;+ projectId: Project["id"];+ },+ context: AppContext+): Promise<Asset[]> => {+ const canRead = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "view" },+ context+ );++ if (canRead === false) {+ throw new Error("You don't have access to this project assets");+ }++ const assets = await prisma.asset.findMany({+ where: { projectId: props.projectId, status: "UPLOADED" },+ orderBy: {+ createdAt: "desc",+ },+ });++ return assets.map(formatAsset);+};diff --git a/packages/asset-uploader/src/delete.ts b/packages/asset-uploader/src/delete.tsindex 170cda8ce2..830c7d92a1 100644--- a/packages/asset-uploader/src/delete.ts+++ b/packages/asset-uploader/src/delete.ts@@ -1,4 +1,8 @@-import { prisma } from "@webstudio-is/prisma-client";+import { prisma, type Project } from "@webstudio-is/prisma-client";+import {+ authorizeProject,+ type AppContext,+} from "@webstudio-is/trpc-interface/server";import { deleteFromDb } from "./db";import { Asset } from "./schema";import { deleteFromFs } from "./targets/fs/delete";@@ -6,16 +10,30 @@ import { deleteFromS3 } from "./targets/s3/delete";import { formatAsset } from "./utils/format-asset";export const deleteAssets = async (- ids: Array<string>+ props: {+ ids: Array<Asset["id"]>;+ projectId: Project["id"];+ },+ context: AppContext): Promise<Array<Asset>> => {+ const canDelete = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "edit" },+ context+ );++ if (canDelete === false) {+ throw new Error("You don't have access to delete this project assets");+ }+const assets = await prisma.asset.findMany({- where: { id: { in: ids } },+ where: { id: { in: props.ids }, projectId: props.projectId },});+if (assets.length === 0) {throw new Error("Assets not found");}- await deleteFromDb(ids);+ await deleteFromDb(props, context);for (const asset of assets) {if (asset.location === "REMOTE") {diff --git a/packages/asset-uploader/src/targets/fs/upload.ts b/packages/asset-uploader/src/targets/fs/upload.tsindex 04b409be3d..dc9a0c80f4 100644--- a/packages/asset-uploader/src/targets/fs/upload.ts+++ b/packages/asset-uploader/src/targets/fs/upload.ts@@ -13,6 +13,7 @@ import { Asset, idsFormDataFieldName } from "../../schema";import { getUniqueFilename } from "../../utils/get-unique-filename";import { sanitizeS3Key } from "../../utils/sanitize-s3-key";import { uuidHandler } from "../../utils/uuid-handler";+import type { AppContext } from "@webstudio-is/trpc-interface/server";const AssetsFromFs = z.array(z.instanceof(NodeOnDiskFile));const Ids = z.array(z.string().uuid());@@ -22,50 +23,57 @@ const Ids = z.array(z.string().uuid());*/const MAX_FILES_PER_REQUEST = 1;-export const uploadToFs = async ({- request,- projectId,- maxSize,-}: {- request: Request;- projectId: string;- maxSize: number;-}): Promise<Array<Asset>> => {- const asset = await createAssetWithLimit(projectId, async () => {- const uploadHandler = await unstableCreateFileUploadHandler({- maxPartSize: maxSize,- directory: FILE_DIRECTORY,- file: ({ filename }) => getUniqueFilename(sanitizeS3Key(filename)),- });+export const uploadToFs = async (+ {+ request,+ projectId,+ maxSize,+ }: {+ request: Request;+ projectId: string;+ maxSize: number;+ },+ context: AppContext+): Promise<Array<Asset>> => {+ const asset = await createAssetWithLimit(+ projectId,+ async () => {+ const uploadHandler = await unstableCreateFileUploadHandler({+ maxPartSize: maxSize,+ directory: FILE_DIRECTORY,+ file: ({ filename }) => getUniqueFilename(sanitizeS3Key(filename)),+ });- const formData = await unstableParseMultipartFormData(- request,- unstableComposeUploadHandlers(uploadHandler, uuidHandler)- );+ const formData = await unstableParseMultipartFormData(+ request,+ unstableComposeUploadHandlers(uploadHandler, uuidHandler)+ );- const formDataImages = AssetsFromFs.parse(formData.getAll("image"));- const formDataFonts = AssetsFromFs.parse(formData.getAll("font"));- const formDataAll = [...formDataImages, ...formDataFonts].slice(- 0,- MAX_FILES_PER_REQUEST- );- const ids = Ids.parse(formData.getAll(idsFormDataFieldName));+ const formDataImages = AssetsFromFs.parse(formData.getAll("image"));+ const formDataFonts = AssetsFromFs.parse(formData.getAll("font"));+ const formDataAll = [...formDataImages, ...formDataFonts].slice(+ 0,+ MAX_FILES_PER_REQUEST+ );+ const ids = Ids.parse(formData.getAll(idsFormDataFieldName));- const assets = formDataAll.map(async (asset, index) =>- getAssetData({- id: ids[index],- type: formDataFonts.includes(asset) ? "font" : "image",- name: asset.name,- size: asset.size,- data: new Uint8Array(await asset.arrayBuffer()),- location: Location.FS,- })- );+ const assets = formDataAll.map(async (asset, index) =>+ getAssetData({+ id: ids[index],+ type: formDataFonts.includes(asset) ? "font" : "image",+ name: asset.name,+ size: asset.size,+ data: new Uint8Array(await asset.arrayBuffer()),+ location: Location.FS,+ })+ );- const assetsData = await Promise.all(assets);+ const assetsData = await Promise.all(assets);- return assetsData[0];- });+ return assetsData[0];+ },+ context+ );return [asset];};diff --git a/packages/asset-uploader/src/targets/s3/upload.ts b/packages/asset-uploader/src/targets/s3/upload.tsindex 1b7ba0ae8f..8243531d27 100644--- a/packages/asset-uploader/src/targets/s3/upload.ts+++ b/packages/asset-uploader/src/targets/s3/upload.ts@@ -17,6 +17,7 @@ import { getUniqueFilename } from "../../utils/get-unique-filename";import { getS3Client } from "./client";import { sanitizeS3Key } from "../../utils/sanitize-s3-key";import { uuidHandler } from "../../utils/uuid-handler";+import type { AppContext } from "@webstudio-is/trpc-interface/server";const AssetsUploadedSuccess = z.object({Location: z.string(),@@ -29,42 +30,49 @@ const Ids = z.array(z.string().uuid());*/const MAX_FILES_PER_REQUEST = 1;-export const uploadToS3 = async ({- request,- projectId,- maxSize,-}: {- request: Request;- projectId: string;- maxSize: number;-}): Promise<Array<Asset>> => {- const asset = await createAssetWithLimit(projectId, async () => {- const uploadHandler = createUploadHandler(MAX_FILES_PER_REQUEST);-- const formData = await unstableCreateFileUploadHandler(- request,- unstableComposeUploadHandlers(- (file: UploadHandlerPart) =>- uploadHandler({- file,- maxSize,- }),- uuidHandler- )- );-- const imagesFormData = formData.getAll("image") as Array<string>;- const fontsFormData = formData.getAll("font") as Array<string>;- const ids = Ids.parse(formData.getAll(idsFormDataFieldName));-- const assetsData = [...imagesFormData, ...fontsFormData]- .slice(0, MAX_FILES_PER_REQUEST)- .map((dataString, index) => {- return AssetData.parse({ ...JSON.parse(dataString), id: ids[index] });- });-- return assetsData[0];- });+export const uploadToS3 = async (+ {+ request,+ projectId,+ maxSize,+ }: {+ request: Request;+ projectId: string;+ maxSize: number;+ },+ context: AppContext+): Promise<Array<Asset>> => {+ const asset = await createAssetWithLimit(+ projectId,+ async () => {+ const uploadHandler = createUploadHandler(MAX_FILES_PER_REQUEST);++ const formData = await unstableCreateFileUploadHandler(+ request,+ unstableComposeUploadHandlers(+ (file: UploadHandlerPart) =>+ uploadHandler({+ file,+ maxSize,+ }),+ uuidHandler+ )+ );++ const imagesFormData = formData.getAll("image") as Array<string>;+ const fontsFormData = formData.getAll("font") as Array<string>;+ const ids = Ids.parse(formData.getAll(idsFormDataFieldName));++ const assetsData = [...imagesFormData, ...fontsFormData]+ .slice(0, MAX_FILES_PER_REQUEST)+ .map((dataString, index) => {+ return AssetData.parse({ ...JSON.parse(dataString), id: ids[index] });+ });++ return assetsData[0];+ },+ context+ );return [asset];};diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.tsindex d7721c0132..e2963e191b 100644--- a/packages/asset-uploader/src/upload.ts+++ b/packages/asset-uploader/src/upload.ts@@ -1,27 +1,37 @@import { S3Env, FsEnv } from "./schema";import { uploadToFs } from "./targets/fs/upload";import { uploadToS3 } from "./targets/s3/upload";+import type { AppContext } from "@webstudio-is/trpc-interface/server";const isS3Upload = S3Env.safeParse(process.env).success;const fsEnv = FsEnv.parse(process.env);-export const uploadAssets = async ({- request,- projectId,-}: {- request: Request;- projectId: string;-}) => {+export const uploadAssets = async (+ {+ request,+ projectId,+ }: {+ request: Request;+ projectId: string;+ },+ context: AppContext+) => {if (isS3Upload) {- return await uploadToS3({+ return await uploadToS3(+ {+ request,+ projectId,+ maxSize: fsEnv.MAX_UPLOAD_SIZE,+ },+ context+ );+ }+ return await uploadToFs(+ {request,projectId,maxSize: fsEnv.MAX_UPLOAD_SIZE,- });- }- return await uploadToFs({- request,- projectId,- maxSize: fsEnv.MAX_UPLOAD_SIZE,- });+ },+ context+ );};diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.tsindex 3ec9654178..af952925fc 100644--- a/packages/project/src/db/build.ts+++ b/packages/project/src/db/build.ts@@ -11,6 +11,7 @@ import * as db from ".";import { Build, Page, Pages } from "../shared/schema";import * as pagesUtils from "../shared/pages";import { parseStyles, serializeStyles } from "./styles";+import type { AppContext } from "@webstudio-is/trpc-interface";export const parseBuild = async (build: DbBuild): Promise<Build> => {const pages = Pages.parse(JSON.parse(build.pages));@@ -200,6 +201,7 @@ export const deletePage = async ({const createPages = async ({ projectId, buildId }: { projectId: Project["id"]; buildId: Build["id"] },+ context: AppContext,client: Prisma.TransactionClient = prisma) => {const tree = await db.tree.create(@@ -221,23 +223,29 @@ const createPages = async (const clonePage = async ({ projectId, source }: { projectId: Project["id"]; source: Page },+ context: AppContext,client: Prisma.TransactionClient = prisma) => {const treeId = source.treeId;- const tree = await db.tree.clone({ projectId, treeId }, client);+ const tree = await db.tree.clone({ projectId, treeId }, context, client);return { ...source, id: uuid(), treeId: tree.id };};const clonePages = async ({ projectId, source }: { projectId: Project["id"]; source: Pages },+ context: AppContext,client: Prisma.TransactionClient = prisma) => {const clones = [];for (const page of source.pages) {- clones.push(await clonePage({ projectId, source: page }, client));+ clones.push(await clonePage({ projectId, source: page }, context, client));}return Pages.parse({- homePage: await clonePage({ projectId, source: source.homePage }, client),+ homePage: await clonePage(+ { projectId, source: source.homePage },+ context,+ client+ ),pages: clones,});};@@ -249,27 +257,36 @@ const clonePages = async (* We create "prod" build when we publish a dev build.*/export async function create(- projectId: Build["projectId"],- env: "prod",- sourceBuild: Build | undefined,+ props: {+ projectId: Build["projectId"];+ env: "prod";+ sourceBuild: Build | undefined;+ },+ context: AppContext,client: Prisma.TransactionClient): Promise<void>;export async function create(- projectId: Build["projectId"],- env: "dev",- sourceBuild: Build | undefined,+ props: {+ projectId: Build["projectId"];+ env: "dev";+ sourceBuild: Build | undefined;+ },+ context: AppContext,client: Prisma.TransactionClient): Promise<void>;// eslint-disable-next-line func-styleexport async function create(- projectId: Build["projectId"],- env: "dev" | "prod",- sourceBuild: Build | undefined,+ props: {+ projectId: Build["projectId"];+ env: "dev" | "prod";+ sourceBuild: Build | undefined;+ },+ context: AppContext,client: Prisma.TransactionClient): Promise<void> {- if (env === "dev") {+ if (props.env === "dev") {const count = await client.build.count({- where: { projectId, isDev: true },+ where: { projectId: props.projectId, isDev: true },});if (count > 0) {@@ -277,39 +294,47 @@ export async function create(}}- if (env === "prod" && sourceBuild === undefined) {+ if (props.env === "prod" && props.sourceBuild === undefined) {throw new Error("Source build required for production build");}- if (env === "prod") {+ if (props.env === "prod") {await client.build.updateMany({- where: { projectId: projectId, isProd: true },+ where: { projectId: props.projectId, isProd: true },data: { isProd: false },});}const build = await client.build.create({data: {- projectId,+ projectId: props.projectId,pages: JSON.stringify([]),breakpoints: JSON.stringify(- sourceBuild?.breakpoints ?? db.breakpoints.createValues()+ props.sourceBuild?.breakpoints ?? db.breakpoints.createValues()),- styles: serializeStyles(sourceBuild?.styles ?? []),- styleSources: JSON.stringify(sourceBuild?.styleSources ?? []),- isDev: env === "dev",- isProd: env === "prod",+ styles: serializeStyles(props.sourceBuild?.styles ?? []),+ styleSources: JSON.stringify(props.sourceBuild?.styleSources ?? []),+ isDev: props.env === "dev",+ isProd: props.env === "prod",},});const pages =- sourceBuild === undefined- ? await createPages({ projectId, buildId: build.id }, client)- : await clonePages({ projectId, source: sourceBuild.pages }, client);+ props.sourceBuild === undefined+ ? await createPages(+ { projectId: props.projectId, buildId: build.id },+ context,+ client+ )+ : await clonePages(+ { projectId: props.projectId, source: props.sourceBuild.pages },+ context,+ client+ );await client.build.update({where: {- id_projectId: { projectId, id: build.id },+ id_projectId: { projectId: props.projectId, id: build.id },},data: {pages: JSON.stringify(pages),diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex 0255b20d83..335d8be741 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -121,7 +121,11 @@ export const create = async (},});- await db.build.create(project.id, "dev", undefined, client);+ await db.build.create(+ { projectId: project.id, env: "dev", sourceBuild: undefined },+ context,+ client+ );return project;});@@ -213,7 +217,11 @@ const clone = async (},});- await db.build.create(clonedProject.id, "dev", build, client);+ await db.build.create(+ { projectId: clonedProject.id, env: "dev", sourceBuild: build },+ context,+ client+ );return clonedProject;});diff --git a/packages/project/src/db/props.ts b/packages/project/src/db/props.tsindex e0447076aa..b5d8c61dae 100644--- a/packages/project/src/db/props.ts+++ b/packages/project/src/db/props.ts@@ -2,15 +2,18 @@ import warnOnce from "warn-once";import { type Tree, StoredProps, Props } from "@webstudio-is/project-build";import { applyPatches, type Patch } from "immer";import { prisma } from "@webstudio-is/prisma-client";-import { formatAsset } from "@webstudio-is/asset-uploader/server";import type { Project } from "../shared/schema";import {authorizeProject,type AppContext,} from "@webstudio-is/trpc-interface/server";+import { loadByIds } from "@webstudio-is/asset-uploader/server";-export const parseProps = async (propsString: string) => {- const storedProps = StoredProps.parse(JSON.parse(propsString));+export const parseProps = async (+ props: { propsString: string; projectId: Project["id"] },+ context: AppContext+) => {+ const storedProps = StoredProps.parse(JSON.parse(props.propsString));// find all asset ids in all propsconst assetIds: string[] = [];@@ -22,26 +25,21 @@ export const parseProps = async (propsString: string) => {}// load all assets- const assets = await prisma.asset.findMany({- where: {- id: {- in: assetIds,- },- },- });-- const assetsMap = new Map(- assets.map((asset) => [asset.id, formatAsset(asset)])+ const assets = await loadByIds(+ { ids: assetIds, projectId: props.projectId },+ context);- const props: Props = [];+ const assetsMap = new Map(assets.map((asset) => [asset.id, asset]));++ const convertedProps: Props = [];for (const prop of storedProps) {if (prop.type === "asset") {const assetId = prop.value;const asset = assetsMap.get(assetId);if (asset) {- props.push({+ convertedProps.push({id: prop.id,instanceId: prop.instanceId,name: prop.name,@@ -57,10 +55,10 @@ export const parseProps = async (propsString: string) => {continue;}- props.push(prop);+ convertedProps.push(prop);}- return props;+ return convertedProps;};export const serializeProps = (props: Props) => {@@ -104,7 +102,10 @@ export const patch = async (if (tree === null) {return;}- const props = await parseProps(tree.props);+ const props = await parseProps(+ { propsString: tree.props, projectId },+ context+ );const patchedProps = applyPatches(props, patches);await prisma.tree.update({diff --git a/packages/project/src/db/tree.ts b/packages/project/src/db/tree.tsindex 86697179c8..e8d07cc677 100644--- a/packages/project/src/db/tree.ts+++ b/packages/project/src/db/tree.ts@@ -124,6 +124,7 @@ const denormalizeTree = (instances: z.infer<typeof Instances>) => {export const loadById = async ({ projectId, treeId }: { projectId: Project["id"]; treeId: Tree["id"] },+ context: AppContext,client: Prisma.TransactionClient = prisma): Promise<Tree | null> => {const tree = await client.tree.findUnique({@@ -138,7 +139,10 @@ export const loadById = async (const instances = Instances.parse(JSON.parse(tree.instances));const root = Instance.parse(denormalizeTree(instances));- const props = await parseProps(tree.props);+ const props = await parseProps(+ { propsString: tree.props, projectId },+ context+ );const styleSourceSelections = StyleSourceSelections.parse(JSON.parse(tree.styleSelections)@@ -154,9 +158,10 @@ export const loadById = async (export const clone = async ({ projectId, treeId }: { projectId: Project["id"]; treeId: Tree["id"] },+ context: AppContext,client: Prisma.TransactionClient = prisma) => {- const tree = await loadById({ projectId, treeId }, client);+ const tree = await loadById({ projectId, treeId }, context, client);if (tree === null) {throw new Error(`Tree ${treeId} not found`);}@@ -177,7 +182,7 @@ export const patch = async (throw new Error("You don't have edit access to this project");}- const tree = await loadById({ projectId, treeId });+ const tree = await loadById({ projectId, treeId }, context);if (tree === null) {throw new Error(`Tree ${treeId} not found`);}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex db0998973b..f3adf7f037 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -286,6 +286,7 @@ importers:'@webstudio-is/jest-config': workspace:^'@webstudio-is/prisma-client': workspace:^'@webstudio-is/scripts': workspace:^+ '@webstudio-is/trpc-interface': workspace:^0.24.0'@webstudio-is/tsconfig': workspace:^app-root-path: ^3.0.0jest: ^29.3.1@@ -299,6 +300,7 @@ importers:'@remix-run/node': 1.12.0'@webstudio-is/fonts': link:../fonts'@webstudio-is/prisma-client': link:../prisma-client+ '@webstudio-is/trpc-interface': link:../trpc-interfaceapp-root-path: 3.0.0nanoid: 3.3.4sharp: 0.30.7