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.

feat: Add "can publish" to content editors (#4530)

Ivan Starkovc265185c5a1c
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsx
index 1e1b8994bf..01242c7079 100644
--- a/apps/builder/app/builder/features/topbar/publish.tsx
+++ b/apps/builder/app/builder/features/topbar/publish.tsx
@@ -38,7 +38,7 @@ import stripIndent from "strip-indent";
import { $isPublishDialogOpen } from "../../shared/nano-states";
import { validateProjectDomain, type Project } from "@webstudio-is/project";
import {
- $authPermit,
+ $authTokenPermissions,
$project,
$publishedOrigin,
$userPlanFeatures,
@@ -837,16 +837,16 @@ type PublishProps = {
export const PublishButton = ({ projectId }: PublishProps) => {
const isPublishDialogOpen = useStore($isPublishDialogOpen);
- const authPermit = useStore($authPermit);
+ const authTokenPermissions = useStore($authTokenPermissions);
const [dialogContentType, setDialogContentType] = useState<
"publish" | "export"
>("publish");
- const isPublishEnabled = authPermit === "own" || authPermit === "admin";
+ const isPublishEnabled = authTokenPermissions.canPublish;
const tooltipContent = isPublishEnabled
? undefined
- : "Only owner or admin can publish projects";
+ : "Only the owner, an admin, or content editors with publish permissions can publish projects";
const handleExportClick = () => {
setDialogContentType("export");
diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.ts
index 9a72f29184..d5e8e61c7b 100644
--- a/apps/builder/app/shared/nano-states/misc.ts
+++ b/apps/builder/app/shared/nano-states/misc.ts
@@ -331,6 +331,7 @@ export const $authPermit = atom<AuthPermit>("view");
export const $authTokenPermissions = atom<TokenPermissions>({
canClone: true,
canCopy: true,
+ canPublish: false,
});
export const $authToken = atom<string | undefined>(undefined);
diff --git a/apps/builder/app/shared/share-project/share-project.stories.tsx b/apps/builder/app/shared/share-project/share-project.stories.tsx
index 14c00687d6..aebccd9583 100644
--- a/apps/builder/app/shared/share-project/share-project.stories.tsx
+++ b/apps/builder/app/shared/share-project/share-project.stories.tsx
@@ -19,6 +19,7 @@ const initialLinks: Array<LinkOptions> = [
relation: "viewers",
canClone: false,
canCopy: false,
+ canPublish: false,
},
{
token: crypto.randomUUID(),
@@ -26,6 +27,7 @@ const initialLinks: Array<LinkOptions> = [
relation: "editors",
canClone: false,
canCopy: false,
+ canPublish: false,
},
{
token: crypto.randomUUID(),
@@ -33,6 +35,7 @@ const initialLinks: Array<LinkOptions> = [
relation: "builders",
canClone: false,
canCopy: false,
+ canPublish: false,
},
];
@@ -63,6 +66,7 @@ const useShareProject = (
relation: "viewers",
canClone: false,
canCopy: false,
+ canPublish: false,
},
]);
};
diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsx
index 3054dc7570..8f88c805a0 100644
--- a/apps/builder/app/shared/share-project/share-project.tsx
+++ b/apps/builder/app/shared/share-project/share-project.tsx
@@ -94,7 +94,7 @@ type MenuProps = {
};
const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {
- const ids = useIds(["name", "canClone", "canCopy"]);
+ const ids = useIds(["name", "canClone", "canCopy", "canPublish"]);
const [isOpen, setIsOpen] = useState(false);
const [customLinkName, setCustomLinkName] = useState<string>(name);
@@ -234,36 +234,71 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {
</Grid>
{isFeatureEnabled("contentEditableMode") && (
- <Permission
- disabled={hasProPlan !== true}
- onCheckedChange={handleCheckedChange("editors")}
- checked={value.relation === "editors"}
- title="Content"
- info={
- <Flex direction="column">
- Recipients can edit content only, such as text, images, and
- predefined components.
- {hasProPlan !== true && (
- <>
- <br />
- <br />
- Upgrade to a Pro account to share with Content Edit
- permissions.
- <br /> <br />
- <Link
- className={buttonStyle({ color: "gradient" })}
- color="contrast"
- underline="none"
- href="https://webstudio.is/pricing"
- target="_blank"
- >
- Upgrade
- </Link>
- </>
- )}
- </Flex>
- }
- />
+ <>
+ <Permission
+ disabled={hasProPlan !== true}
+ onCheckedChange={handleCheckedChange("editors")}
+ checked={value.relation === "editors"}
+ title="Content"
+ info={
+ <Flex direction="column">
+ Recipients can edit content only, such as text, images, and
+ predefined components.
+ {hasProPlan !== true && (
+ <>
+ <br />
+ <br />
+ Upgrade to a Pro account to share with Content Edit
+ permissions.
+ <br /> <br />
+ <Link
+ className={buttonStyle({ color: "gradient" })}
+ color="contrast"
+ underline="none"
+ href="https://webstudio.is/pricing"
+ target="_blank"
+ >
+ Upgrade
+ </Link>
+ </>
+ )}
+ </Flex>
+ }
+ />
+ <Grid
+ css={{
+ ml: theme.spacing[6],
+ }}
+ >
+ <Grid
+ gap={1}
+ flow={"column"}
+ css={{
+ alignItems: "center",
+ justifyContent: "start",
+ }}
+ >
+ <Checkbox
+ disabled={
+ hasProPlan !== true || value.relation !== "editors"
+ }
+ checked={value.canPublish}
+ onCheckedChange={(canPublish) => {
+ onChange({ ...value, canPublish: Boolean(canPublish) });
+ }}
+ id={ids.canPublish}
+ />
+ <Label
+ htmlFor={ids.canPublish}
+ disabled={
+ hasProPlan !== true || value.relation !== "editors"
+ }
+ >
+ Can publish
+ </Label>
+ </Grid>
+ </Grid>
+ </>
)}
<Permission
@@ -336,6 +371,7 @@ export type LinkOptions = {
relation: Relation;
canCopy: boolean;
canClone: boolean;
+ canPublish: boolean;
};
type SharedLinkItemType = {
diff --git a/packages/authorization-token/src/db/authorization-token.ts b/packages/authorization-token/src/db/authorization-token.ts
index 300f2dcaad..54336782e6 100644
--- a/packages/authorization-token/src/db/authorization-token.ts
+++ b/packages/authorization-token/src/db/authorization-token.ts
@@ -11,15 +11,42 @@ type AuthorizationToken =
const applyTokenPermissions = (
token: AuthorizationToken
): AuthorizationToken => {
+ let result = token;
+
+ // @todo: fix this on SQL level
if (token.relation !== "viewers") {
- return {
- ...token,
+ result = {
+ ...result,
canClone: true,
canCopy: true,
};
}
- return token;
+ // @todo: fix this on SQL level
+ if (token.relation === "viewers") {
+ result = {
+ ...result,
+ canPublish: false,
+ };
+ }
+
+ // @todo: fix this on SQL level
+ if (token.relation === "builders") {
+ result = {
+ ...result,
+ canPublish: false,
+ };
+ }
+
+ // @todo: fix this on SQL level
+ if (token.relation === "administrators") {
+ result = {
+ ...result,
+ canPublish: true,
+ };
+ }
+
+ return result;
};
export const findMany = async (
@@ -55,6 +82,7 @@ export const findMany = async (
export const tokenDefaultPermissions = {
canClone: true,
canCopy: true,
+ canPublish: true,
};
export type TokenPermissions = typeof tokenDefaultPermissions;
@@ -89,6 +117,7 @@ export const getTokenPermissions = async (
return {
canClone: dbToken.canClone,
canCopy: dbToken.canCopy,
+ canPublish: dbToken.canPublish,
};
};
@@ -168,6 +197,7 @@ export const update = async (
relation: props.relation,
canClone: props.canClone,
canCopy: props.canCopy,
+ canPublish: props.canPublish,
})
.eq("projectId", projectId)
.eq("token", props.token)
diff --git a/packages/authorization-token/src/trpc/authorization-tokens-router.ts b/packages/authorization-token/src/trpc/authorization-tokens-router.ts
index 8e8f75805c..80b6e197e6 100644
--- a/packages/authorization-token/src/trpc/authorization-tokens-router.ts
+++ b/packages/authorization-token/src/trpc/authorization-tokens-router.ts
@@ -68,6 +68,7 @@ export const authorizationTokenRouter = router({
relation: TokenProjectRelation,
canClone: z.boolean(),
canCopy: z.boolean(),
+ canPublish: z.boolean(),
})
)
.mutation(async ({ input, ctx }) => {
@@ -77,6 +78,7 @@ export const authorizationTokenRouter = router({
token: input.token,
name: input.name,
relation: input.relation,
+ canPublish: input.canPublish,
canClone: input.canClone,
canCopy: input.canCopy,
},
diff --git a/packages/postgrest/src/__generated__/db-types.ts b/packages/postgrest/src/__generated__/db-types.ts
index c9a6eb8fc9..935fe3c23b 100644
--- a/packages/postgrest/src/__generated__/db-types.ts
+++ b/packages/postgrest/src/__generated__/db-types.ts
@@ -7,6 +7,31 @@ export type Json =
| Json[];
export type Database = {
+ graphql_public: {
+ Tables: {
+ [_ in never]: never;
+ };
+ Views: {
+ [_ in never]: never;
+ };
+ Functions: {
+ graphql: {
+ Args: {
+ operationName?: string;
+ query?: string;
+ variables?: Json;
+ extensions?: Json;
+ };
+ Returns: Json;
+ };
+ };
+ Enums: {
+ [_ in never]: never;
+ };
+ CompositeTypes: {
+ [_ in never]: never;
+ };
+ };
public: {
Tables: {
_prisma_migrations: {
@@ -72,6 +97,7 @@ export type Database = {
Row: {
canClone: boolean;
canCopy: boolean;
+ canPublish: boolean;
createdAt: string;
name: string;
projectId: string;
@@ -81,6 +107,7 @@ export type Database = {
Insert: {
canClone?: boolean;
canCopy?: boolean;
+ canPublish?: boolean;
createdAt?: string;
name?: string;
projectId: string;
@@ -90,6 +117,7 @@ export type Database = {
Update: {
canClone?: boolean;
canCopy?: boolean;
+ canPublish?: boolean;
createdAt?: string;
name?: string;
projectId?: string;
@@ -121,6 +149,7 @@ export type Database = {
deployment: string | null;
id: string;
instances: string;
+ isCleaned: boolean | null;
lastTransactionId: string | null;
marketplaceProduct: string;
pages: string;
@@ -141,6 +170,7 @@ export type Database = {
deployment?: string | null;
id: string;
instances?: string;
+ isCleaned?: boolean | null;
lastTransactionId?: string | null;
marketplaceProduct?: string;
pages: string;
@@ -161,6 +191,7 @@ export type Database = {
deployment?: string | null;
id?: string;
instances?: string;
+ isCleaned?: boolean | null;
lastTransactionId?: string | null;
marketplaceProduct?: string;
pages?: string;
@@ -681,14 +712,14 @@ export type Database = {
foreignKeyName: "Build_projectId_fkey";
columns: ["projectId"];
isOneToOne: false;
- referencedRelation: "Project";
+ referencedRelation: "DashboardProject";
referencedColumns: ["id"];
},
{
foreignKeyName: "Build_projectId_fkey";
columns: ["projectId"];
isOneToOne: false;
- referencedRelation: "DashboardProject";
+ referencedRelation: "Project";
referencedColumns: ["id"];
},
];
@@ -762,14 +793,14 @@ export type Database = {
foreignKeyName: "Build_projectId_fkey";
columns: ["projectId"];
isOneToOne: false;
- referencedRelation: "Project";
+ referencedRelation: "DashboardProject";
referencedColumns: ["id"];
},
{
foreignKeyName: "Build_projectId_fkey";
columns: ["projectId"];
isOneToOne: false;
- referencedRelation: "DashboardProject";
+ referencedRelation: "Project";
referencedColumns: ["id"];
},
];
@@ -811,6 +842,13 @@ export type Database = {
};
Returns: string;
};
+ database_cleanup: {
+ Args: {
+ from_date?: string;
+ to_date?: string;
+ };
+ Returns: undefined;
+ };
domainsVirtual: {
Args: {
"": unknown;
@@ -863,6 +901,19 @@ export type Database = {
publishStatus: Database["public"]["Enums"]["PublishStatus"];
}[];
};
+ latestProjectDomainBuildVirtual: {
+ Args: {
+ "": unknown;
+ };
+ Returns: {
+ buildId: string;
+ createdAt: string;
+ domain: string;
+ domainsVirtualId: string;
+ projectId: string;
+ publishStatus: Database["public"]["Enums"]["PublishStatus"];
+ }[];
+ };
uuid_generate_v4: {
Args: Record<PropertyKey, never>;
Returns: string;
@@ -970,3 +1021,18 @@ export type Enums<
: PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
? PublicSchema["Enums"][PublicEnumNameOrOptions]
: never;
+
+export type CompositeTypes<
+ PublicCompositeTypeNameOrOptions extends
+ | keyof PublicSchema["CompositeTypes"]
+ | { schema: keyof Database },
+ CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
+ schema: keyof Database;
+ }
+ ? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
+ : never = never,
+> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
+ ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
+ : PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
+ ? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+ : never;
diff --git a/packages/prisma-client/prisma/migrations/20241207052014_can-publish/migration.sql b/packages/prisma-client/prisma/migrations/20241207052014_can-publish/migration.sql
new file mode 100644
index 0000000000..cf4ca7b42c
--- /dev/null
+++ b/packages/prisma-client/prisma/migrations/20241207052014_can-publish/migration.sql
@@ -0,0 +1,9 @@
+
+ALTER TABLE "AuthorizationToken" ADD COLUMN "canPublish" boolean NOT NULL DEFAULT false;
+
+UPDATE "AuthorizationToken"
+SET "canPublish" =
+CASE
+ WHEN "relation" IN ('viewers', 'builders') THEN FALSE
+ ELSE TRUE
+END;
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 93a41eb778..3dd33a9219 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -24,6 +24,7 @@
"@webstudio-is/postrest": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
+ "@webstudio-is/authorization-token": "workspace:*",
"nanoid": "^5.0.8",
"zod": "^3.22.4"
},
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index d148245c5d..b04a641197 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -7,6 +7,7 @@ import {
authorizeProject,
type AppContext,
} from "@webstudio-is/trpc-interface/index.server";
+import { db as authDb } from "@webstudio-is/authorization-token/index.server";
import {
type Deployment,
type Resource,
@@ -299,7 +300,7 @@ export const createProductionBuild = async (
context: AppContext
) => {
const canBuild = await authorizeProject.hasProjectPermit(
- { projectId: props.projectId, permit: "build" },
+ { projectId: props.projectId, permit: "edit" },
context
);
@@ -307,6 +308,23 @@ export const createProductionBuild = async (
throw new AuthorizationError("You don't have access to build this project");
}
+ // Get token permissions
+ if (context.authorization.type === "token") {
+ const permissions = await authDb.getTokenPermissions(
+ {
+ projectId: props.projectId,
+ token: context.authorization.authToken,
+ },
+ context
+ );
+
+ if (!permissions.canPublish) {
+ throw new AuthorizationError(
+ "The token does not have permission to build this project."
+ );
+ }
+ }
+
const build = await context.postgrest.client.rpc("create_production_build", {
project_id: props.projectId,
deployment: JSON.stringify(props.deployment),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9de3f35a0a..c888777eca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1669,6 +1669,9 @@ importers:
packages/project-build:
dependencies:
+ '@webstudio-is/authorization-token':
+ specifier: workspace:*
+ version: link:../authorization-token
'@webstudio-is/postrest':
specifier: workspace:*
version: link:../postgrest
@@ -11794,7 +11797,7 @@ snapshots:
dependencies:
- '@babel/parser': 7.25.7
+ '@babel/parser': 7.26.2
'@vue/shared': 3.3.4
estree-walker: 2.0.2
source-map-js: 1.2.1
@@ -11806,7 +11809,7 @@ snapshots:
dependencies:
- '@babel/parser': 7.25.7
+ '@babel/parser': 7.26.2
'@vue/compiler-core': 3.3.4
'@vue/compiler-dom': 3.3.4
'@vue/compiler-ssr': 3.3.4
@@ -11824,7 +11827,7 @@ snapshots:
dependencies:
- '@babel/parser': 7.25.7
+ '@babel/parser': 7.26.2
'@vue/compiler-core': 3.3.4
'@vue/shared': 3.3.4
estree-walker: 2.0.2