Skip to content

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

remove unused stuff

Thiago Araujo da Silva0191ecbfd2c3
diff --git a/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts b/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts
index 8b91e74f15..f4769b7374 100644
--- a/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts
+++ b/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts
@@ -23,10 +23,9 @@ import {
removeUserFromGroup,
unlinkGroupFromOrg
} from "../../testUtils/groups";
-import { createIdentityActor } from "../../testUtils/identities";
+import { addIdentityProjectMembership, addIdentityToProject, createIdentityActor } from "../../testUtils/identities";
import { pollUntil } from "../../testUtils/poll";
import {
- addIdentityToProjectRequest,
inviteUsersToProject,
listAvailableProjectIdentities,
listAvailableProjectUsers
@@ -50,21 +49,6 @@ describe("Org access reconcile", () => {
const projectRows = (projectId: string, actor: { actorUserId?: string; actorIdentityId?: string }) =>
testDb(TableName.Membership).where({ scope: AccessScope.Project, scopeProjectId: projectId, ...actor });
- const insertIdentityProjectRow = async (dto: { orgId: string; projectId: string; identityId: string }) => {
- const [membership] = await testDb(TableName.Membership)
- .insert({
- scope: AccessScope.Project,
- scopeOrgId: dto.orgId,
- scopeProjectId: dto.projectId,
- actorIdentityId: dto.identityId
- })
- .returning("id");
- await testDb(TableName.MembershipRole).insert({
- membershipId: (membership as { id: string }).id,
- role: ProjectMembershipRole.Member
- });
- };
-
// Drain, then wait out anything the relay claimed first, so "rows survived" checks run after the consumer.
const reconcile = async () => {
await eventOutbox.drain(ORG_ACCESS_RECONCILE_CONSUMER);
@@ -183,8 +167,8 @@ describe("Org access reconcile", () => {
const { identityId } = await createIdentityActor({ orgId: rootOrgId, authToken: rootToken });
createdIdentityIds.push(identityId);
await testDb(TableName.IdentityGroupMembership).insert({ identityId, groupId });
- await insertIdentityProjectRow({ orgId: subOrgId, projectId: subOrgProjectId, identityId });
- await insertIdentityProjectRow({ orgId: rootOrgId, projectId: rootProjectId, identityId });
+ await addIdentityProjectMembership({ identityId, orgId: subOrgId, projectId: subOrgProjectId });
+ await addIdentityProjectMembership({ identityId, orgId: rootOrgId, projectId: rootProjectId });
await removeIdentityFromGroup({ groupId, identityId, authToken: rootToken });
await reconcile();
@@ -252,9 +236,12 @@ describe("Org access reconcile", () => {
const available = await listAvailableProjectIdentities({ projectId: subOrgProjectId, authToken: subOrgToken });
expect(available.map((identity) => identity.id)).toContain(identityId);
- await addIdentityToProjectRequest({ projectId: subOrgProjectId, identityId, authToken: subOrgToken }).expect(
- (res) => expect(res.statusCode).toBe(200)
- );
+ await addIdentityToProject({
+ projectId: subOrgProjectId,
+ identityId,
+ role: ProjectMembershipRole.Member,
+ authToken: subOrgToken
+ });
expect(await projectRows(subOrgProjectId, { actorIdentityId: identityId })).toHaveLength(1);
});
diff --git a/backend/e2e-test/testUtils/groups.ts b/backend/e2e-test/testUtils/groups.ts
index 48bf9d56f8..d8c0b44c27 100644
--- a/backend/e2e-test/testUtils/groups.ts
+++ b/backend/e2e-test/testUtils/groups.ts
@@ -4,7 +4,7 @@ import { AccessScope, OrgMembershipRole, TableName } from "@app/db/schemas";
// Group creation sits behind a plan flag the license fake turns off, so the group and its org row are
// written directly.
-export const createOrgGroup = async (dto: { orgId: string; label: string; role?: OrgMembershipRole }) => {
+export const createOrgGroup = async (dto: { orgId: string; label: string }) => {
const slug = `${dto.label}-${randomUUID().slice(0, 8)}`;
const [group] = await testDb(TableName.Groups).insert({ orgId: dto.orgId, name: slug, slug }).returning("*");
const [membership] = await testDb(TableName.Membership)
@@ -12,9 +12,9 @@ export const createOrgGroup = async (dto: { orgId: string; label: string; role?:
.returning("*");
await testDb(TableName.MembershipRole).insert({
membershipId: membership.id,
- role: dto.role ?? OrgMembershipRole.NoAccess
+ role: OrgMembershipRole.NoAccess
});
- return { groupId: group.id as string, slug };
+ return { groupId: group.id as string };
};
export const deleteGroups = async (groupIds: string[]) => {
@@ -28,15 +28,14 @@ export const deleteGroups = async (groupIds: string[]) => {
};
// `authToken` has to be scoped to the sub-org, the route reads the org from it.
-export const linkGroupToOrg = async (dto: { groupId: string; authToken: string; role?: OrgMembershipRole }) => {
+export const linkGroupToOrg = async (dto: { groupId: string; authToken: string }) => {
const res = await testServer.inject({
method: "POST",
url: `/api/v1/organizations/memberships/groups/${dto.groupId}`,
headers: { authorization: `Bearer ${dto.authToken}` },
- body: { roles: [{ role: dto.role ?? OrgMembershipRole.Member }] }
+ body: { roles: [{ role: OrgMembershipRole.Member }] }
});
expect(res.statusCode).toBe(200);
- return res.json().groupMembership.id as string;
};
export const unlinkGroupFromOrg = async (dto: { groupId: string; authToken: string }) => {
diff --git a/backend/e2e-test/testUtils/identities.ts b/backend/e2e-test/testUtils/identities.ts
index bcf1bc7251..a1fece7597 100644
--- a/backend/e2e-test/testUtils/identities.ts
+++ b/backend/e2e-test/testUtils/identities.ts
@@ -1,6 +1,6 @@
import { randomUUID } from "node:crypto";
-import { OrgMembershipRole, ProjectMembershipRole, SecretFolderRole } from "@app/db/schemas";
+import { AccessScope, OrgMembershipRole, ProjectMembershipRole, SecretFolderRole, TableName } from "@app/db/schemas";
// A machine identity is the actor to reach for when a spec needs a second, less privileged
// principal. A second *user* cannot be made over the API at all (the real path is invite, email,
@@ -72,6 +72,26 @@ export const addIdentityToProject = async (dto: {
expect(res.statusCode).toBe(200);
};
+export const addIdentityProjectMembership = async (dto: {
+ identityId: string;
+ orgId: string;
+ projectId: string;
+ role?: ProjectMembershipRole;
+}) => {
+ const [membership] = await testDb(TableName.Membership)
+ .insert({
+ scope: AccessScope.Project,
+ scopeOrgId: dto.orgId,
+ scopeProjectId: dto.projectId,
+ actorIdentityId: dto.identityId
+ })
+ .returning("id");
+ await testDb(TableName.MembershipRole).insert({
+ membershipId: (membership as { id: string }).id,
+ role: dto.role ?? ProjectMembershipRole.Member
+ });
+};
+
export const grantIdentityFolderAccess = async (dto: {
projectId: string;
identityId: string;
diff --git a/backend/e2e-test/testUtils/project-members.ts b/backend/e2e-test/testUtils/project-members.ts
index 983000ee8f..a68787abcc 100644
--- a/backend/e2e-test/testUtils/project-members.ts
+++ b/backend/e2e-test/testUtils/project-members.ts
@@ -33,14 +33,3 @@ export const inviteUsersToProject = (dto: { projectId: string; usernames: string
},
(res) => res.json().memberships as { id: string }[]
);
-
-export const addIdentityToProjectRequest = (dto: { projectId: string; identityId: string; authToken: string }) =>
- request(
- {
- method: "POST",
- url: `/api/v1/projects/${dto.projectId}/memberships/identities/${dto.identityId}`,
- headers: { authorization: `Bearer ${dto.authToken}` },
- body: { roles: [{ role: ProjectMembershipRole.Member }] }
- },
- (res) => res.json()
- );
diff --git a/backend/src/ee/services/group/group-service.ts b/backend/src/ee/services/group/group-service.ts
index 1b57f15f7d..bc90dbaeaf 100644
--- a/backend/src/ee/services/group/group-service.ts
+++ b/backend/src/ee/services/group/group-service.ts
@@ -100,10 +100,7 @@ type TGroupServiceFactoryDep = {
| "findGroupActorsAndOrgs"
| "findGroupOrgIds"
>;
- membershipGroupDAL: Pick<
- TMembershipGroupDALFactory,
- "find" | "findOne" | "create" | "getGroupById" | "deleteById" | "delete"
- >;
+ membershipGroupDAL: Pick<TMembershipGroupDALFactory, "find" | "findOne" | "create" | "getGroupById">;
membershipDAL: Pick<TMembershipDALFactory, "find" | "findOne">;
membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "delete">;
orgDAL: Pick<TOrgDALFactory, "findMembership" | "countAllOrgMembers" | "findById" | "lockActorsForOrgAccess">;
diff --git a/backend/src/ee/services/group/group-types.ts b/backend/src/ee/services/group/group-types.ts
index 1ca60932de..151e87cfde 100644
--- a/backend/src/ee/services/group/group-types.ts
+++ b/backend/src/ee/services/group/group-types.ts
@@ -141,6 +141,9 @@ export type TAddIdentitiesToGroup = {
usageMeteringService?: Pick<TUsageMeteringServiceFactory, "emit">;
};
+// Structural instead of Pick<TGroupDALFactory>, since group-dal.ts imports this file.
+type TGroupOrgIdsDAL = { findGroupOrgIds: (groupId: string, tx?: Knex) => Promise<string[]> };
+
export type TRemoveUsersFromGroupByUserIds = {
group: { id: string; name: string; slug: string; orgId: string };
userIds: string[];
@@ -172,9 +175,6 @@ export type TRemoveIdentitiesFromGroup = {
eventEmitter: TEventEmitter;
};
-// Structural instead of Pick<TGroupDALFactory>, since group-dal.ts imports this file.
-export type TGroupOrgIdsDAL = { findGroupOrgIds: (groupId: string, tx?: Knex) => Promise<string[]> };
-
export type TConvertPendingGroupAdditionsToGroupMemberships = {
userIds: string[];
userDAL: Pick<TUserDALFactory, "findUserEncKeyByUserIdsBatch" | "transaction" | "find" | "findById">;
diff --git a/backend/src/services/membership/application-membership-cleanup-service.ts b/backend/src/services/membership/application-membership-cleanup-service.ts
index fff3371550..af0482e62c 100644
--- a/backend/src/services/membership/application-membership-cleanup-service.ts
+++ b/backend/src/services/membership/application-membership-cleanup-service.ts
@@ -17,7 +17,7 @@ type TApplicationMembershipCleanupServiceFactoryDep = {
export type TApplicationMembershipCleanupServiceFactory = ReturnType<typeof applicationMembershipCleanupServiceFactory>;
-export const APPLICATION_APPROVAL_SCOPES = [ApprovalPolicyScope.PkiApplication, ApprovalPolicyScope.Signer];
+const APPLICATION_APPROVAL_SCOPES = [ApprovalPolicyScope.PkiApplication, ApprovalPolicyScope.Signer];
export const applicationMembershipCleanupServiceFactory = ({
membershipDAL,
diff --git a/backend/src/services/membership/project-access-revoke-service.ts b/backend/src/services/membership/project-access-revoke-service.ts
index c70d2a55d5..ffa242a2d0 100644
--- a/backend/src/services/membership/project-access-revoke-service.ts
+++ b/backend/src/services/membership/project-access-revoke-service.ts
@@ -14,7 +14,7 @@ import { TApplicationMembershipCleanupServiceFactory } from "./application-membe
import { TMembershipDALFactory } from "./membership-dal";
type TProjectAccessRevokeServiceFactoryDep = {
- membershipDAL: Pick<TMembershipDALFactory, "find" | "delete">;
+ membershipDAL: Pick<TMembershipDALFactory, "delete">;
projectDAL: Pick<TProjectDALFactory, "find">;
projectKeyDAL: Pick<TProjectKeyDALFactory, "delete">;
additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;
@@ -29,7 +29,7 @@ type TProjectAccessRevokeServiceFactoryDep = {
export type TProjectAccessRevokeServiceFactory = ReturnType<typeof projectAccessRevokeServiceFactory>;
-export type TRevokedProjectResource = { projectId: string; resourceType: string; resourceId: string };
+type TRevokedProjectResource = { projectId: string; resourceType: string; resourceId: string };
export type TRevokedProjectAccess = {
userId?: string;
identityId?: string;
diff --git a/backend/src/services/org/org-access-reconcile-consumer.ts b/backend/src/services/org/org-access-reconcile-consumer.ts
index cb29dc997a..c61ebf04b5 100644
--- a/backend/src/services/org/org-access-reconcile-consumer.ts
+++ b/backend/src/services/org/org-access-reconcile-consumer.ts
@@ -34,7 +34,7 @@ export const ORG_ACCESS_RECONCILE_CONSUMER = "org-access-reconcile";
export const ACTORS_PER_RECONCILE_TX = 10;
const RECONCILE_STATEMENT_TIMEOUT_MS = 30_000;
-export type TOrgAccessReconcileConsumerDep = {
+type TOrgAccessReconcileConsumerDep = {
orgDAL: Pick<
TOrgDALFactory,
"findById" | "find" | "findActorsWithOrgAccess" | "lockActorsForOrgAccess" | "transaction"
diff --git a/backend/src/services/org/org-dal.ts b/backend/src/services/org/org-dal.ts
index d12a4a3ce3..c6aedde288 100644
--- a/backend/src/services/org/org-dal.ts
+++ b/backend/src/services/org/org-dal.ts
@@ -43,12 +43,12 @@ interface CountResult {
const SCIM_USER_ALIAS = "scim_user_alias";
-export type TOrgAccessActors = {
+type TOrgAccessActors = {
userIds: Set<string>;
identityIds: Set<string>;
};
-export type TOrphanedProjectActor = {
+type TOrphanedProjectActor = {
actorUserId: string | null;
actorIdentityId: string | null;
scopeOrgId: string;
@@ -1287,12 +1287,15 @@ export const orgDALFactory = (db: TDbClient) => {
// (actor, org) pairs with a project or resource row in an org they no longer reach. Resource rows count on
// their own (a group-derived PAM admin's folder row has no project row). Skips ghost users, they never
// have an org row. One streaming pass against a hash of org rows; collapsing to pairs first was measured
- // and just moved the cost into an aggregate. Without a tx it runs in its own replica tx so
- // `statementTimeoutMs` can bound it: an overrunning backstop should fail, not keep the replica busy.
- const findOrphanedProjectActors = async (
- { limit, statementTimeoutMs }: { limit: number; statementTimeoutMs?: number },
- tx?: Knex
- ) => {
+ // and just moved the cost into an aggregate. Runs in its own replica tx so `statementTimeoutMs` can
+ // bound it: an overrunning backstop should fail, not keep the replica busy.
+ const findOrphanedProjectActors = async ({
+ limit,
+ statementTimeoutMs
+ }: {
+ limit: number;
+ statementTimeoutMs?: number;
+ }) => {
const m = TableName.Membership;
const query = async (conn: Knex): Promise<TOrphanedProjectActor[]> => {
@@ -1345,7 +1348,6 @@ export const orgDALFactory = (db: TDbClient) => {
};
try {
- if (tx) return await query(tx);
return await db.replicaNode().transaction(async (trx) => {
if (statementTimeoutMs) await trx.raw(`SET LOCAL statement_timeout = ${Math.floor(statementTimeoutMs)}`);
return query(trx);
diff --git a/frontend/src/hooks/api/pam/mutations.tsx b/frontend/src/hooks/api/pam/mutations.tsx
index c4e94a6135..d44118e36b 100644
--- a/frontend/src/hooks/api/pam/mutations.tsx
+++ b/frontend/src/hooks/api/pam/mutations.tsx
@@ -561,7 +561,6 @@ export const useUpdatePamProductUserMember = () => {
onSuccess: (_, { projectId }) => {
queryClient.invalidateQueries({ queryKey: pamKeys.all });
queryClient.invalidateQueries({ queryKey: projectKeys.getProjectUsers(projectId) });
- queryClient.invalidateQueries({ queryKey: projectKeys.getAvailableProjectUsers(projectId) });
}
});
};
diff --git a/frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx b/frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx
index c16ccc8315..07e5128f01 100644
--- a/frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx
+++ b/frontend/src/pages/pam/PamAccessControlPage/components/InviteMemberModal.tsx
@@ -101,7 +101,6 @@ export const InviteMemberModal = ({ isOpen, onOpenChange }: Props) => {
addUser(
{
userIds: selectedUsers.map((selection) => selection.value),
- emails: [],
role: selectedRole,
projectId: currentProject.id
},
diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
index 405e68d5bf..38897b3a53 100644
--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx
@@ -55,8 +55,7 @@ const addMemberFormSchema = z.object({
.array(
z.object({
label: z.string().trim(),
- value: z.string().trim(),
- isNewInvitee: z.boolean().optional()
+ value: z.string().trim()
})
)
.min(1),
@@ -203,7 +202,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
const requesterStatus = {
isProjectUser: Boolean(requesterEmail) && wsUserUsernames.has(requesterEmail as string),
userLabel: requester ? getUserLabel(requester) : "",
- userId: requester?.username
+ hasRequester: Boolean(requester)
};
if (!requesterStatus.isProjectUser && requester) {
setValue("orgMemberships", [{ value: requester.username, label: requesterStatus.userLabel }]);
@@ -297,7 +296,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
</>
)}
onCreateOption={(inputValue) =>
- append({ label: inputValue, value: inputValue, isNewInvitee: true })
+ append({ label: inputValue, value: inputValue })
}
formatCreateLabel={(inputValue) => `Invite "${inputValue}"`}
isValidNewOption={(input) =>
@@ -367,7 +366,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
)}
{requesterEmail &&
!projectInviteList.requesterStatus.isProjectUser &&
- projectInviteList.requesterStatus.userId && (
+ projectInviteList.requesterStatus.hasRequester && (
<Alert>
<AlertDescription>
<p>