Skip to content

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

remove check of is pending

adilsondeda107a385f
diff --git a/backend/e2e-test/routes/v1/secret-approval-policy.spec.ts b/backend/e2e-test/routes/v1/secret-approval-policy.spec.ts
index 623a94643c..55fe22d786 100644
--- a/backend/e2e-test/routes/v1/secret-approval-policy.spec.ts
+++ b/backend/e2e-test/routes/v1/secret-approval-policy.spec.ts
@@ -263,7 +263,7 @@ describe("Secret approval policy router", async () => {
}
});
- test("Create policy fails when user approver is in a project group but has not accepted the org invite", async () => {
+ test("Create policy succeeds when user approver is in a project group but has not accepted the org invite", async () => {
const db = getDb();
const group = await seedGroup(db, { slug: "sap-group-invited-user-approver", addToProject: true });
const user = await seedGroupOnlyUser(db, {
@@ -271,12 +271,14 @@ describe("Secret approval policy router", async () => {
orgMembershipStatus: OrgMembershipStatus.Invited
});
+ let policyId: string | undefined;
try {
const res = await createPolicyWithUserApprover(user.id, "/group-invited-user-approver");
- expect(res.statusCode).toBe(400);
- expect(res.json().message).toContain("not members of the project");
+ expect(res.statusCode).toBe(200);
+ policyId = res.json().approval.id;
} finally {
+ if (policyId) await db(TableName.SecretApprovalPolicy).where({ id: policyId }).del();
await cleanupGroupOnlyUser(db, user.id);
await cleanupGroup(db, group.id);
}
diff --git a/backend/src/services/project/project-dal.ts b/backend/src/services/project/project-dal.ts
index deaf4a07e4..075f5d25ef 100644
--- a/backend/src/services/project/project-dal.ts
+++ b/backend/src/services/project/project-dal.ts
@@ -3,7 +3,6 @@ import { Knex } from "knex";
import { TDbClient } from "@app/db";
import {
AccessScope,
- OrgMembershipStatus,
ProjectsSchema,
ProjectType,
ProjectUpgradeStatus,
@@ -514,23 +513,13 @@ export const projectDALFactory = (db: TDbClient) => {
}
const conn = tx || db.replicaNode();
- // A group-derived user counts only with an accepted org membership. user_group_membership.isPending
- // cannot tell that apart: it is set when a user is added before accepting the invite and never cleared.
- const acceptedOrgUserIds = conn(TableName.Membership)
- .where(`${TableName.Membership}.scope`, AccessScope.Organization)
- .where(`${TableName.Membership}.scopeOrgId`, orgId)
- .where(`${TableName.Membership}.status`, OrgMembershipStatus.Accepted)
- .whereIn(`${TableName.Membership}.actorUserId`, uniqueUserIds)
- .select(db.ref("actorUserId").withSchema(TableName.Membership));
-
const rows = await conn(TableName.Membership)
.join(TableName.Project, `${TableName.Membership}.scopeProjectId`, `${TableName.Project}.id`)
- .leftJoin(TableName.UserGroupMembership, function joinUserGroupMembership() {
- this.on(`${TableName.Membership}.actorGroupId`, `${TableName.UserGroupMembership}.groupId`).onIn(
- `${TableName.UserGroupMembership}.userId`,
- db.raw("?", [acceptedOrgUserIds])
- );
- })
+ .leftJoin(
+ TableName.UserGroupMembership,
+ `${TableName.Membership}.actorGroupId`,
+ `${TableName.UserGroupMembership}.groupId`
+ )
.where(`${TableName.Membership}.scope`, AccessScope.Project)
.where(`${TableName.Membership}.scopeOrgId`, orgId)
.where(`${TableName.Membership}.scopeProjectId`, projectId)