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: Apply project owner's plan features to the via link shared projects (#2639)
Ivan Starkovd6c36c7a6f82
diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex d12aacc9cb..4da65e83d0 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -3,7 +3,10 @@ import env from "~/env/env.server";import { authenticator } from "~/services/auth.server";import { trpcClient } from "~/services/trpc.server";import { entryApi } from "./entri/entri-api.server";-import { getUserPlanFeatures } from "./db/user-plan-features.server";+import {+ getTokenPlanFeatures,+ getUserPlanFeatures,+} from "./db/user-plan-features.server";const createAuthorizationContext = async (request: Request@@ -57,7 +60,20 @@ const createEntriContext = () => {};};-const createUserPlanContext = async (request: Request) => {+const createUserPlanContext = async (+ request: Request,+ authorization: AppContext["authorization"]+) => {+ 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 ? getUserPlanFeatures(user.id) : undefined;return planFeatures;@@ -71,7 +87,7 @@ export const createContext = async (request: Request): Promise<AppContext> => {const domain = createDomainContext(request);const deployment = createDeploymentContext(request);const entri = createEntriContext();- const userPlanFeatures = await createUserPlanContext(request);+ const userPlanFeatures = await createUserPlanContext(request, authorization);return {authorization,domain,diff --git a/apps/builder/app/shared/db/user-plan-features.server.ts b/apps/builder/app/shared/db/user-plan-features.server.tsindex 0a9d1b3424..c1723ec2a6 100644--- a/apps/builder/app/shared/db/user-plan-features.server.ts+++ b/apps/builder/app/shared/db/user-plan-features.server.ts@@ -13,6 +13,35 @@ export type UserPlanFeatures = {// No strings - no secrets({}) as UserPlanFeatures satisfies Record<string, boolean | number>;+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/packages/prisma-client/prisma/migrations/20231121125755_token-uniq/migration.sql b/packages/prisma-client/prisma/migrations/20231121125755_token-uniq/migration.sqlnew file mode 100644index 0000000000..d54611d0c8--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20231121125755_token-uniq/migration.sql@@ -0,0 +1,4 @@+-- CreateIndex+CREATE UNIQUE INDEX "AuthorizationToken_token_key" ON "AuthorizationToken"("token");+-- AddForeignKey+ALTER TABLE "AuthorizationToken" ADD CONSTRAINT "AuthorizationToken_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE RESTRICT ON UPDATE CASCADE;diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex 8e3499c0d2..a13b5720c9 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -110,17 +110,18 @@ model TransactionLog {}model Project {- id String @id @default(uuid())- createdAt DateTime @default(now())- title String- domain String @unique- user User? @relation(fields: [userId], references: [id])- userId String?- build Build[]- isDeleted Boolean @default(false)- files File[]- projectDomain ProjectDomain[]- latestBuild LatestBuildPerProject?+ id String @id @default(uuid())+ createdAt DateTime @default(now())+ title String+ domain String @unique+ user User? @relation(fields: [userId], references: [id])+ userId String?+ build Build[]+ isDeleted Boolean @default(false)+ files File[]+ projectDomain ProjectDomain[]+ latestBuild LatestBuildPerProject?+ authorizationToken AuthorizationToken[]@@unique([id, isDeleted])@@unique([domain, isDeleted])@@ -167,13 +168,14 @@ enum AuthorizationRelation {model AuthorizationToken {token String @default(uuid())- // No relation to Project, as the Authorization system is not tied to a projectprojectId String+ project Project @relation(fields: [projectId], references: [id])name String @default("")relation AuthorizationRelation @default(viewers)createdAt DateTime @default(now())@@id([token, projectId])+ @@unique([token])}enum DomainStatus {