Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

feat: add card explaining that additional privileges were moved

adilsonc4bf42e2f211
diff --git a/frontend/src/hooks/api/folderAccess/queries.tsx b/frontend/src/hooks/api/folderAccess/queries.tsx
index fe048ebeb2..03c9701ac4 100644
--- a/frontend/src/hooks/api/folderAccess/queries.tsx
+++ b/frontend/src/hooks/api/folderAccess/queries.tsx
@@ -74,7 +74,11 @@ export const useListFolderAccessUsers = ({
enabled: Boolean(projectId) && Boolean(environmentSlug) && Boolean(secretPath)
});
-export const useListUserFolderAccess = ({ projectId, userId }: TListUserFolderAccessDTO) =>
+export const useListUserFolderAccess = ({
+ projectId,
+ userId,
+ enabled = true
+}: TListUserFolderAccessDTO & { enabled?: boolean }) =>
useQuery({
queryKey: folderAccessKeys.listUserGrants({ projectId, userId }),
queryFn: async () => {
@@ -83,13 +87,14 @@ export const useListUserFolderAccess = ({ projectId, userId }: TListUserFolderAc
);
return data.folderAccess;
},
- enabled: Boolean(projectId) && Boolean(userId)
+ enabled: enabled && Boolean(projectId) && Boolean(userId)
});
export const useListIdentityFolderAccess = ({
projectId,
- identityId
-}: TListIdentityFolderAccessDTO) =>
+ identityId,
+ enabled = true
+}: TListIdentityFolderAccessDTO & { enabled?: boolean }) =>
useQuery({
queryKey: folderAccessKeys.listIdentityGrants({ projectId, identityId }),
queryFn: async () => {
@@ -98,7 +103,7 @@ export const useListIdentityFolderAccess = ({
);
return data.folderAccess;
},
- enabled: Boolean(projectId) && Boolean(identityId)
+ enabled: enabled && Boolean(projectId) && Boolean(identityId)
});
export const useListFolderAccessIdentities = ({
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
index ea1fec7cfe..67ac3d714e 100644
--- a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -55,6 +55,7 @@ import { ActorType } from "@app/hooks/api/auditLogs/enums";
import { useRemovePamProductIdentityMember } from "@app/hooks/api/pam";
import { projectIdentityQuery, useDeleteProjectIdentity } from "@app/hooks/api/projectIdentity";
import { ProjectType } from "@app/hooks/api/projects/types";
+import { AdditionalPrivilegesRemovedSection } from "@app/pages/project/components/AdditionalPrivilegesRemovedSection";
import { FolderAccessSection } from "@app/pages/project/components/FolderAccessSection";
import { ProjectIdentityAuthenticationSection } from "@app/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityAuthSection";
import { ProjectIdentityDetailsSection } from "@app/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection";
@@ -73,8 +74,8 @@ const Page = () => {
select: (el) => el.identityId as string
});
const { currentProject, projectId } = useProject();
- const { subscription } = useSubscription();
const { currentOrg, isSubOrganization } = useOrganization();
+ const { subscription } = useSubscription();
const { data: identityMembershipDetails, isPending: isMembershipDetailsLoading } =
useGetProjectIdentityMembershipV2(projectId, identityId, currentProject?.type);
@@ -87,6 +88,8 @@ const Page = () => {
const isPam = currentProject?.type === ProjectType.PAM;
// Products where the underlying project is an internal detail the user never sees
const isStandaloneProduct = isCertManager || isPam;
+ const isSecretManager = currentProject?.type === ProjectType.SecretManager;
+ const hasFolderRbacPlan = Boolean(subscription?.secretsFolderRbac);
let removeMenuItemLabel = "Remove From Project";
if (isProjectIdentity) {
@@ -374,16 +377,20 @@ const Page = () => {
identityMembershipDetails={identityMembershipDetails}
/>
)}
- {currentProject.type === ProjectType.SecretManager &&
- subscription?.secretsFolderRbac && (
- <FolderAccessSection
- actor={{
- type: "identity",
- id: identityMembershipDetails.identity.id,
- name: identityMembershipDetails.identity.name
- }}
- />
+ {isSecretManager &&
+ !hasFolderRbacPlan &&
+ !currentProject.isLegacyAdditionalPrivilegesEnabled && (
+ <AdditionalPrivilegesRemovedSection />
)}
+ {isSecretManager && hasFolderRbacPlan && (
+ <FolderAccessSection
+ actor={{
+ type: "identity",
+ id: identityMembershipDetails.identity.id,
+ name: identityMembershipDetails.identity.name
+ }}
+ />
+ )}
</div>
</div>
<IdentityActionConfirmationDialog
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
index a734a54a1d..fa4d4359f9 100644
--- a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
@@ -50,6 +50,7 @@ import { usePopUp } from "@app/hooks";
import { useDeleteUserFromWorkspace, useGetWorkspaceUserDetails } from "@app/hooks/api";
import { ActorType } from "@app/hooks/api/auditLogs/enums";
import { ProjectType } from "@app/hooks/api/projects/types";
+import { AdditionalPrivilegesRemovedSection } from "@app/pages/project/components/AdditionalPrivilegesRemovedSection";
import { FolderAccessSection } from "@app/pages/project/components/FolderAccessSection";
import { ProjectAccessControlTabs } from "@app/types/project";
@@ -143,6 +144,8 @@ export const Page = () => {
const isOwnProjectMembershipDetails = currentUserId === membershipDetails?.user?.id;
const isCertManager = currentProject?.type === ProjectType.CertificateManager;
+ const isSecretManager = currentProject.type === ProjectType.SecretManager;
+ const hasFolderRbacPlan = Boolean(subscription?.secretsFolderRbac);
let memberDisplayName = "Unnamed User";
if (membershipDetails) {
const { firstName, lastName, email, username } = membershipDetails.user;
@@ -286,21 +289,25 @@ export const Page = () => {
{!isCertManager && currentProject.isLegacyAdditionalPrivilegesEnabled && (
<MemberProjectAdditionalPrivilegeSection membershipDetails={membershipDetails} />
)}
- {currentProject.type === ProjectType.SecretManager &&
- subscription?.secretsFolderRbac && (
- <FolderAccessSection
- actor={{
- type: "user",
- id: membershipDetails.user.id,
- membershipId: membershipDetails.id,
- username: membershipDetails.user.username,
- email: membershipDetails.user.email,
- firstName: membershipDetails.user.firstName,
- lastName: membershipDetails.user.lastName
- }}
- hideActions={isOwnProjectMembershipDetails}
- />
+ {isSecretManager &&
+ !hasFolderRbacPlan &&
+ !currentProject.isLegacyAdditionalPrivilegesEnabled && (
+ <AdditionalPrivilegesRemovedSection />
)}
+ {isSecretManager && hasFolderRbacPlan && (
+ <FolderAccessSection
+ actor={{
+ type: "user",
+ id: membershipDetails.user.id,
+ membershipId: membershipDetails.id,
+ username: membershipDetails.user.username,
+ email: membershipDetails.user.email,
+ firstName: membershipDetails.user.firstName,
+ lastName: membershipDetails.user.lastName
+ }}
+ hideActions={isOwnProjectMembershipDetails}
+ />
+ )}
</div>
</div>
<DeleteConfirmDialog
diff --git a/frontend/src/pages/project/components/AdditionalPrivilegesRemovedSection/AdditionalPrivilegesRemovedSection.tsx b/frontend/src/pages/project/components/AdditionalPrivilegesRemovedSection/AdditionalPrivilegesRemovedSection.tsx
new file mode 100644
index 0000000000..fd54d8678e
--- /dev/null
+++ b/frontend/src/pages/project/components/AdditionalPrivilegesRemovedSection/AdditionalPrivilegesRemovedSection.tsx
@@ -0,0 +1,64 @@
+import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
+import {
+ Button,
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ DocumentationLinkBadge,
+ Empty,
+ EmptyContent,
+ EmptyDescription,
+ EmptyHeader,
+ EmptyTitle
+} from "@app/components/v3";
+import { usePopUp } from "@app/hooks";
+
+const FOLDER_ACCESS_DOCS_URL =
+ "https://infisical.com/docs/documentation/platform/access-controls/folder-rbac";
+
+const UPGRADE_TEXT =
+ "Folder-level access controls can be unlocked if you upgrade to Infisical Pro plan.";
+
+export const AdditionalPrivilegesRemovedSection = () => {
+ const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["upgradePlan"] as const);
+
+ return (
+ <>
+ <Card>
+ <CardHeader>
+ <CardTitle>
+ Additional Privileges
+ <DocumentationLinkBadge href={FOLDER_ACCESS_DOCS_URL} />
+ </CardTitle>
+ <CardDescription>
+ One-off policies are no longer available on this project.
+ </CardDescription>
+ </CardHeader>
+ <CardContent>
+ <Empty className="border">
+ <EmptyHeader>
+ <EmptyTitle>Folder Access Replaces Additional Privileges</EmptyTitle>
+ <EmptyDescription>
+ Additional privileges have been replaced by project roles and folder access. Folder
+ access is scoped to a path and everything under it, at a tier from List to Full
+ Access, and can expire. Your plan does not include folder access.
+ </EmptyDescription>
+ </EmptyHeader>
+ <EmptyContent>
+ <Button variant="project" onClick={() => handlePopUpOpen("upgradePlan")}>
+ Upgrade Plan
+ </Button>
+ </EmptyContent>
+ </Empty>
+ </CardContent>
+ </Card>
+ <UpgradePlanModal
+ isOpen={popUp.upgradePlan.isOpen}
+ onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
+ text={UPGRADE_TEXT}
+ />
+ </>
+ );
+};
diff --git a/frontend/src/pages/project/components/AdditionalPrivilegesRemovedSection/index.tsx b/frontend/src/pages/project/components/AdditionalPrivilegesRemovedSection/index.tsx
new file mode 100644
index 0000000000..2bd5dd2a08
--- /dev/null
+++ b/frontend/src/pages/project/components/AdditionalPrivilegesRemovedSection/index.tsx
@@ -0,0 +1 @@
+export { AdditionalPrivilegesRemovedSection } from "./AdditionalPrivilegesRemovedSection";
diff --git a/frontend/src/pages/project/components/FolderAccessSection/FolderAccessSection.tsx b/frontend/src/pages/project/components/FolderAccessSection/FolderAccessSection.tsx
index b899ee5b76..e4418a384a 100644
--- a/frontend/src/pages/project/components/FolderAccessSection/FolderAccessSection.tsx
+++ b/frontend/src/pages/project/components/FolderAccessSection/FolderAccessSection.tsx
@@ -23,6 +23,7 @@ import {
CardDescription,
CardHeader,
CardTitle,
+ DocumentationLinkBadge,
Empty,
EmptyDescription,
EmptyHeader,
@@ -63,6 +64,9 @@ import { RemoveFolderAccessDialog } from "@app/pages/secret-manager/OverviewPage
import { EditFolderAccessSheet } from "./EditFolderAccessSheet";
import { TFolderAccessSectionActor } from "./types";
+const FOLDER_ACCESS_DOCS_URL =
+ "https://infisical.com/docs/documentation/platform/access-controls/folder-rbac";
+
type Props = {
actor: TFolderAccessSectionActor;
hideActions?: boolean;
@@ -160,7 +164,10 @@ export const FolderAccessSection = ({ actor, hideActions = false }: Props) => {
<>
<Card>
<CardHeader>
- <CardTitle>Folder Access</CardTitle>
+ <CardTitle>
+ Folder Access
+ <DocumentationLinkBadge href={FOLDER_ACCESS_DOCS_URL} />
+ </CardTitle>
<CardDescription>
Folder-level access for this {actorNoun}. Overrides{" "}
{actor.type === "user" ? "their" : "its"} project roles within each folder.