Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
fix pam group assign
Thiago Araujo da Silva4eeb9003bef2
diff --git a/frontend/src/pages/pam/PamAccountsPage/components/AccountDetailSheet.tsx b/frontend/src/pages/pam/PamAccountsPage/components/AccountDetailSheet.tsxindex 005991411c..27e2ad6e9b 100644--- a/frontend/src/pages/pam/PamAccountsPage/components/AccountDetailSheet.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/components/AccountDetailSheet.tsx@@ -72,7 +72,6 @@ import {useRemoveAccountMember,useUpdatePamAccount} from "@app/hooks/api/pam";-import { useGetOrgUsers } from "@app/hooks/api/users/queries";import { PamSheetTab, usePamSheetState } from "@app/hooks/usePamSheetState";import { AccountPlatformIcon } from "../../components/AccountPlatformIcon";@@ -89,6 +88,7 @@ import { PendingInvitationBadge } from "../../components/PendingInvitationBadge"import { RemoveMemberConfirm } from "../../components/RemoveMemberConfirm";import { SheetSaveBar } from "../../components/SheetSaveBar";import { TabWarningPing } from "../../components/TabWarningPing";+import { usePamProductUsers } from "../../components/usePamProductUsers";import { AssignAccessModal, EditMemberTarget } from "./AssignAccessModal";import { EditAccountForm } from "./EditAccountForm";import { RecordingConnectionPicker } from "./RecordingConnectionPicker";@@ -137,7 +137,7 @@ const PermissionsTab = ({navigate({ search: { folderId, tab: PamSheetTab.Permissions } as any });};const { data: resourceRoles } = useListPamResourceRoles();- const { data: orgUsers } = useGetOrgUsers(currentOrg.id);+ const { userMap } = usePamProductUsers();const { data: orgGroups } = useGetOrganizationGroups(currentOrg.id);const groupMap = useMemo(() => new Map((orgGroups ?? []).map((g) => [g.id, g.name] as const)),@@ -193,25 +193,6 @@ const PermissionsTab = ({[accountMembers]);- const userMap = useMemo(- () =>- new Map(- (orgUsers ?? []).map((ou) => {- const name =- [ou.user.firstName, ou.user.lastName].filter(Boolean).join(" ") || ou.user.username;- return [- ou.user.id,- {- name,- email: ou.user.email ?? ou.inviteEmail ?? ou.user.username,- isPendingInvitation: ou.status === "invited"- }- ] as const;- })- ),- [orgUsers]- );-const directMembers = useMemo<ResolvedMember[]>(() => {const users = (accountMembers?.users ?? []).map((m) => {const info = m.userId ? userMap.get(m.userId) : undefined;diff --git a/frontend/src/pages/pam/PamAccountsPage/components/AssignAccessModal.tsx b/frontend/src/pages/pam/PamAccountsPage/components/AssignAccessModal.tsxindex 22d7fd387a..dd556f0dab 100644--- a/frontend/src/pages/pam/PamAccountsPage/components/AssignAccessModal.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/components/AssignAccessModal.tsx@@ -30,7 +30,6 @@ import {useAddFolderMember,useListPamProductGroups,useListPamProductIdentities,- useListPamProductMembers,useListPamResourceRoles,useUpdateAccountGroupMemberRole,useUpdateAccountIdentityMemberRole,@@ -39,9 +38,9 @@ import {useUpdateFolderIdentityMemberRole,useUpdateFolderMemberRole} from "@app/hooks/api/pam";-import { useGetOrgUsers } from "@app/hooks/api/users/queries";import { PamMemberKind, PamMembershipScope } from "../../components/memberEnums";+import { usePamProductUsers } from "../../components/usePamProductUsers";type AssigneeOption = {value: string;@@ -97,9 +96,8 @@ export const AssignAccessModal = ({editMember}: Props) => {const { currentOrg } = useOrganization();- const { data: orgUsers } = useGetOrgUsers(currentOrg.id);+ const { users: productUsers } = usePamProductUsers();const { data: orgGroups } = useGetOrganizationGroups(currentOrg.id);- const { data: productMembers } = useListPamProductMembers();const { data: productGroups } = useListPamProductGroups();// Product identity members carry the identity name, covering both org-level and PAM-scoped identitiesconst { data: productIdentities } = useListPamProductIdentities();@@ -149,10 +147,6 @@ export const AssignAccessModal = ({};}, [editMember]);- const pamUserIds = useMemo(- () => new Set((productMembers ?? []).map((m) => m.userId).filter(Boolean) as string[]),- [productMembers]- );const pamGroupIds = useMemo(() => new Set((productGroups ?? []).map((m) => m.groupId).filter(Boolean) as string[]),[productGroups]@@ -163,17 +157,9 @@ export const AssignAccessModal = ({.filter((g) => pamGroupIds.has(g.id) && !existingGroupIds.has(g.id)).map((g) => ({ value: g.id, label: g.name, kind: PamMemberKind.Group, subtitle: "Group" }));- const users: AssigneeOption[] = (orgUsers ?? [])- .filter((ou) => ou.user.id && pamUserIds.has(ou.user.id) && !existingUserIds.has(ou.user.id))- .map((ou) => {- const name = [ou.user.firstName, ou.user.lastName].filter(Boolean).join(" ");- return {- value: ou.user.id,- label: name || ou.user.email || ou.inviteEmail || ou.user.username,- kind: PamMemberKind.User,- subtitle: ou.user.email ?? ou.inviteEmail ?? ""- };- });+ const users: AssigneeOption[] = productUsers+ .filter((u) => !existingUserIds.has(u.id))+ .map((u) => ({ value: u.id, label: u.name, kind: PamMemberKind.User, subtitle: u.email }));const existingIds = existingIdentityIds ?? new Set<string>();const identities: AssigneeOption[] = (productIdentities ?? [])@@ -189,10 +175,9 @@ export const AssignAccessModal = ({return [...groups, ...identities, ...users];}, [orgGroups,- orgUsers,+ productUsers,productIdentities,pamGroupIds,- pamUserIds,existingGroupIds,existingUserIds,existingIdentityIdsdiff --git a/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx b/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsxindex 6bb5d7cbfa..fbbdf63f83 100644--- a/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx@@ -68,7 +68,6 @@ import {useSetPamApprovalConfig} from "@app/hooks/api/pam";import { TPamAccessRequest, TPamNotificationConfig } from "@app/hooks/api/pam/types";-import { useGetOrgUsers } from "@app/hooks/api/users/queries";import { AlertAction } from "@app/views/Alerts";import { AccessTypeBadge } from "../../components/AccessTypeBadge";@@ -84,6 +83,7 @@ import {toAutoApprovalDraft} from "../../components/auto-approval/autoApprovalDraft";import { getRequesterSubtitle } from "../../components/requesterDisplay";+import { usePamProductUsers } from "../../components/usePamProductUsers";import { FolderNotificationsSection } from "./FolderNotificationsSection";type ApproverEntry = { type: PamApproverType; id: string };@@ -125,7 +125,7 @@ export const FolderApprovalsTab = ({ folderId, onDirtyChange }: Props) => {const { currentProject } = useProject();const { subscription } = useSubscription();const { data: config, isLoading } = useGetPamApprovalConfig(folderId);- const { data: orgUsers } = useGetOrgUsers(currentOrg.id);+ const { users: productUsers, userMap: productUserMap } = usePamProductUsers();const { data: orgGroups } = useGetOrganizationGroups(currentOrg.id);const { data: folderMembers } = useListFolderMembers(folderId);const setConfig = useSetPamApprovalConfig();@@ -257,18 +257,8 @@ export const FolderApprovalsTab = ({ folderId, onDirtyChange }: Props) => {);const userMap = useMemo(- () =>- new Map(- (orgUsers ?? []).map((ou) => [- ou.user.id,- {- label:- [ou.user.firstName, ou.user.lastName].filter(Boolean).join(" ") || ou.user.username,- email: ou.user.email ?? ou.inviteEmail ?? ou.user.username- }- ])- ),- [orgUsers]+ () => new Map([...productUserMap].map(([id, u]) => [id, { label: u.name, email: u.email }])),+ [productUserMap]);const groupMap = useMemo(@@ -291,48 +281,24 @@ export const FolderApprovalsTab = ({ folderId, onDirtyChange }: Props) => {.filter((g) => memberGroupIds.has(g.id) && !selectedIds.has(`group:${g.id}`)).map((g) => ({ value: g.id, label: g.name, kind: PamApproverType.Group, subtitle: "Group" }));- const users: ApproverOption[] = (orgUsers ?? [])- .filter(- (ou) =>- ou.user.id && memberUserIds.has(ou.user.id) && !selectedIds.has(`user:${ou.user.id}`)- )- .map((ou) => {- const name = [ou.user.firstName, ou.user.lastName].filter(Boolean).join(" ");- return {- value: ou.user.id,- label: name || ou.user.email || ou.inviteEmail || ou.user.username,- kind: PamApproverType.User,- subtitle: ou.user.email ?? ou.inviteEmail ?? ""- };- });+ const users: ApproverOption[] = productUsers+ .filter((u) => memberUserIds.has(u.id) && !selectedIds.has(`user:${u.id}`))+ .map((u) => ({ value: u.id, label: u.name, kind: PamApproverType.User, subtitle: u.email }));return [...groups, ...users];- }, [orgGroups, orgUsers, selectedIds, memberUserIds, memberGroupIds]);+ }, [orgGroups, productUsers, selectedIds, memberUserIds, memberGroupIds]);const breakGlassOptions = useMemo<ApproverOption[]>(() => {const groups: ApproverOption[] = (orgGroups ?? []).filter((g) => memberGroupIds.has(g.id) && !selectedBreakGlassIds.has(`group:${g.id}`)).map((g) => ({ value: g.id, label: g.name, kind: PamApproverType.Group, subtitle: "Group" }));- const users: ApproverOption[] = (orgUsers ?? [])- .filter(- (ou) =>- ou.user.id &&- memberUserIds.has(ou.user.id) &&- !selectedBreakGlassIds.has(`user:${ou.user.id}`)- )- .map((ou) => {- const name = [ou.user.firstName, ou.user.lastName].filter(Boolean).join(" ");- return {- value: ou.user.id,- label: name || ou.user.email || ou.inviteEmail || ou.user.username,- kind: PamApproverType.User,- subtitle: ou.user.email ?? ou.inviteEmail ?? ""- };- });+ const users: ApproverOption[] = productUsers+ .filter((u) => memberUserIds.has(u.id) && !selectedBreakGlassIds.has(`user:${u.id}`))+ .map((u) => ({ value: u.id, label: u.name, kind: PamApproverType.User, subtitle: u.email }));return [...groups, ...users];- }, [orgGroups, orgUsers, selectedBreakGlassIds, memberUserIds, memberGroupIds]);+ }, [orgGroups, productUsers, selectedBreakGlassIds, memberUserIds, memberGroupIds]);const addApprover = (opt: ApproverOption | null) => {if (!opt) return;diff --git a/frontend/src/pages/pam/PamAccountsPage/components/FolderDetailSheet.tsx b/frontend/src/pages/pam/PamAccountsPage/components/FolderDetailSheet.tsxindex 87f8e811c4..9df29843c1 100644--- a/frontend/src/pages/pam/PamAccountsPage/components/FolderDetailSheet.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/components/FolderDetailSheet.tsx@@ -48,7 +48,6 @@ import {useRemoveFolderMember,useUpdatePamFolder} from "@app/hooks/api/pam";-import { useGetOrgUsers } from "@app/hooks/api/users/queries";import { PamSheetTab } from "@app/hooks/usePamSheetState";import { PamMemberKind, PamMembershipScope } from "../../components/memberEnums";@@ -62,6 +61,7 @@ import { PAM_FOLDER_TABS, visiblePamTabs } from "../../components/pamResourceTabimport { PendingInvitationBadge } from "../../components/PendingInvitationBadge";import { RemoveMemberConfirm } from "../../components/RemoveMemberConfirm";import { SheetSaveBar } from "../../components/SheetSaveBar";+import { usePamProductUsers } from "../../components/usePamProductUsers";import { AssignAccessModal, EditMemberTarget } from "./AssignAccessModal";import { FolderApprovalsTab } from "./FolderApprovalsTab";@@ -181,7 +181,7 @@ const PermissionsTab = ({ folderId }: { folderId: string }) => {const { user } = useUser();const { data: folderMembers, isLoading } = useListFolderMembers(folderId);const { data: resourceRoles } = useListPamResourceRoles();- const { data: orgUsers } = useGetOrgUsers(currentOrg.id);+ const { userMap } = usePamProductUsers();const { data: orgGroups } = useGetOrganizationGroups(currentOrg.id);const groupMap = useMemo(() => new Map((orgGroups ?? []).map((g) => [g.id, g.name] as const)),@@ -237,25 +237,6 @@ const PermissionsTab = ({ folderId }: { folderId: string }) => {[folderMembers]);- const userMap = useMemo(- () =>- new Map(- (orgUsers ?? []).map((ou) => {- const name =- [ou.user.firstName, ou.user.lastName].filter(Boolean).join(" ") || ou.user.username;- return [- ou.user.id,- {- name,- email: ou.user.email ?? ou.inviteEmail ?? ou.user.username,- isPendingInvitation: ou.status === "invited"- }- ] as const;- })- ),- [orgUsers]- );-const resolvedMembers = useMemo(() => {const users: ResolvedMember[] = (folderMembers?.users ?? []).map((m) => {const info = m.userId ? userMap.get(m.userId) : undefined;diff --git a/frontend/src/pages/pam/components/usePamProductUsers.ts b/frontend/src/pages/pam/components/usePamProductUsers.tsnew file mode 100644index 0000000000..a1ea4ed1dc--- /dev/null+++ b/frontend/src/pages/pam/components/usePamProductUsers.ts@@ -0,0 +1,32 @@+import { useMemo } from "react";++import { useProject } from "@app/context";+import { useGetWorkspaceUsers } from "@app/hooks/api";++export type TPamProductUser = {+ id: string;+ name: string;+ email: string;+ isPendingInvitation: boolean;+};++// A PAM member can reach the org only through a linked group, so the org member list (direct org rows)+// can't name them. Product membership is a project membership, so the project's user list covers everyone.+export const usePamProductUsers = () => {+ const { currentProject } = useProject();+ const { data: members } = useGetWorkspaceUsers(currentProject.id);++ const users = useMemo<TPamProductUser[]>(+ () =>+ (members ?? []).map((m) => ({+ id: m.user.id,+ name: [m.user.firstName, m.user.lastName].filter(Boolean).join(" ") || m.user.username,+ email: m.user.email ?? m.inviteEmail ?? m.user.username,+ isPendingInvitation: m.user.isOrgMembershipPending+ })),+ [members]+ );+ const userMap = useMemo(() => new Map(users.map((u) => [u.id, u] as const)), [users]);++ return { users, userMap };+};