Skip to content

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.

fix: Image upload via share link (#4083)

Ivan Starkov9348ce0af089
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index a36993fab4..49fcd70da9 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -171,9 +171,15 @@ const uploadAsset = async ({
// should be removed after fix
metaFormData.append("filename", sanitizeS3Key(fileName));
- const metaResponse = await fetch(restAssetsPath({ authToken }), {
+ const authHeaders = new Headers();
+ if (authToken !== undefined) {
+ authHeaders.set("x-auth-token", authToken);
+ }
+
+ const metaResponse = await fetch(restAssetsPath(), {
method: "POST",
body: metaFormData,
+ headers: authHeaders,
});
const metaData: { name: string } | { errors: string } =
@@ -188,7 +194,7 @@ const uploadAsset = async ({
? fileOrUrl
: JSON.stringify({ url: fileOrUrl.href });
- const headers = new Headers();
+ const headers = new Headers(authHeaders);
if (fileOrUrl instanceof URL) {
headers.set("Content-Type", "application/json");
diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.ts
index 21d1e6c52e..523d139f89 100644
--- a/apps/builder/app/builder/shared/sync/sync-server.ts
+++ b/apps/builder/app/builder/shared/sync/sync-server.ts
@@ -157,19 +157,21 @@ const syncServer = async function () {
for await (const _ of retry()) {
// in case of any error continue retrying
try {
- const response = await fetch(
- restPatchPath({ authToken: details.authToken }),
- {
- method: "post",
- body: JSON.stringify({
- transactions,
- buildId: details.buildId,
- projectId,
- // provide latest stored version to server
- version: details.version,
- }),
- }
- );
+ const headers = new Headers();
+ if (details.authToken) {
+ headers.append("x-auth-token", details.authToken);
+ }
+ const response = await fetch(restPatchPath(), {
+ method: "post",
+ body: JSON.stringify({
+ transactions,
+ buildId: details.buildId,
+ projectId,
+ // provide latest stored version to server
+ version: details.version,
+ headers,
+ }),
+ });
if (response.ok) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/apps/builder/app/shared/builder-data.ts b/apps/builder/app/shared/builder-data.ts
index 4745f48c23..f4b3c04ca4 100644
--- a/apps/builder/app/shared/builder-data.ts
+++ b/apps/builder/app/shared/builder-data.ts
@@ -66,12 +66,9 @@ export const loadBuilderData = async ({
signal: AbortSignal;
}) => {
const currentUrl = new URL(location.href);
- const authToken = currentUrl.searchParams.get("authToken");
const url = new URL(`/rest/data/${projectId}`, currentUrl.origin);
- if (authToken) {
- url.searchParams.set("authToken", authToken);
- }
- const response = await fetch(url, { signal });
+ const headers = new Headers();
+ const response = await fetch(url, { headers, signal });
if (response.ok) {
const data: Awaited<ReturnType<typeof loader>> = await response.json();
diff --git a/apps/builder/app/shared/fetch.client.ts b/apps/builder/app/shared/fetch.client.ts
index 45c66ac1df..4372834ae5 100644
--- a/apps/builder/app/shared/fetch.client.ts
+++ b/apps/builder/app/shared/fetch.client.ts
@@ -1,5 +1,6 @@
import { toast } from "@webstudio-is/design-system";
import { csrfToken } from "./csrf.client";
+import { $authToken } from "./nano-states";
/**
* To avoid fetch interception from the canvas, i.e., `globalThis.fetch = () => console.log('INTERCEPTED');`,
@@ -20,6 +21,14 @@ export const fetch: typeof globalThis.fetch = (requestInfo, requestInit) => {
headers.set("X-CSRF-Token", csrfToken);
+ const authToken = $authToken.get();
+
+ // Do not override the existing x-auth-token header.
+ // As some mutations are queue based and they need to be authenticated with the same token as in the queue.
+ if (authToken !== undefined && headers.get("x-auth-token") === null) {
+ headers.set("x-auth-token", authToken);
+ }
+
const modifiedInit: RequestInit = {
...requestInit,
headers,
diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.ts
index 1648bcaae7..b3fd6630d0 100644
--- a/apps/builder/app/shared/nano-states/props.ts
+++ b/apps/builder/app/shared/nano-states/props.ts
@@ -32,7 +32,6 @@ import {
$uploadingFilesDataStore,
$memoryProps,
$isPreviewMode,
- $authToken,
} from "./misc";
import { $selectedPage, $pages } from "./pages";
import type { InstanceSelector } from "../tree-utils";
@@ -643,15 +642,9 @@ export const $areResourcesLoading = computed(
const loadResources = async (resourceRequests: ResourceRequest[]) => {
$resourcesLoadingCount.set($resourcesLoadingCount.get() + 1);
- const authToken = $authToken.get();
- const headers = new Headers();
- if (authToken !== undefined) {
- headers.set("x-auth-token", authToken);
- }
const response = await fetch(restResourcesLoader(), {
method: "POST",
body: JSON.stringify(resourceRequests),
- headers,
});
$resourcesLoadingCount.set($resourcesLoadingCount.get() - 1);
if (response.ok === false) {
diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.ts
index 1295a66442..2ade55a964 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 { $authToken } from "../nano-states";
import { publicStaticEnv } from "~/env/env.static";
import { getAuthorizationServerOrigin } from "./origins";
@@ -86,32 +85,6 @@ export const cloneProjectUrl = (props: {
return `${authServerOrigin}/dashboard?${searchParams.toString()}`;
};
-export const builderDomainsPath = (method: string) => {
- const authToken = $authToken.get();
- const urlSearchParams = new URLSearchParams();
- if (authToken !== undefined) {
- urlSearchParams.set("authToken", authToken);
- }
- const urlSearchParamsString = urlSearchParams.toString();
-
- return `/builder/domains/${method}${
- urlSearchParamsString ? `?${urlSearchParamsString}` : ""
- }`;
-};
-
-export const projectsPath = (
- method: string,
- { authToken }: { authToken?: string } = {}
-) => {
- const path = `/rest/projects/${method}`;
- if (authToken === undefined) {
- return path;
- }
- const urlSearchParams = new URLSearchParams();
- urlSearchParams.set("authToken", authToken);
- return path + `?${urlSearchParams.toString()}`;
-};
-
export const loginPath = (params: {
error?: (typeof AUTH_PROVIDERS)[keyof typeof AUTH_PROVIDERS];
message?: string;
@@ -139,27 +112,16 @@ export const authPath = ({
provider: "google" | "github" | "dev";
}) => `/auth/${provider}`;
-export const restAssetsPath = ({ authToken }: { authToken?: string }) => {
- const urlSearchParams = new URLSearchParams();
- if (authToken !== undefined) {
- urlSearchParams.set("authToken", authToken);
- }
- const urlSearchParamsString = urlSearchParams.toString();
-
- return `/rest/assets${
- urlSearchParamsString ? `?${urlSearchParamsString}` : ""
- }`;
+export const restAssetsPath = () => {
+ return `/rest/assets`;
};
export const restAssetsUploadPath = ({ name }: { name: string }) => {
return `/rest/assets/${name}`;
};
-export const restPatchPath = (props: { authToken?: string }) => {
+export const restPatchPath = () => {
const urlSearchParams = new URLSearchParams();
- if (props.authToken !== undefined) {
- urlSearchParams.set("authToken", props.authToken);
- }
urlSearchParams.set("client-version", publicStaticEnv.VERSION);
diff --git a/apps/builder/app/shared/trpc/trpc-client.ts b/apps/builder/app/shared/trpc/trpc-client.ts
index 495ed54e05..529ebd8a4a 100644
--- a/apps/builder/app/shared/trpc/trpc-client.ts
+++ b/apps/builder/app/shared/trpc/trpc-client.ts
@@ -9,7 +9,6 @@ import type {
} from "@trpc/server";
import { createRecursiveProxy } from "@trpc/server/shared";
import { useMemo, useState } from "react";
-import { $authToken } from "../nano-states";
import { fetch } from "~/shared/fetch.client";
export const nativeClient = createTRPCProxyClient<AppRouter>({
@@ -17,18 +16,6 @@ export const nativeClient = createTRPCProxyClient<AppRouter>({
httpBatchLink({
fetch,
url: "/trpc",
- // You can pass any HTTP headers you wish here
- async headers(_opts) {
- const authToken = $authToken.get();
-
- if (authToken == null) {
- return {};
- }
- // Pass token to api call
- return {
- "x-auth-token": authToken,
- };
- },
}),
],
});