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
feat: Make it easy for a self-hosted version to set the plan features (#3475)
Ivan Starkov3105b5cec041
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.mdindex e436567f05..9d4bc973f3 100644--- a/.github/pull_request_template.md+++ b/.github/pull_request_template.md@@ -24,4 +24,4 @@- [ ] tested locally and on preview environment (preview dev login: 5de6)- [ ] updated [test cases](https://github.com/webstudio-is/webstudio/blob/main/apps/builder/docs/test-cases.md) document- [ ] added tests-- [ ] if any new env variables are added, added them to `.env.example` and the `builder/env-check.js` if mandatory+- [ ] if any new env variables are added, added them to `.env` filediff --git a/apps/builder/.env b/apps/builder/.envindex 42bc21c227..9918251a42 100644--- a/apps/builder/.env+++ b/apps/builder/.env@@ -46,6 +46,9 @@ ASSET_BASE_URL=/s/uploads/# Enable features behind a flag, * enables all.FEATURES=*+# Current user plan features (default)+USER_PLAN=pro+# TRCP server url and API token. If empty local TRPC server is used# TRPC_SERVER_URL=diff --git a/apps/builder/.env.production b/apps/builder/.env.productionnew file mode 100644index 0000000000..71876a5da3--- /dev/null+++ b/apps/builder/.env.production@@ -0,0 +1,2 @@+# Reset current user plan features (default)+USER_PLAN=\ No newline at end of filediff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.tsindex f28150e34c..cf1c8ac7f7 100644--- a/apps/builder/app/env/env.server.ts+++ b/apps/builder/app/env/env.server.ts@@ -94,6 +94,9 @@ const env = {PUBLISHER_HOST: process.env.PUBLISHER_HOST || "wstd.work",FEATURES: process.env.FEATURES ?? "",++ // current user plan features (default)+ USER_PLAN: process.env.USER_PLAN ?? "",};export type ServerEnv = typeof env;diff --git a/apps/builder/app/services/auth.server.ts b/apps/builder/app/services/auth.server.tsindex fce8b13dbf..510fdcf003 100644--- a/apps/builder/app/services/auth.server.ts+++ b/apps/builder/app/services/auth.server.ts@@ -68,11 +68,19 @@ if (env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET) {if (env.DEV_LOGIN === "true") {authenticator.use(new FormStrategy(async ({ form }) => {- const secret = form.get("secret");+ const secretValue = form.get("secret");++ if (secretValue == null) {+ throw new Error("Secret is required");+ }++ const [secret, email = "[email protected]"] = secretValue+ .toString()+ .split(":");if (secret === env.AUTH_SECRET?.slice(0, 4)) {try {- const user = await db.user.createOrLoginWithDev();+ const user = await db.user.createOrLoginWithDev(email);return user;} catch (error) {if (error instanceof Error) {diff --git a/apps/builder/app/shared/db/user-plan-features.server.ts b/apps/builder/app/shared/db/user-plan-features.server.tsindex b5d6ae10be..bcd6453c97 100644--- a/apps/builder/app/shared/db/user-plan-features.server.ts+++ b/apps/builder/app/shared/db/user-plan-features.server.ts@@ -1,5 +1,6 @@import { prisma } from "@webstudio-is/prisma-client";import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import env from "~/env/env.server";export type UserPlanFeatures = NonNullable<AppContext["userPlanFeatures"]>;@@ -71,6 +72,18 @@ export const getUserPlanFeatures = async (};}+ if (env.USER_PLAN === "pro") {+ return {+ allowShareAdminLinks: true,+ allowDynamicData: true,+ allowContactEmail: true,+ maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,+ hasSubscription: true,+ hasProPlan: true,+ planName: "env.USER_PLAN Pro",+ };+ }+return {allowShareAdminLinks: false,allowDynamicData: false,diff --git a/apps/builder/app/shared/db/user.server.ts b/apps/builder/app/shared/db/user.server.tsindex 10d61e7703..4450108f70 100644--- a/apps/builder/app/shared/db/user.server.ts+++ b/apps/builder/app/shared/db/user.server.ts@@ -79,9 +79,9 @@ export const createOrLoginWithOAuth = async (return newUser;};-export const createOrLoginWithDev = async (): Promise<User> => {+export const createOrLoginWithDev = async (email: string): Promise<User> => {const userData = {- email: "[email protected]",+ email,username: "admin",image: "",provider: "dev",