Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Wrong user is used when counting available custom domains on a free plan (#3792)
Ivan Starkov8482ec4b7797
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex fa1481e100..2668624832 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -513,6 +513,11 @@ const useCanAddDomain = () => {useEffect(() => {load();}, [load]);++ if (data?.success === false) {+ return { canAddDomain: false, maxDomainsAllowedPerUser };+ }+const withinFreeLimit = data? data.success && data.data < maxDomainsAllowedPerUser: true;diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex 61d6a210c5..927014626e 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -4,12 +4,10 @@ import { authenticator } from "~/services/auth.server";import { trpcSharedClient } from "~/services/trpc.server";import { entryApi } from "./entri/entri-api.server";-import {- getTokenPlanFeatures,- getUserPlanFeatures,-} from "./db/user-plan-features.server";+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";const createAuthorizationContext = async (request: Request@@ -19,7 +17,7 @@ const createAuthorizationContext = async (const authToken =url.searchParams.get("authToken") ??request.headers.get("x-auth-token") ??- url.hostname;+ undefined;const user = await authenticator.isAuthenticated(request);@@ -27,10 +25,41 @@ const createAuthorizationContext = async (request.headers.has("Authorization") &&request.headers.get("Authorization") === env.TRPC_SERVER_API_TOKEN;+ let ownerId = user?.id;++ if (authToken != null) {+ const projectOwnerIdByToken = await prisma.authorizationToken.findUnique({+ where: {+ token: authToken,+ },+ select: {+ project: {+ select: {+ id: true,+ userId: true,+ },+ },+ },+ });++ if (projectOwnerIdByToken === null) {+ throw new Error(`Project owner can't be found for token ${authToken}`);+ }++ const projectOwnerId = projectOwnerIdByToken.project.userId;+ if (projectOwnerId === null) {+ throw new Error(+ `Project ${projectOwnerIdByToken.project.id} has null userId`+ );+ }+ ownerId = projectOwnerId;+ }+const context: AppContext["authorization"] = {userId: user?.id,authToken,isServiceCall,+ ownerId,};return context;@@ -75,20 +104,11 @@ const createEntriContext = () => {};};-const createUserPlanContext = async (request: Request) => {- const url = new URL(request.url);-- const authToken = url.searchParams.get("authToken");- // When a shared link is accessed, identified by the presence of an authToken,- // the system retrieves the plan features associated with the project owner's account.- if (authToken !== null) {- const planFeatures = await getTokenPlanFeatures(authToken);- return planFeatures;- }-- const user = await authenticator.isAuthenticated(request);- const planFeatures = user?.id- ? await getUserPlanFeatures(user.id)+const createUserPlanContext = async (+ authorization: AppContext["authorization"]+) => {+ const planFeatures = authorization.ownerId+ ? await getUserPlanFeatures(authorization.ownerId): undefined;return planFeatures;};@@ -119,10 +139,11 @@ const createPostrestContext = () => {*/export const createContext = async (request: Request): Promise<AppContext> => {const authorization = await createAuthorizationContext(request);+const domain = createDomainContext(request);const deployment = createDeploymentContext(request);const entri = createEntriContext();- const userPlanFeatures = await createUserPlanContext(request);+ const userPlanFeatures = await createUserPlanContext(authorization);const trpcCache = createTrpcCache();const postgrest = createPostrestContext();diff --git a/apps/builder/app/shared/db/user-plan-features.server.ts b/apps/builder/app/shared/db/user-plan-features.server.tsindex bcd6453c97..8d835c4f85 100644--- a/apps/builder/app/shared/db/user-plan-features.server.ts+++ b/apps/builder/app/shared/db/user-plan-features.server.ts@@ -4,35 +4,6 @@ import env from "~/env/env.server";export type UserPlanFeatures = NonNullable<AppContext["userPlanFeatures"]>;-export const getTokenPlanFeatures = async (token: string) => {- const projectOwnerIdByToken = await prisma.authorizationToken.findUnique({- where: {- token,- },- select: {- project: {- select: {- id: true,- userId: true,- },- },- },- });-- if (projectOwnerIdByToken === null) {- throw new Error(`Project owner can't be found for token ${token}`);- }-- const userId = projectOwnerIdByToken.project.userId;- if (userId === null) {- throw new Error(- `Project ${projectOwnerIdByToken.project.id} has null instead of userId`- );- }-- return await getUserPlanFeatures(userId);-};-export const getUserPlanFeatures = async (userId: string): Promise<UserPlanFeatures> => {diff --git a/apps/builder/app/shared/trpc/trpc-client.ts b/apps/builder/app/shared/trpc/trpc-client.tsindex bc8ad6f92e..d41de23e4b 100644--- a/apps/builder/app/shared/trpc/trpc-client.ts+++ b/apps/builder/app/shared/trpc/trpc-client.ts@@ -19,6 +19,9 @@ export const nativeClient = createTRPCProxyClient<AppRouter>({async headers(_opts) {const authToken = $authToken.get();+ if (authToken == null) {+ return {};+ }// Pass token to api callreturn {"x-auth-token": authToken,diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsindex 2db36992a9..1755b0daee 100644--- a/packages/domain/src/trpc/domain.ts+++ b/packages/domain/src/trpc/domain.ts@@ -237,10 +237,10 @@ export const domainRouter = router({countTotalDomains: procedure.query(async ({ ctx }) => {try {- if (ctx.authorization.userId === undefined) {+ if (ctx.authorization.ownerId === undefined) {throw new Error("Not authorized");}- const data = await db.countTotalDomains(ctx.authorization.userId);+ const data = await db.countTotalDomains(ctx.authorization.ownerId);return { success: true, data } as const;} catch (error) {return {diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex 7e45e8d97e..e42c5b6266 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -15,6 +15,11 @@ type AuthorizationContext = {*/authToken: string | undefined;+ /**+ * In case of authToken, this is the ownerId of the project+ */+ ownerId: string | undefined;+/*** Allow service 2 service communications to skip authorization for view calls*/