Scheduling infrastructure for absolutely everyone.
feat: pbac - org pages check update permissions (#24164)
sean-brydon858d52563ffa
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsxindex c60161bb78f..224c6a160e4 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx@@ -1,8 +1,9 @@import { _generateMetadata } from "app/_utils";import OrgAttributesEditPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view";+import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrgPerms } from "../../../../actions/validateUserHasOrgPerms";export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>await _generateMetadata(@@ -14,7 +15,10 @@ export const generateMetadata = async ({ params }: { params: Promise<{ id: strin);const OrgAttributesEditPageWrapper = async () => {- await validateUserHasOrgAdmin();+ await validateUserHasOrgPerms({+ permission: "organization.attributes.update",+ fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],+ });return <OrgAttributesEditPage />;};diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsxindex 6a8b0690b35..d503230653c 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx@@ -1,8 +1,9 @@import { _generateMetadata } from "app/_utils";import OrgAttributesCreatePage from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view";+import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrgPerms } from "../../../actions/validateUserHasOrgPerms";export const generateMetadata = async () =>await _generateMetadata(@@ -14,7 +15,10 @@ export const generateMetadata = async () =>);const OrgAttributesCreatePageWrapper = async () => {- await validateUserHasOrgAdmin();+ await validateUserHasOrgPerms({+ permission: "organization.attributes.create",+ fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],+ });return <OrgAttributesCreatePage />;};diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsxindex 343fbc45e11..a260fb36acd 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx@@ -7,7 +7,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permiimport SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";export const generateMetadata = async () =>await _generateMetadata(@@ -20,7 +20,7 @@ export const generateMetadata = async () =>const Page = async () => {const t = await getTranslate();- const session = await validateUserHasOrgAdmin();+ const session = await validateUserHasOrg();const { canRead, canEdit, canDelete, canCreate } = await getResourcePermissions({userId: session.user.id,diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsxindex 20e5d6af4fb..a6ebd3e48c4 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx@@ -2,8 +2,9 @@ import { _generateMetadata, getTranslate } from "app/_utils";import DelegationCredentialList from "@calcom/features/ee/organizations/pages/settings/delegationCredential";import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";+import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrgPerms } from "../../actions/validateUserHasOrgPerms";export const generateMetadata = async () =>await _generateMetadata(@@ -17,7 +18,10 @@ export const generateMetadata = async () =>const Page = async () => {const t = await getTranslate();- await validateUserHasOrgAdmin();+ await validateUserHasOrgPerms({+ permission: "organization.update",+ fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],+ });return (<SettingsHeaderdiff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsxindex ca398c6421f..9204d01c30a 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx@@ -6,7 +6,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permiimport SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";export const generateMetadata = async () =>await _generateMetadata(@@ -19,7 +19,7 @@ export const generateMetadata = async () =>const Page = async () => {const t = await getTranslate();- const session = await validateUserHasOrgAdmin();+ const session = await validateUserHasOrg();const { canEdit } = await getResourcePermissions({userId: session.user.id,diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsxindex 1d786ea76f0..8200641230a 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx@@ -7,7 +7,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permiimport SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";export const generateMetadata = async () =>await _generateMetadata(@@ -21,7 +21,7 @@ export const generateMetadata = async () =>const Page = async () => {const t = await getTranslate();- const session = await validateUserHasOrgAdmin();+ const session = await validateUserHasOrg();if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {return redirect("/settings/profile");diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsxindex 12b8c769050..c5011563c5d 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx@@ -7,7 +7,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permiimport SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";import { MembershipRole } from "@calcom/prisma/enums";-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";export const generateMetadata = async () =>await _generateMetadata(@@ -20,7 +20,7 @@ export const generateMetadata = async () =>const Page = async () => {const t = await getTranslate();- const session = await validateUserHasOrgAdmin();+ const session = await validateUserHasOrg();if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {return redirect("/settings/organizations/general");