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
feat: add secret change review operation
adilson4205c92cf862
diff --git a/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts b/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.tsindex c1dbf4d8d4..1fcb10432b 100644--- a/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts@@ -222,9 +222,19 @@ describe("Secret approval request bridge routing", () => {const commits = await db(TableName.SecretApprovalRequestSecretV2).where({ secretChangeId: change?.id });expect(commits).toMatchObject([{ key: "SAR_BRIDGE_GLOBAL", op: "create", requestId: null }]);+ const reviewRes = await reviewRequest(approval.id, ApprovalStatus.APPROVED);+ expect(reviewRes.statusCode).toBe(200);+ expect(reviewRes.json().review).toMatchObject({+ requestId: approval.id,+ reviewerUserId: seedData1.id,+ status: ApprovalStatus.APPROVED+ });+ expect(await db(TableName.ApprovalRequestApprovals).where({ stepId: steps[0].id })).toMatchObject([+ { approverUserId: seedData1.id, decision: ApprovalStatus.APPROVED }+ ]);+const responses = await Promise.all([getRequest(approval.id),- reviewRequest(approval.id, ApprovalStatus.APPROVED),setRequestStatus(approval.id, RequestState.Closed),mergeRequest(approval.id)]);diff --git a/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.ts b/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.tsindex b802f449dd..47c9e5a2c0 100644--- a/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.ts@@ -7,6 +7,7 @@ import { ApproverType } from "@app/ee/services/access-approval-policy/access-appimport { ApprovalStatus, RequestState } from "@app/ee/services/secret-approval-request/secret-approval-request-types";import {ApprovalPolicyType,+ ApprovalRequestApprovalDecision,ApprovalRequestStatus,ApprovalRequestStepStatus} from "@app/services/approval-policy/approval-policy-enums";@@ -218,15 +219,51 @@ describe("Secret change request lifecycle on a policy on the global approval sysexpect((await getSecret(secretPath, BASE_KEY)).statusCode).toBe(200);});- test("reviewing, merging and closing are refused until the bridge supports them", async () => {+ test("each request can be reviewed on the global tables and stays open", async () => {expect(requestIds).toHaveLength(3);+ const db = getDb();for await (const requestId of requestIds) {- const responses = await Promise.all([- getRequest(requestId),- reviewRequest(requestId, ApprovalStatus.APPROVED),- mergeRequest(requestId)+ const reviewRes = await reviewRequest(requestId, ApprovalStatus.APPROVED);+ expect(reviewRes.statusCode).toBe(200);+ expect(reviewRes.json().review).toMatchObject({+ requestId,+ reviewerUserId: seedData1.id,+ status: ApprovalStatus.APPROVED+ });++ const [step] = await db(TableName.ApprovalRequestSteps).where({ requestId });+ expect(await db(TableName.ApprovalRequestApprovals).where({ stepId: step.id })).toMatchObject([+ { approverUserId: seedData1.id, decision: ApprovalRequestApprovalDecision.Approved }]);+ expect(step).toMatchObject({ status: ApprovalRequestStepStatus.InProgress });+ expect(await db(TableName.ApprovalRequests).where({ id: requestId }).first()).toMatchObject({+ status: ApprovalRequestStatus.Open,+ currentStep: 1+ });+ expect(await db(TableName.SecretChangeRequests).where({ approvalRequestId: requestId }).first()).toMatchObject({+ hasMerged: false+ });+ }+ });++ test("a reviewer changing their decision updates the same row", async () => {+ const [requestId] = requestIds;+ const db = getDb();++ const reviewRes = await reviewRequest(requestId, ApprovalStatus.REJECTED);+ expect(reviewRes.statusCode).toBe(200);+ expect(reviewRes.json().review).toMatchObject({ requestId, status: ApprovalStatus.REJECTED });++ const [step] = await db(TableName.ApprovalRequestSteps).where({ requestId });+ expect(await db(TableName.ApprovalRequestApprovals).where({ stepId: step.id })).toMatchObject([+ { approverUserId: seedData1.id, decision: ApprovalRequestApprovalDecision.Rejected }+ ]);+ });++ test("reading details and merging are refused until the bridge supports them", async () => {+ for await (const requestId of requestIds) {+ const responses = await Promise.all([getRequest(requestId), mergeRequest(requestId)]);for (const res of responses) {expect(res.statusCode).toBe(400);expect(res.json().message).toBe(BRIDGE_MESSAGE);@@ -235,9 +272,6 @@ describe("Secret change request lifecycle on a policy on the global approval sysexpect(await getDb()(TableName.ApprovalRequests).where({ id: requestId }).first()).toMatchObject({status: ApprovalRequestStatus.Open});- expect(await getDb()(TableName.ApprovalRequestApprovals).count("* as count").first()).toMatchObject({- count: "0"- });}});});diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.tsindex dbf3aa806a..03ccd0c6e2 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts@@ -1,20 +1,28 @@import { Knex } from "knex";import { beforeEach, describe, expect, test, vi } from "vitest";-import { TApprovalRequests, TSecretChangeRequests } from "@app/db/schemas";+import { TApprovalRequestApprovals, TApprovalRequests, TSecretChangeRequests } from "@app/db/schemas";import { BadRequestError, NotFoundError } from "@app/lib/errors";import { EnforcementLevel } from "@app/lib/types";import { triggerWorkflowIntegrationNotification } from "@app/lib/workflow-integrations/trigger-notification";import { QueueJobs, QueueName } from "@app/queue";-import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";+import {+ ApprovalPolicyType,+ ApprovalRequestApprovalDecision,+ ApprovalRequestStatus+} from "@app/services/approval-policy/approval-policy-enums";import { ActorType } from "@app/services/auth/auth-type";import { NotificationType } from "@app/services/notification/notification-types";import { SmtpTemplates } from "@app/services/smtp/smtp-service";import { PostHogEventTypes } from "@app/services/telemetry/telemetry-types";import { ChangeRequestWebhookAction, WebhookEvents } from "@app/services/webhook/webhook-types";-import { RequestState } from "../secret-approval-request/secret-approval-request-types";-import { secretChangeRequestFnsFactory, toSecretChangeRequest } from "./secret-change-request-bridge-fns";+import { ApprovalStatus, RequestState } from "../secret-approval-request/secret-approval-request-types";+import {+ secretChangeRequestFnsFactory,+ toSecretChangeRequest,+ toSecretChangeRequestReview+} from "./secret-change-request-bridge-fns";vi.mock("@app/lib/config/env", () => ({ getConfig: () => ({ SITE_URL: "https://app.test" }) }));vi.mock("@app/lib/logger", () => ({ logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() } }));@@ -114,6 +122,41 @@ describe("toSecretChangeRequest", () => {});});+describe("toSecretChangeRequestReview", () => {+ const approval = (overrides: Partial<TApprovalRequestApprovals> = {}): TApprovalRequestApprovals => ({+ id: "approval-1",+ stepId: "step-1",+ approverUserId: "user-2",+ decision: ApprovalRequestApprovalDecision.Approved,+ comment: "ship it",+ createdAt: CREATED_AT,+ ...overrides+ });++ test("maps a decision row onto the legacy reviewer shape and echoes createdAt as updatedAt", () => {+ expect(toSecretChangeRequestReview(approval(), "request-1")).toEqual({+ id: "approval-1",+ status: ApprovalStatus.APPROVED,+ requestId: "request-1",+ reviewerUserId: "user-2",+ comment: "ship it",+ createdAt: CREATED_AT,+ updatedAt: CREATED_AT+ });+ });++ test("normalizes a missing comment to null and a missing createdAt to now", () => {+ const result = toSecretChangeRequestReview(+ approval({ decision: ApprovalRequestApprovalDecision.Rejected, comment: undefined, createdAt: null }),+ "request-1"+ );++ expect(result).toMatchObject({ status: ApprovalStatus.REJECTED, comment: null });+ expect(result.createdAt).toBeInstanceOf(Date);+ expect(result.updatedAt).toBe(result.createdAt);+ });+});+const buildFns = ({user = {id: "user-1",@@ -198,6 +241,46 @@ describe("resolveRequester", () => {});});+describe("queueChangeRequestWebhook", () => {+ test("queues the change request webhook under the given action", async () => {+ const { fns, deps } = buildFns();++ await fns.queueChangeRequestWebhook({+ action: ChangeRequestWebhookAction.Reviewed,+ approvalRequest: approvalRequest(),+ secretChangeRequest: secretChangeRequest({ bypassReason: "hotfix" }),+ policy: { id: "policy-1", name: "dev-policy", enforcementLevel: EnforcementLevel.Soft, userApprovers: [] },+ project: { id: "project-1", name: "Project", orgId: "org-1" },+ environment: "dev",+ environmentName: "Development",+ secretPath: "/app"+ });++ expect(deps.queueService.queue).toHaveBeenCalledWith(+ QueueName.SecretWebhook,+ QueueJobs.SecWebhook,+ {+ type: WebhookEvents.ChangeRequestModified,+ payload: {+ projectId: "project-1",+ projectName: "Project",+ environment: "dev",+ environmentName: "Development",+ secretPath: "/app",+ action: ChangeRequestWebhookAction.Reviewed,+ request: expect.objectContaining({+ id: "request-1",+ slug: "slug-1",+ isBypassed: true,+ policy: { id: "policy-1", name: "dev-policy", enforcementLevel: EnforcementLevel.Soft }+ }) as object+ }+ },+ expect.objectContaining({ jobId: expect.stringContaining("change-request-webhook-request-1-") as string })+ );+ });+});+describe("runSecretChangeRequestSideEffects", () => {const policy = {id: "policy-1",diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.tsindex 315dc641c3..9fcba55b16 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts@@ -1,6 +1,12 @@import { Knex } from "knex";-import { TApprovalRequests, TSecretApprovalRequestsSecretsV2, TSecretChangeRequests } from "@app/db/schemas";+import {+ TApprovalRequestApprovals,+ TApprovalRequests,+ TSecretApprovalRequestsReviewers,+ TSecretApprovalRequestsSecretsV2,+ TSecretChangeRequests+} from "@app/db/schemas";import { getConfig } from "@app/lib/config/env";import { BadRequestError, NotFoundError } from "@app/lib/errors";import { unique } from "@app/lib/fn";@@ -96,6 +102,22 @@ export const toSecretChangeRequest = ({commits});+export const toSecretChangeRequestReview = (+ approval: TApprovalRequestApprovals,+ requestId: string+): TSecretApprovalRequestsReviewers => {+ const createdAt = approval.createdAt ?? new Date();+ return {+ id: approval.id,+ status: approval.decision,+ requestId,+ reviewerUserId: approval.approverUserId,+ comment: approval.comment ?? null,+ createdAt,+ updatedAt: createdAt // the global system does not use updatedAt. This also does not appear on the UI, so no need to change the db+ };+};+const buildApprovalUrl = (orgId: string, projectId: string, requestId: string) =>`${getConfig().SITE_URL}/organizations/${orgId}/projects/secret-management/${projectId}/approval?requestId=${requestId}`;@@ -182,7 +204,8 @@ export const secretChangeRequestFnsFactory = ({}};- const $queueCreatedWebhook = async ({+ const queueChangeRequestWebhook = async ({+ action,approvalRequest,secretChangeRequest,policy,@@ -193,7 +216,7 @@ export const secretChangeRequestFnsFactory = ({}: Pick<TSecretChangeRequestSideEffectsDTO,"approvalRequest" | "secretChangeRequest" | "policy" | "project" | "environment" | "secretPath"- > & { environmentName: string }) => {+ > & { action: ChangeRequestWebhookAction; environmentName: string }) => {const requestedBy: TWebhookActor | null = approvalRequest.requesterId? {type: ActorType.USER,@@ -214,7 +237,7 @@ export const secretChangeRequestFnsFactory = ({environment,environmentName,secretPath,- action: ChangeRequestWebhookAction.Created,+ action,request: {id: approvalRequest.id,slug: secretChangeRequest.slug,@@ -291,7 +314,8 @@ export const secretChangeRequestFnsFactory = ({await $sendApproverNotifications({ policy, requestId: approvalRequest.id, projectId: project.id, tx });try {- await $queueCreatedWebhook({+ await queueChangeRequestWebhook({+ action: ChangeRequestWebhookAction.Created,approvalRequest,secretChangeRequest,policy,@@ -327,5 +351,5 @@ export const secretChangeRequestFnsFactory = ({.catch(() => {});};- return { resolveRequester, runSecretChangeRequestSideEffects };+ return { resolveRequester, queueChangeRequestWebhook, runSecretChangeRequestSideEffects };};diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.tsindex 41c222dbdd..86392b3883 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts@@ -1,29 +1,38 @@import { Knex } from "knex";import { beforeEach, describe, expect, test, vi } from "vitest";-import { BadRequestError, NotFoundError } from "@app/lib/errors";+import { ProjectMembershipRole } from "@app/db/schemas";+import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";import {ApprovalPolicyType,+ ApprovalRequestApprovalDecision,ApprovalRequestStatus,ApproverType} from "@app/services/approval-policy/approval-policy-enums";import { ActorType } from "@app/services/auth/auth-type";import { SecretOperations } from "@app/services/secret/secret-types";+import { ChangeRequestWebhookAction } from "@app/services/webhook/webhook-types";-import { RequestState } from "../secret-approval-request/secret-approval-request-types";+import { ApprovalStatus, RequestState } from "../secret-approval-request/secret-approval-request-types";import { secretChangeRequestBridgeServiceFactory } from "./secret-change-request-bridge-service";const buildSecretApprovalCommits = vi.fn();const resolveRequester = vi.fn();const runSecretChangeRequestSideEffects = vi.fn().mockResolvedValue(undefined);+const queueChangeRequestWebhook = vi.fn().mockResolvedValue(undefined);+vi.mock("@app/lib/logger", () => ({ logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() } }));vi.mock("../secret-approval-request/secret-approval-request-commit-fns", async (importOriginal) => ({...(await importOriginal<typeof import("../secret-approval-request/secret-approval-request-commit-fns")>()),secretApprovalRequestCommitFnsFactory: () => ({ buildSecretApprovalCommits, validateSecrets: vi.fn() })}));vi.mock("./secret-change-request-bridge-fns", async (importOriginal) => ({...(await importOriginal<typeof import("./secret-change-request-bridge-fns")>()),- secretChangeRequestFnsFactory: () => ({ resolveRequester, runSecretChangeRequestSideEffects })+ secretChangeRequestFnsFactory: () => ({+ resolveRequester,+ queueChangeRequestWebhook,+ runSecretChangeRequestSideEffects+ })}));const CALLER_TX = { isTx: "caller" } as unknown as Knex;@@ -32,8 +41,41 @@ const POLICY = {id: "policy-1",name: "dev-policy",enforcementLevel: "hard",+ allowedSelfApprovals: true,userApprovers: [{ userId: "approver-1" }]};+const REVIEW_CREATED_AT = new Date("2026-02-01");+const APPROVAL_REQUEST = {+ id: "request-1",+ projectId: "project-1",+ organizationId: "org-1",+ policyId: "policy-1",+ requesterId: "user-1",+ type: ApprovalPolicyType.SecretChange,+ status: ApprovalRequestStatus.Open,+ currentStep: 1,+ createdAt: new Date("2026-01-01"),+ updatedAt: new Date("2026-01-01")+};+const SECRET_CHANGE_REQUEST = {+ id: "change-1",+ approvalRequestId: "request-1",+ folderId: "folder-1",+ slug: "slug-1",+ hasMerged: false,+ bypassReason: null+};+const REQUEST_STEP = {+ id: "step-1",+ requestId: "request-1",+ stepNumber: 1,+ requiredApprovals: 1,+ approvers: [+ { type: ApproverType.User, id: "approver-1" },+ { type: ApproverType.Group, id: "group-1" }+ ],+ approvals: []+};const PROJECT = { id: "project-1", name: "Project", orgId: "org-1" };const REQUESTER = {requesterUserId: "user-1",@@ -60,9 +102,12 @@ const buildService = ({steps = [{ requiredApprovals: 1, approvers: [{ type: ApproverType.User, id: "approver-1" }] }]} = {}) => {let requestCounter = 0;+ const hasRole = vi.fn().mockReturnValue(false);const deps = {approvalRequestDAL: {- findById: vi.fn(),+ findById: vi.fn().mockResolvedValue(APPROVAL_REQUEST),+ findByIdForUpdate: vi.fn().mockResolvedValue(APPROVAL_REQUEST),+ findStepsByRequestId: vi.fn().mockResolvedValue([REQUEST_STEP]),create: vi.fn((row: Record<string, unknown>) => {requestCounter += 1;return Promise.resolve({@@ -80,11 +125,30 @@ const buildService = ({approvalRequestStepEligibleApproversDAL: {create: vi.fn((row: Record<string, unknown>) => Promise.resolve({ id: "eligible-1", ...row }))},+ approvalRequestApprovalsDAL: {+ findOne: vi.fn().mockResolvedValue(null),+ create: vi.fn((row: Record<string, unknown>) =>+ Promise.resolve({ id: "approval-1", createdAt: REVIEW_CREATED_AT, ...row })+ ),+ updateById: vi.fn((id: string, row: Record<string, unknown>) =>+ Promise.resolve({ id, stepId: "step-1", approverUserId: "approver-1", createdAt: REVIEW_CREATED_AT, ...row })+ )+ },approvalPolicyDAL: { findStepsByPolicyId: vi.fn().mockResolvedValue(steps) },secretChangeRequestDAL: {create: vi.fn((row: Record<string, unknown>) =>Promise.resolve({ id: "change-1", conflicts: null, bypassReason: null, statusChangedByUserId: null, ...row })- )+ ),+ findOne: vi.fn().mockResolvedValue(SECRET_CHANGE_REQUEST)+ },+ permissionService: { getProjectPermission: vi.fn().mockResolvedValue({ hasRole }) },+ licenseService: { getPlan: vi.fn().mockResolvedValue({ secretApproval: true }) },+ userGroupMembershipDAL: { findGroupMembershipsByUserIdInOrg: vi.fn().mockResolvedValue([]) },+ projectDAL: { findById: vi.fn().mockResolvedValue(PROJECT) },+ folderDAL: {+ findSecretPathByFolderIds: vi+ .fn()+ .mockResolvedValue([{ environmentSlug: "dev", environmentName: "Development", path: "/app" }])},secretApprovalRequestSecretDAL: {insertV2Bridge: vi.fn<(rows: Record<string, unknown>[], tx?: Knex) => Promise<Record<string, unknown>[]>>(@@ -97,7 +161,7 @@ const buildService = ({const service = secretChangeRequestBridgeServiceFactory(deps as unknown as Parameters<typeof secretChangeRequestBridgeServiceFactory>[0]);- return { service, deps };+ return { service, deps, hasRole };};const dto = (overrides: Record<string, unknown> = {}) => ({@@ -289,3 +353,183 @@ describe("secretChangeRequestBridge generateSecretChangeRequest", () => {expect(result).toMatchObject({ committerUserId: null, committerIdentityId: "identity-1" });});});++describe("secretChangeRequestBridge reviewSecretChangeRequest", () => {+ beforeEach(() => {+ queueChangeRequestWebhook.mockClear();+ });++ const review = (service: ReturnType<typeof buildService>["service"], overrides: Record<string, unknown> = {}) =>+ service.reviewSecretChangeRequest({+ approvalId: "request-1",+ actor: ActorType.USER,+ actorId: "approver-1",+ actorOrgId: "org-1",+ actorAuthMethod: null,+ status: ApprovalStatus.APPROVED,+ comment: "ship it",+ ...overrides+ } as Parameters<ReturnType<typeof buildService>["service"]["reviewSecretChangeRequest"]>[0]);++ test("records an approver's decision on the current step under the request lock and queues the webhook", async () => {+ const { service, deps } = buildService();++ const result = await review(service);++ expect(deps.licenseService.getPlan).toHaveBeenCalledWith("org-1");+ expect(deps.permissionService.getProjectPermission).toHaveBeenCalledWith(+ expect.objectContaining({ actor: ActorType.USER, actorId: "approver-1", projectId: "project-1" })+ );+ expect(deps.approvalRequestDAL.transaction).toHaveBeenCalledTimes(1);+ expect(deps.approvalRequestDAL.findByIdForUpdate).toHaveBeenCalledWith("request-1", OWN_TX);+ expect(deps.approvalRequestApprovalsDAL.findOne).toHaveBeenCalledWith(+ { stepId: "step-1", approverUserId: "approver-1" },+ OWN_TX+ );+ expect(deps.approvalRequestApprovalsDAL.create).toHaveBeenCalledWith(+ {+ stepId: "step-1",+ approverUserId: "approver-1",+ decision: ApprovalRequestApprovalDecision.Approved,+ comment: "ship it"+ },+ OWN_TX+ );++ expect(queueChangeRequestWebhook).toHaveBeenCalledWith({+ action: ChangeRequestWebhookAction.Reviewed,+ approvalRequest: APPROVAL_REQUEST,+ secretChangeRequest: SECRET_CHANGE_REQUEST,+ policy: POLICY,+ project: PROJECT,+ environment: "dev",+ environmentName: "Development",+ secretPath: "/app"+ });++ expect(result).toEqual({+ id: "approval-1",+ status: ApprovalStatus.APPROVED,+ requestId: "request-1",+ reviewerUserId: "approver-1",+ comment: "ship it",+ createdAt: REVIEW_CREATED_AT,+ updatedAt: REVIEW_CREATED_AT,+ projectId: "project-1"+ });+ });++ test("updates the reviewer's existing decision instead of adding a second row", async () => {+ const { service, deps } = buildService();+ deps.approvalRequestApprovalsDAL.findOne.mockResolvedValue({ id: "approval-9" });++ const result = await review(service, { status: ApprovalStatus.REJECTED, comment: undefined });++ expect(deps.approvalRequestApprovalsDAL.create).not.toHaveBeenCalled();+ expect(deps.approvalRequestApprovalsDAL.updateById).toHaveBeenCalledWith(+ "approval-9",+ { decision: ApprovalRequestApprovalDecision.Rejected, comment: null },+ OWN_TX+ );+ expect(result).toMatchObject({ id: "approval-9", status: ApprovalStatus.REJECTED, comment: null });+ });++ test("lets a project admin, the committer and a group member review", async () => {+ const { service, deps, hasRole } = buildService();++ hasRole.mockReturnValueOnce(true);+ await expect(review(service, { actorId: "outsider" })).resolves.toMatchObject({ reviewerUserId: "outsider" });+ expect(hasRole).toHaveBeenCalledWith(ProjectMembershipRole.Admin);++ await expect(review(service, { actorId: "user-1" })).resolves.toMatchObject({ reviewerUserId: "user-1" });++ deps.userGroupMembershipDAL.findGroupMembershipsByUserIdInOrg.mockResolvedValueOnce([{ groupId: "group-1" }]);+ await expect(review(service, { actorId: "member-1" })).resolves.toMatchObject({ reviewerUserId: "member-1" });+ expect(deps.userGroupMembershipDAL.findGroupMembershipsByUserIdInOrg).toHaveBeenCalledWith("member-1", "org-1");+ });++ test("forbids a user who is neither admin, committer nor an eligible approver", async () => {+ const { service, deps } = buildService();++ await expect(review(service, { actorId: "outsider" })).rejects.toBeInstanceOf(ForbiddenRequestError);+ expect(deps.approvalRequestDAL.transaction).not.toHaveBeenCalled();+ expect(queueChangeRequestWebhook).not.toHaveBeenCalled();+ });++ test("refuses when the plan lacks secret approvals", async () => {+ const { service, deps } = buildService();+ deps.licenseService.getPlan.mockResolvedValue({ secretApproval: false });++ const result = review(service);+ await expect(result).rejects.toBeInstanceOf(BadRequestError);+ await expect(result).rejects.toThrow("plan restriction");+ expect(deps.approvalRequestDAL.findById).not.toHaveBeenCalled();+ });++ test("reads an unknown id or a request of another type as not found", async () => {+ const { service, deps } = buildService();++ deps.approvalRequestDAL.findById.mockResolvedValueOnce(null);+ await expect(review(service)).rejects.toBeInstanceOf(NotFoundError);++ deps.approvalRequestDAL.findById.mockResolvedValueOnce({ ...APPROVAL_REQUEST, type: ApprovalPolicyType.PamAccess });+ await expect(review(service)).rejects.toBeInstanceOf(NotFoundError);++ deps.secretChangeRequestDAL.findOne.mockResolvedValueOnce(null);+ await expect(review(service)).rejects.toBeInstanceOf(NotFoundError);+ });++ test("refuses a non-user actor and a request that is not open", async () => {+ const { service, deps } = buildService();++ await expect(review(service, { actor: ActorType.IDENTITY })).rejects.toThrow("Must be a user");++ deps.approvalRequestDAL.findById.mockResolvedValueOnce({+ ...APPROVAL_REQUEST,+ status: ApprovalRequestStatus.Closed+ });+ await expect(review(service)).rejects.toThrow("You can only review open approval requests");++ deps.approvalRequestDAL.findByIdForUpdate.mockResolvedValueOnce({+ ...APPROVAL_REQUEST,+ status: ApprovalRequestStatus.Closed+ });+ await expect(review(service)).rejects.toThrow("You can only review open approval requests");+ expect(deps.approvalRequestApprovalsDAL.create).not.toHaveBeenCalled();+ });++ test("refuses a request whose policy is gone", async () => {+ const { service, deps } = buildService();++ deps.approvalRequestDAL.findById.mockResolvedValueOnce({ ...APPROVAL_REQUEST, policyId: null });+ await expect(review(service)).rejects.toThrow("has been deleted");+ expect(deps.secretChangePolicyBridgeService.findSecretChangePolicyById).not.toHaveBeenCalled();++ deps.secretChangePolicyBridgeService.findSecretChangePolicyById.mockResolvedValueOnce(undefined);+ await expect(review(service)).rejects.toThrow("has been deleted");+ });++ test("refuses a self review when the policy disallows it", async () => {+ const { service } = buildService({ policy: { ...POLICY, allowedSelfApprovals: false } });++ await expect(review(service, { actorId: "user-1" })).rejects.toThrow("review their own request");+ });++ test("refuses a request without a current step", async () => {+ const { service, deps } = buildService();+ deps.approvalRequestDAL.findStepsByRequestId.mockResolvedValueOnce([]);++ await expect(review(service)).rejects.toThrow("has no approval step to review");+ });++ test("keeps the review when the webhook cannot be queued or the folder is gone", async () => {+ const { service, deps } = buildService();++ queueChangeRequestWebhook.mockRejectedValueOnce(new Error("redis down"));+ await expect(review(service)).resolves.toMatchObject({ reviewerUserId: "approver-1" });++ deps.folderDAL.findSecretPathByFolderIds.mockResolvedValueOnce([]);+ await expect(review(service)).resolves.toMatchObject({ reviewerUserId: "approver-1" });+ expect(queueChangeRequestWebhook).toHaveBeenCalledTimes(1);+ });+});diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.tsindex 700c757e48..980ac3bf05 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts@@ -1,17 +1,29 @@import { Knex } from "knex";-import { BadRequestError, NotFoundError } from "@app/lib/errors";+import { ActionProjectType, ProjectMembershipRole } from "@app/db/schemas";+import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";import { groupBy } from "@app/lib/fn";+import { logger } from "@app/lib/logger";import { alphaNumericNanoId } from "@app/lib/nanoid";import { TQueueServiceFactory } from "@app/queue";import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";-import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";import {+ ApprovalPolicyType,+ ApprovalRequestApprovalDecision,+ ApprovalRequestStatus+} from "@app/services/approval-policy/approval-policy-enums";+import {+ TApprovalRequestApprovalsDALFactory,TApprovalRequestDALFactory,TApprovalRequestStepEligibleApproversDALFactory,TApprovalRequestStepsDALFactory} from "@app/services/approval-policy/approval-request-dal";-import { createApprovalRequestWithSteps } from "@app/services/approval-policy/approval-request-fns";+import {+ createApprovalRequestWithSteps,+ isEligibleStepApprover,+ upsertApprovalRequestStepDecision+} from "@app/services/approval-policy/approval-request-fns";+import { ActorType } from "@app/services/auth/auth-type";import { TIdentityDALFactory } from "@app/services/identity/identity-dal";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/microsoft-teams-service";@@ -28,31 +40,45 @@ import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slackimport { TSmtpService } from "@app/services/smtp/smtp-service";import { TTelemetryServiceFactory } from "@app/services/telemetry/telemetry-service";import { TUserDALFactory } from "@app/services/user/user-dal";+import { ChangeRequestWebhookAction } from "@app/services/webhook/webhook-types";+import { TUserGroupMembershipDALFactory } from "../group/user-group-membership-dal";+import { TLicenseServiceFactory } from "../license/license-service";import { TPermissionServiceFactory } from "../permission/permission-service-types";import {pickApprovalCommitColumns,secretApprovalRequestCommitFnsFactory} from "../secret-approval-request/secret-approval-request-commit-fns";import { TSecretApprovalRequestSecretDALFactory } from "../secret-approval-request/secret-approval-request-secret-dal";+import { ApprovalStatus } from "../secret-approval-request/secret-approval-request-types";import { TSecretChangePolicyBridgeServiceFactory } from "../secret-change-policy-bridge/secret-change-policy-bridge-service";-import { secretChangeRequestFnsFactory, toSecretChangeRequest } from "./secret-change-request-bridge-fns";+import {+ secretChangeRequestFnsFactory,+ toSecretChangeRequest,+ toSecretChangeRequestReview+} from "./secret-change-request-bridge-fns";import { TSecretChangeRequestBridgeMethods } from "./secret-change-request-bridge-types";import { TSecretChangeRequestDALFactory } from "./secret-change-request-dal";type TSecretChangeRequestBridgeServiceFactoryDep = {- approvalRequestDAL: Pick<TApprovalRequestDALFactory, "findById" | "create" | "transaction">;+ approvalRequestDAL: Pick<+ TApprovalRequestDALFactory,+ "findById" | "findByIdForUpdate" | "findStepsByRequestId" | "create" | "transaction"+ >;approvalRequestStepsDAL: Pick<TApprovalRequestStepsDALFactory, "create">;approvalRequestStepEligibleApproversDAL: Pick<TApprovalRequestStepEligibleApproversDALFactory, "create">;+ approvalRequestApprovalsDAL: Pick<TApprovalRequestApprovalsDALFactory, "findOne" | "create" | "updateById">;approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findStepsByPolicyId">;- secretChangeRequestDAL: Pick<TSecretChangeRequestDALFactory, "create">;+ secretChangeRequestDAL: Pick<TSecretChangeRequestDALFactory, "create" | "findOne">;secretApprovalRequestSecretDAL: Pick<TSecretApprovalRequestSecretDALFactory,"insertV2Bridge" | "insertApprovalSecretV2Tags">;secretChangePolicyBridgeService: Pick<TSecretChangePolicyBridgeServiceFactory, "findSecretChangePolicyById">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;- folderDAL: Pick<TSecretFolderDALFactory, "findBySecretPath">;+ licenseService: Pick<TLicenseServiceFactory, "getPlan">;+ userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "findGroupMembershipsByUserIdInOrg">;+ folderDAL: Pick<TSecretFolderDALFactory, "findBySecretPath" | "findSecretPathByFolderIds">;projectDAL: Pick<TProjectDALFactory, "findById" | "findProjectWithOrg">;projectEnvDAL: Pick<TProjectEnvDALFactory, "findOne">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;@@ -80,11 +106,14 @@ export const secretChangeRequestBridgeServiceFactory = ({approvalRequestDAL,approvalRequestStepsDAL,approvalRequestStepEligibleApproversDAL,+ approvalRequestApprovalsDAL,approvalPolicyDAL,secretChangeRequestDAL,secretApprovalRequestSecretDAL,secretChangePolicyBridgeService,permissionService,+ licenseService,+ userGroupMembershipDAL,folderDAL,projectDAL,projectEnvDAL,@@ -114,23 +143,46 @@ export const secretChangeRequestBridgeServiceFactory = ({secretValidationRuleService});- const { resolveRequester, runSecretChangeRequestSideEffects } = secretChangeRequestFnsFactory({- userDAL,- identityDAL,- projectDAL,- projectEnvDAL,- kmsService,- projectSlackConfigDAL,- projectMicrosoftTeamsConfigDAL,- microsoftTeamsService,- smtpService,- notificationService,- queueService,- telemetryService- });+ const { resolveRequester, queueChangeRequestWebhook, runSecretChangeRequestSideEffects } =+ secretChangeRequestFnsFactory({+ userDAL,+ identityDAL,+ projectDAL,+ projectEnvDAL,+ kmsService,+ projectSlackConfigDAL,+ projectMicrosoftTeamsConfigDAL,+ microsoftTeamsService,+ smtpService,+ notificationService,+ queueService,+ telemetryService+ });const findSecretChangeRequest = (requestId: string, tx?: Knex) => approvalRequestDAL.findById(requestId, tx);+ const $findSecretChangeRequestOrThrow = async (requestId: string) => {+ const approvalRequest = await approvalRequestDAL.findById(requestId);+ if (!approvalRequest || approvalRequest.type !== ApprovalPolicyType.SecretChange) {+ throw new NotFoundError({ message: `Secret approval request with ID '${requestId}' not found` });+ }+ const secretChangeRequest = await secretChangeRequestDAL.findOne({ approvalRequestId: approvalRequest.id });+ if (!secretChangeRequest) {+ throw new NotFoundError({ message: `Secret approval request with ID '${requestId}' not found` });+ }+ return { approvalRequest, secretChangeRequest };+ };++ const $findSecretChangePolicyOrThrow = async (policyId: string | null | undefined) => {+ const policy = policyId ? await secretChangePolicyBridgeService.findSecretChangePolicyById(policyId) : undefined;+ if (!policy) {+ throw new BadRequestError({+ message: "The policy associated with this secret approval request has been deleted."+ });+ }+ return policy;+ };+const generateSecretChangeRequest: TSecretChangeRequestBridgeMethods["generateSecretChangeRequest"] = async (dto) => {const { actor, actorId, actorOrgId, projectId, environment, secretPath, commitMessage, trx, skipPostProcessing } =dto;@@ -217,16 +269,114 @@ export const secretChangeRequestBridgeServiceFactory = ({return result;};- const createSecretChangeRequest: TSecretChangeRequestBridgeMethods["createSecretChangeRequest"] = async () => {- throw notAvailable();- };-const mergeSecretChangeRequest: TSecretChangeRequestBridgeMethods["mergeSecretChangeRequest"] = async () => {throw notAvailable();};- const reviewSecretChangeRequest: TSecretChangeRequestBridgeMethods["reviewSecretChangeRequest"] = async () => {- throw notAvailable();+ const reviewSecretChangeRequest: TSecretChangeRequestBridgeMethods["reviewSecretChangeRequest"] = async ({+ approvalId,+ actor,+ actorId,+ actorAuthMethod,+ actorOrgId,+ status,+ comment+ }) => {+ const plan = await licenseService.getPlan(actorOrgId);+ if (!plan.secretApproval) {+ throw new BadRequestError({+ message:+ "Failed to review secret approval request due to plan restriction. Upgrade plan to review secret approval request."+ });+ }++ const { approvalRequest, secretChangeRequest } = await $findSecretChangeRequestOrThrow(approvalId);+ if (actor !== ActorType.USER) throw new BadRequestError({ message: "Must be a user" });++ if (approvalRequest.status !== ApprovalRequestStatus.Open) {+ throw new BadRequestError({ message: "You can only review open approval requests" });+ }++ const policy = await $findSecretChangePolicyOrThrow(approvalRequest.policyId);+ if (!policy.allowedSelfApprovals && actorId === approvalRequest.requesterId) {+ throw new BadRequestError({+ message: "Failed to review secret approval request. Users are not authorized to review their own request."+ });+ }++ const { hasRole } = await permissionService.getProjectPermission({+ actor: ActorType.USER,+ actorId,+ projectId: approvalRequest.projectId,+ actorAuthMethod,+ actorOrgId,+ actionProjectType: ActionProjectType.SecretManager+ });++ const steps = await approvalRequestDAL.findStepsByRequestId(approvalRequest.id);+ const currentStep = steps.find((step) => step.stepNumber === approvalRequest.currentStep);+ if (!currentStep) {+ throw new BadRequestError({+ message: `Secret approval request with ID '${approvalId}' has no approval step to review.`+ });+ }++ const userGroups = await userGroupMembershipDAL.findGroupMembershipsByUserIdInOrg(actorId, actorOrgId);+ const userGroupIds = new Set(userGroups.map((group) => group.groupId));+ if (+ !hasRole(ProjectMembershipRole.Admin) &&+ approvalRequest.requesterId !== actorId &&+ !isEligibleStepApprover(currentStep, actorId, userGroupIds)+ ) {+ throw new ForbiddenRequestError({ message: "User has insufficient privileges" });+ }++ const decision =+ status === ApprovalStatus.APPROVED+ ? ApprovalRequestApprovalDecision.Approved+ : ApprovalRequestApprovalDecision.Rejected;++ const review = await approvalRequestDAL.transaction(async (tx) => {+ const locked = await approvalRequestDAL.findByIdForUpdate(approvalRequest.id, tx);+ if (!locked || locked.status !== ApprovalRequestStatus.Open) {+ throw new BadRequestError({ message: "You can only review open approval requests" });+ }+ return upsertApprovalRequestStepDecision(+ { stepId: currentStep.id, approverUserId: actorId, decision, comment },+ { approvalRequestApprovalsDAL },+ tx+ );+ });++ try {+ const project = await projectDAL.findById(approvalRequest.projectId);+ const [folder] = await folderDAL.findSecretPathByFolderIds(approvalRequest.projectId, [+ secretChangeRequest.folderId+ ]);+ if (project && folder) {+ await queueChangeRequestWebhook({+ action: ChangeRequestWebhookAction.Reviewed,+ approvalRequest,+ secretChangeRequest,+ policy,+ project,+ environment: folder.environmentSlug,+ environmentName: folder.environmentName,+ secretPath: folder.path+ });+ } else {+ logger.warn(+ `Skipping change request webhook, project or folder not found [requestId=${approvalRequest.id}] [action=${ChangeRequestWebhookAction.Reviewed}]`+ );+ }+ } catch (error) {+ logger.error(+ error,+ `Failed to queue change request webhook [requestId=${approvalRequest.id}] [action=${ChangeRequestWebhookAction.Reviewed}]`+ );+ }++ return { ...toSecretChangeRequestReview(review, approvalRequest.id), projectId: approvalRequest.projectId };};const updateSecretChangeRequestStatus: TSecretChangeRequestBridgeMethods["updateSecretChangeRequestStatus"] =@@ -241,7 +391,6 @@ export const secretChangeRequestBridgeServiceFactory = ({return {findSecretChangeRequest,generateSecretChangeRequest,- createSecretChangeRequest,mergeSecretChangeRequest,reviewSecretChangeRequest,updateSecretChangeRequestStatus,diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.tsindex dbb6e55e60..7bdd51711c 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts@@ -1,6 +1,10 @@import { Knex } from "knex";-import { TSecretApprovalRequests, TSecretApprovalRequestsSecretsV2 } from "@app/db/schemas";+import {+ TSecretApprovalRequests,+ TSecretApprovalRequestsReviewers,+ TSecretApprovalRequestsSecretsV2+} from "@app/db/schemas";import {TCreateSecretApprovalRequestV2BridgeDTO,@@ -17,13 +21,15 @@ export type TSecretChangeRequestData = Record<string, never>;export type TSecretChangeRequest = TSecretApprovalRequests & { commits: TSecretApprovalRequestsSecretsV2[] };+export type TSecretChangeRequestReview = TSecretApprovalRequestsReviewers & { projectId: string };+export type TSecretChangeRequestBridgeMethods = {generateSecretChangeRequest: (dto: TGenerateSecretApprovalRequestV2BridgeDTO & { trx?: Knex; skipPostProcessing?: boolean }) => Promise<TSecretChangeRequest>;createSecretChangeRequest: (dto: TCreateSecretApprovalRequestV2BridgeDTO, tx?: Knex) => Promise<never>;mergeSecretChangeRequest: (dto: TMergeSecretApprovalRequestDTO) => Promise<never>;- reviewSecretChangeRequest: (dto: TReviewRequestDTO) => Promise<never>;+ reviewSecretChangeRequest: (dto: TReviewRequestDTO) => Promise<TSecretChangeRequestReview>;updateSecretChangeRequestStatus: (dto: TStatusChangeDTO) => Promise<never>;getSecretChangeRequestById: (dto: TSecretApprovalDetailsDTO) => Promise<never>;};diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 57b682b91b..cb4f937ce6 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -2377,11 +2377,14 @@ export const registerRoutes = async (approvalRequestDAL,approvalRequestStepsDAL,approvalRequestStepEligibleApproversDAL,+ approvalRequestApprovalsDAL,approvalPolicyDAL,secretChangeRequestDAL,secretApprovalRequestSecretDAL,secretChangePolicyBridgeService,permissionService,+ licenseService,+ userGroupMembershipDAL,folderDAL,projectDAL,projectEnvDAL,diff --git a/backend/src/services/approval-policy/approval-request-fns.test.ts b/backend/src/services/approval-policy/approval-request-fns.test.tsnew file mode 100644index 0000000000..e8cac087c0--- /dev/null+++ b/backend/src/services/approval-policy/approval-request-fns.test.ts@@ -0,0 +1,78 @@+import { Knex } from "knex";+import { describe, expect, test, vi } from "vitest";++import { ApprovalRequestApprovalDecision, ApproverType } from "./approval-policy-enums";+import { isEligibleStepApprover, upsertApprovalRequestStepDecision } from "./approval-request-fns";++const TX = { isTx: true } as unknown as Knex;++describe("isEligibleStepApprover", () => {+ const step = {+ approvers: [+ { type: ApproverType.User, id: "user-1" },+ { type: ApproverType.Group, id: "group-1" }+ ]+ };++ test("matches a user listed directly on the step", () => {+ expect(isEligibleStepApprover(step, "user-1", new Set())).toBe(true);+ });++ test("matches a member of a group listed on the step", () => {+ expect(isEligibleStepApprover(step, "user-2", new Set(["group-1"]))).toBe(true);+ });++ test("rejects a user who is neither listed nor in a listed group", () => {+ expect(isEligibleStepApprover(step, "user-2", new Set(["group-2"]))).toBe(false);+ expect(isEligibleStepApprover({ approvers: [] }, "user-1", new Set(["group-1"]))).toBe(false);+ });+});++describe("upsertApprovalRequestStepDecision", () => {+ const buildDeps = (existing: { id: string } | null) => ({+ approvalRequestApprovalsDAL: {+ findOne: vi.fn().mockResolvedValue(existing),+ create: vi.fn((row: Record<string, unknown>) => Promise.resolve({ id: "approval-1", ...row })),+ updateById: vi.fn((id: string, row: Record<string, unknown>) => Promise.resolve({ id, ...row }))+ }+ });++ test("creates a decision row for a first review and threads the transaction", async () => {+ const deps = buildDeps(null);++ const result = await upsertApprovalRequestStepDecision(+ { stepId: "step-1", approverUserId: "user-1", decision: ApprovalRequestApprovalDecision.Approved, comment: "ok" },+ deps,+ TX+ );++ expect(deps.approvalRequestApprovalsDAL.findOne).toHaveBeenCalledWith(+ { stepId: "step-1", approverUserId: "user-1" },+ TX+ );+ expect(deps.approvalRequestApprovalsDAL.create).toHaveBeenCalledWith(+ { stepId: "step-1", approverUserId: "user-1", decision: ApprovalRequestApprovalDecision.Approved, comment: "ok" },+ TX+ );+ expect(deps.approvalRequestApprovalsDAL.updateById).not.toHaveBeenCalled();+ expect(result).toMatchObject({ id: "approval-1", decision: ApprovalRequestApprovalDecision.Approved });+ });++ test("updates the existing row when the same user reviews the same step again", async () => {+ const deps = buildDeps({ id: "approval-7" });++ const result = await upsertApprovalRequestStepDecision(+ { stepId: "step-1", approverUserId: "user-1", decision: ApprovalRequestApprovalDecision.Rejected },+ deps,+ TX+ );++ expect(deps.approvalRequestApprovalsDAL.create).not.toHaveBeenCalled();+ expect(deps.approvalRequestApprovalsDAL.updateById).toHaveBeenCalledWith(+ "approval-7",+ { decision: ApprovalRequestApprovalDecision.Rejected, comment: null },+ TX+ );+ expect(result).toMatchObject({ id: "approval-7", decision: ApprovalRequestApprovalDecision.Rejected });+ });+});diff --git a/backend/src/services/approval-policy/approval-request-fns.ts b/backend/src/services/approval-policy/approval-request-fns.tsindex 6d4c3efe69..649dcb79fa 100644--- a/backend/src/services/approval-policy/approval-request-fns.ts+++ b/backend/src/services/approval-policy/approval-request-fns.ts@@ -1,16 +1,18 @@import { Knex } from "knex";-import { TApprovalRequests } from "@app/db/schemas";+import { TApprovalRequestApprovals, TApprovalRequests } from "@app/db/schemas";import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";import {ApprovalPolicyType,+ ApprovalRequestApprovalDecision,ApprovalRequestStatus,ApprovalRequestStepStatus,ApproverType} from "./approval-policy-enums";import { ApprovalPolicyStep, TApprovalRequestData, TApprovalRequestSubjectMetadata } from "./approval-policy-types";import {+ TApprovalRequestApprovalsDALFactory,TApprovalRequestDALFactory,TApprovalRequestStepEligibleApproversDALFactory,TApprovalRequestStepsDALFactory@@ -150,6 +152,38 @@ export const createApprovalRequestWithSteps = async (return { ...request, steps } as TApprovalRequestWithSteps;};+export const isEligibleStepApprover = (+ step: { approvers: { type: ApproverType; id: string }[] },+ userId: string,+ userGroupIds: Set<string>+): boolean =>+ step.approvers.some(+ (approver) =>+ (approver.type === ApproverType.User && approver.id === userId) ||+ (approver.type === ApproverType.Group && userGroupIds.has(approver.id))+ );++export type TUpsertApprovalRequestStepDecisionParams = {+ stepId: string;+ approverUserId: string;+ decision: ApprovalRequestApprovalDecision;+ comment?: string | null;+};++export const upsertApprovalRequestStepDecision = async (+ { stepId, approverUserId, decision, comment }: TUpsertApprovalRequestStepDecisionParams,+ {+ approvalRequestApprovalsDAL+ }: { approvalRequestApprovalsDAL: Pick<TApprovalRequestApprovalsDALFactory, "findOne" | "create" | "updateById"> },+ tx: Knex+): Promise<TApprovalRequestApprovals> => {+ const existing = await approvalRequestApprovalsDAL.findOne({ stepId, approverUserId }, tx);+ if (existing) {+ return approvalRequestApprovalsDAL.updateById(existing.id, { decision, comment: comment ?? null }, tx);+ }+ return approvalRequestApprovalsDAL.create({ stepId, approverUserId, decision, comment: comment ?? null }, tx);+};+export const resolveStepApproverUserIds = async (step: ApprovalPolicyStep,userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find">