awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 09:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(access-request): code improvements

Browse Source
This commit is contained in:
carlosmonastyrski
2025-05-30 14:53:12 -03:00
parent 858ec2095e
commit 85fefb2a82
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20250530152721_add-access-approval-request-deleted-at.ts
+5 -3
View File
@@ -1,5 +1,7 @@
import { Knex } from "knex"; import { Knex } from "knex";
import { ApprovalStatus } from "@app/ee/services/secret-approval-request/secret-approval-request-types";
import { TableName } from "../schemas"; import { TableName } from "../schemas";
export async function up(knex: Knex): Promise<void> { export async function up(knex: Knex): Promise<void> {
@@ -17,12 +19,12 @@ export async function up(knex: Knex): Promise<void> {
if (!hasStatusColumn) { if (!hasStatusColumn) {
await knex.schema.alterTable(TableName.AccessApprovalRequest, (t) => { await knex.schema.alterTable(TableName.AccessApprovalRequest, (t) => {
t.string("status").defaultTo("pending").notNullable(); t.string("status").defaultTo(ApprovalStatus.PENDING).notNullable();
}); });
// Update existing rows based on business logic // Update existing rows based on business logic
// If privilegeId is not null, set status to "approved" // If privilegeId is not null, set status to "approved"
await knex(TableName.AccessApprovalRequest).whereNotNull("privilegeId").update({ status: "approved" }); await knex(TableName.AccessApprovalRequest).whereNotNull("privilegeId").update({ status: ApprovalStatus.APPROVED });
// If privilegeId is null and there's a rejected reviewer, set to "rejected" // If privilegeId is null and there's a rejected reviewer, set to "rejected"
const rejectedRequestIds = await knex(TableName.AccessApprovalRequestReviewer) const rejectedRequestIds = await knex(TableName.AccessApprovalRequestReviewer)
@@ -35,7 +37,7 @@ export async function up(knex: Knex): Promise<void> {
await knex(TableName.AccessApprovalRequest) await knex(TableName.AccessApprovalRequest)
.whereNull("privilegeId") .whereNull("privilegeId")
.whereIn("id", rejectedRequestIds) .whereIn("id", rejectedRequestIds)
.update({ status: "rejected" }); .update({ status: ApprovalStatus.REJECTED });
} }
} }
} }
backend/src/ee/services/access-approval-request/access-approval-request-dal.ts
+1 -1
View File
@@ -392,7 +392,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient) => {
] ]
}); });
// an approval is pending if there is no reviewer rejections, no privilege ID is set and the number of approvals is less than the number of approvals required // an approval is pending if there is no reviewer rejections, no privilege ID is set and the status is pending
const pendingApprovals = formattedRequests.filter( const pendingApprovals = formattedRequests.filter(
(req) => (req) =>
!req.privilegeId && !req.privilegeId &&