Skip to content

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

Merge branch 'main' into ENG-5826

Thiago Araujo da Silva256bef066ccd
diff --cc backend/src/ee/services/agent-vault-member/agent-vault-membership-service.ts
index e0858c18f9,c1f1c8d431..8d244befe6
--- a/backend/src/ee/services/agent-vault-member/agent-vault-membership-service.ts
+++ b/backend/src/ee/services/agent-vault-member/agent-vault-membership-service.ts
@@@ -47,10 -50,10 +51,10 @@@ type TAgentVaultMembershipServiceFactor
projectAccessRequestDAL: Pick<TProjectAccessRequestDALFactory, "delete">;
userDAL: Pick<TUserDALFactory, "find">;
userAliasDAL: Pick<TUserAliasDALFactory, "findBySsoExternalIds">;
- orgDAL: Pick<TOrgDALFactory, "findById">;
+ orgDAL: Pick<TOrgDALFactory, "findById" | "findActorsWithActiveOrgAccess" | "lockActorsForOrgAccess">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
usageMeteringService: Pick<TUsageMeteringServiceFactory, "emitForProject">;
- };
+ } & TClearPersonalValuesDeps;
export type TAgentVaultMembershipServiceFactory = ReturnType<typeof agentVaultMembershipServiceFactory>;
diff --cc backend/src/ee/services/audit-log/audit-log-types.ts
index 667def8db1,72a61ea5f8..87a7e0de78
--- a/backend/src/ee/services/audit-log/audit-log-types.ts
+++ b/backend/src/ee/services/audit-log/audit-log-types.ts
@@@ -59,7 -59,7 +59,8 @@@ import
TOidcAuthDetails
} from "@app/services/identity-access-token/identity-access-token-types";
import { TAllowedFields } from "@app/services/identity-ldap-auth/identity-ldap-auth-types";
+ import { ObjectStorageType } from "@app/services/object-storage/object-storage-types";
+import { OrgAccessRemovalCause } from "@app/services/org/org-membership-events";
import { PkiAlertEventType } from "@app/services/pki-alert-v2/pki-alert-v2-types";
import { PkiItemType } from "@app/services/pki-collection/pki-collection-types";
import { THealthCheckCommandResult } from "@app/services/pki-sync/pki-sync-health-check-command-fns";
diff --cc frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx
index 07e5128f01,cea8fc6ab1..daaefbf18e
--- a/frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx
+++ b/frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx
@@@ -13,14 -14,13 +14,13 @@@ import
DialogHeader,
DialogTitle,
Field,
- FieldLabel,
- FilterableSelect
+ FieldLabel
} from "@app/components/v3";
-import { useOrganization, useProject } from "@app/context";
-import { useGetOrgUsers, useGetWorkspaceUsers } from "@app/hooks/api";
+import { useProject } from "@app/context";
+import { useGetAvailableProjectUsers, useGetWorkspaceUsers } from "@app/hooks/api";
import { useAddPamProductUserMember } from "@app/hooks/api/pam";
import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { getRequesterStatus } from "@app/lib/fn/requesterStatus";
+import { TAvailableProjectUser } from "@app/hooks/api/users/types";
import { ProductRoleOptionList } from "./ProductRoleOptionList";
diff --cc frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
index 38897b3a53,828c0ff1b0..ae4c975751
--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
@@@ -280,32 -312,44 +279,29 @@@ export const AddMemberModal = ({ popUp
</FieldLabel>
<FieldContent>
{canInviteNewMembers ? (
- <CreatableSelect
- /* eslint-disable-next-line react/no-unstable-nested-components */
- noOptionsMessage={() => (
- <>
- {!projectInviteList.list.length && (
- <p>
- All organization members are already assigned to{" "}
- {projectsHidden ? productLabel : "this project"}.
- </p>
- )}
- <p>
- Invite new users to your organization by typing out their email address.
- </p>
- </>
- )}
- onCreateOption={(inputValue) =>
- append({ label: inputValue, value: inputValue })
- }
- formatCreateLabel={(inputValue) => `Invite "${inputValue}"`}
- isValidNewOption={(input) =>
- Boolean(input) &&
- isValidEmail(input) &&
- !projectInviteList.knownUsernames.has(input)
+ <Combobox
+ listFooter={
+ projectInviteList.list.length ? undefined : (
+ <>
+ All organization members are already assigned to{" "}
+ {projectsHidden ? productLabel : "this project"}.
+ </>
+ )
}
+ creation={{
+ mode: "inline",
- onCreate: (inputValue) =>
- append({ label: inputValue, value: inputValue, isNewInvitee: true }),
++ onCreate: (inputValue) => append({ label: inputValue, value: inputValue }),
+ formatLabel: (inputValue) => `Invite "${inputValue}"`,
+ emptyLabel:
+ "Invite new users to your organization by typing out their email address.",
+ isValid: (input) =>
+ Boolean(input) &&
+ isValidEmail(input) &&
- !orgUsers
- ?.flatMap(({ user }) => {
- const emails: string[] = [];
-
- if (user.email) {
- emails.push(user.email);
- }
-
- if (user.username) {
- emails.push(user.username);
- }
-
- return emails;
- })
- .includes(input)
++ !projectInviteList.knownUsernames.has(input)
+ }}
placeholder="Add one or more users..."
- isMulti
+ searchAriaLabel="Search users"
+ multiple
name="members"
options={projectInviteList.list}
value={field.value}