Skip to content

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

address concurrent problems

adilson7719f7784d3d
diff --git a/backend/src/ee/routes/v1/access-approval-request-router.ts b/backend/src/ee/routes/v1/access-approval-request-router.ts
index 28a5f1c421..779520deca 100644
--- a/backend/src/ee/routes/v1/access-approval-request-router.ts
+++ b/backend/src/ee/routes/v1/access-approval-request-router.ts
@@ -370,7 +370,12 @@ export const registerAccessApprovalRequestRouter = async (server: FastifyZodProv
metadata: {
requestId: result.request.id,
requestedByUserId: result.request.requestedByUserId,
+ requestedByUserName: result.requesterName,
+ requestedByUserEmail: result.requesterEmail,
policyId: result.request.policyId,
+ policyName: result.policyName,
+ environment: result.environment,
+ secretPath: result.secretPath,
delegatedApprovalType: result.delegatedApprovalType
}
}
@@ -418,7 +423,12 @@ export const registerAccessApprovalRequestRouter = async (server: FastifyZodProv
metadata: {
requestId: result.request.id,
requestedByUserId: result.request.requestedByUserId,
- policyId: result.request.policyId
+ requestedByUserName: result.requesterName,
+ requestedByUserEmail: result.requesterEmail,
+ policyId: result.request.policyId,
+ policyName: result.policyName,
+ environment: result.environment,
+ secretPath: result.secretPath
}
}
});
diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-types.ts b/backend/src/ee/services/access-approval-request/access-approval-request-types.ts
index a3a5a3f34f..df66fc9d4e 100644
--- a/backend/src/ee/services/access-approval-request/access-approval-request-types.ts
+++ b/backend/src/ee/services/access-approval-request/access-approval-request-types.ts
@@ -243,6 +243,11 @@ export interface TAccessApprovalRequestServiceFactory {
};
projectId: string;
delegatedApprovalType: DelegatedApprovalPolicyType;
+ policyName: string;
+ requesterName: string;
+ requesterEmail: string;
+ environment: string;
+ secretPath: string;
}>;
cancelAccessRequest: (arg: TCancelAccessRequestDTO) => Promise<{
request: {
@@ -260,6 +265,11 @@ export interface TAccessApprovalRequestServiceFactory {
expiresAt?: Date | null | undefined;
};
projectId: string;
+ policyName: string;
+ requesterName: string;
+ requesterEmail: string;
+ environment: string;
+ secretPath: string;
}>;
revokeAccessRequest: (arg: TRevokeAccessRequestDTO) => Promise<{
request: {
diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.ts
index aa22180102..fff506f0d9 100644
--- a/backend/src/ee/services/audit-log/audit-log-types.ts
+++ b/backend/src/ee/services/audit-log/audit-log-types.ts
@@ -7175,7 +7175,12 @@ interface AccessApprovalRequestDelegatedDispatchRetryEvent {
metadata: {
requestId: string;
requestedByUserId: string;
+ requestedByUserName: string;
+ requestedByUserEmail: string;
policyId: string;
+ policyName: string;
+ environment: string;
+ secretPath: string;
delegatedApprovalType: string;
};
}
@@ -7185,7 +7190,12 @@ interface AccessApprovalRequestCancelEvent {
metadata: {
requestId: string;
requestedByUserId: string;
+ requestedByUserName: string;
+ requestedByUserEmail: string;
policyId: string;
+ policyName: string;
+ environment: string;
+ secretPath: string;
};
}
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index f88c63c28a..b1b0730fec 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -3279,6 +3279,7 @@ export const registerRoutes = async (
additionalPrivilegeDAL,
secretAccessApprovalGlobalPolicyBridgeDAL,
secretAccessApprovalGlobalRequestBridgeDAL,
+ approvalPolicyDAL,
delegatedApprovalService,
smtpService,
notificationService,
diff --git a/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.test.ts b/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.test.ts
index a7154f53f7..0018143764 100644
--- a/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.test.ts
+++ b/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.test.ts
@@ -189,6 +189,19 @@ describe("delegatedApprovalDispatchConsumer", () => {
expect(row()?.status).toBe(DelegatedApprovalRequestStatus.FailedDispatch);
});
+ test("fails terminally when the approval request expired before it was sent", async () => {
+ const { consumer, row } = buildConsumer({
+ approval: { ...approvalRequest, expiresAt: new Date(Date.now() - 60_000) }
+ });
+
+ const [result] = await consumer.handle([makeEvent()]);
+
+ expect(result.status).toBe(EventResultStatus.Failed);
+ expect(dispatch).not.toHaveBeenCalled();
+ expect(row()?.status).toBe(DelegatedApprovalRequestStatus.FailedDispatch);
+ expect(row()?.statusReason).toContain("expired");
+ });
+
test.each([
["is gone", null],
["is no longer awaiting dispatch", { ...pendingDelegatedRequest, status: DelegatedApprovalRequestStatus.Approved }],
diff --git a/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.ts b/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.ts
index f556c4ff79..311ab65386 100644
--- a/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.ts
+++ b/backend/src/services/delegated-approval/dispatch/delegated-approval-dispatch-consumer.ts
@@ -138,6 +138,11 @@ export const delegatedApprovalDispatchConsumerFactory = ({
"The approval request is no longer pending, so it was not sent to the delegated approval system."
);
}
+ if (approvalRequest.expiresAt && new Date(approvalRequest.expiresAt) < new Date()) {
+ throw new UnrecoverableError(
+ "The approval request expired before it could be sent to the delegated approval system. Create the request again."
+ );
+ }
if (!delegatedPolicy) {
throw new UnrecoverableError(
"The policy's delegated approver was removed before the request could be sent. Configure a delegated approver on the policy and create the request again."
diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts
index c451e43695..4e9a26b081 100644
--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts
@@ -625,6 +625,10 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({
}
return approvalPolicyDAL.transaction(async (tx) => {
+ const lockedPolicy = await approvalPolicyDAL.findByIdForUpdate(policy.id, tx);
+ if (!lockedPolicy) {
+ throw new NotFoundError({ message: `Access approval policy with ID '${policyId}' not found` });
+ }
if (involvesDelegatedApproval) await $assertNoPendingRequests(policy, tx);
await approvalPolicyDAL.updateById(
diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts
index c9b3d33d74..6e35507065 100644
--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts
+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts
@@ -35,7 +35,10 @@ export type TSecretAccessApprovalGlobalPolicyBridgeServiceFactoryDep = {
userDAL: Pick<TUserDALFactory, "find">;
groupDAL: Pick<TGroupDALFactory, "find">;
accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath" | "update">;
- approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "create" | "transaction" | "updateById" | "deleteById">;
+ approvalPolicyDAL: Pick<
+ TApprovalPolicyDALFactory,
+ "create" | "transaction" | "updateById" | "deleteById" | "findByIdForUpdate"
+ >;
approvalPolicyStepsDAL: Pick<TApprovalPolicyStepsDALFactory, "insertMany" | "delete">;
approvalPolicyStepApproversDAL: Pick<TApprovalPolicyStepApproversDALFactory, "insertMany">;
approvalPolicyBypassersDAL: Pick<TApprovalPolicyBypassersDALFactory, "insertMany" | "delete">;
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts
index 7624ce45a8..5cfd054503 100644
--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts
@@ -46,9 +46,16 @@ const cannotEditPolicies = createMongoAbility([
{ action: ProjectPermissionActions.Read, subject: ProjectPermissionSub.SecretApproval }
]);
+const delegatedPolicy = {
+ id: "policy-1",
+ name: "Prod access",
+ delegatedApproval: { type: "servicenow", connectionId: "connection-1" }
+};
+
const createService = ({
lockedRequest = pendingRequest as unknown,
delegated = delegatedRequest as unknown,
+ policy = delegatedPolicy as unknown,
permission = cannotEditPolicies
} = {}) => {
let current = { ...pendingRequest };
@@ -61,6 +68,9 @@ const createService = ({
secretAccessApprovalGlobalRequestBridgeDAL: {
findSecretAccessRequestById: vi.fn().mockImplementation(async () => current)
},
+ secretAccessApprovalGlobalPolicyBridgeDAL: {
+ findSecretAccessPolicies: vi.fn().mockResolvedValue(policy ? [policy] : [])
+ },
permissionService: { getProjectPermission: vi.fn().mockResolvedValue({ permission }) },
delegatedApprovalService: { getRequestByRequestId: vi.fn().mockResolvedValue(delegated) },
approvalRequestDAL: {
@@ -155,4 +165,13 @@ describe("secretAccessApprovalGlobalRequestBridge.reviewAccessApprovalRequest",
);
expect(updateById).not.toHaveBeenCalled();
});
+
+ test("refuses a local review when the policy now delegates approval, even without a delegated request", async () => {
+ const { service, updateById } = createService({ delegated: null });
+
+ await expect(reviewAs(service, ApprovalStatus.APPROVED)).rejects.toThrow(
+ externallyReviewedAccessRequestMessage("req-1")
+ );
+ expect(updateById).not.toHaveBeenCalled();
+ });
});
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
index f351676919..557018ed31 100644
--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
@@ -78,6 +78,7 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
additionalPrivilegeDAL,
secretAccessApprovalGlobalPolicyBridgeDAL,
secretAccessApprovalGlobalRequestBridgeDAL,
+ approvalPolicyDAL,
delegatedApprovalService,
smtpService,
notificationService,
@@ -264,6 +265,26 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
}
};
+ const $describeRequestForAudit = async (request: Awaited<ReturnType<typeof $findRequestById>>) => {
+ if (!request.policyId) {
+ throw new BadRequestError({ message: "The policy associated with this access request has been deleted." });
+ }
+ const policy = await $findPolicyById(
+ request.policyId,
+ "The policy associated with this access request has been deleted."
+ );
+ const { envSlug, secretPath } = verifyRequestedPermissions({
+ permissions: getSecretAccessRequestData(request).permissions
+ });
+ return {
+ policyName: policy.name,
+ requesterName: request.requesterName,
+ requesterEmail: request.requesterEmail,
+ environment: envSlug,
+ secretPath
+ };
+ };
+
const isGlobalAccessApprovalRequest = async (requestId: string) =>
Boolean(await approvalRequestDAL.findOne({ id: requestId, type: ApprovalPolicyType.SecretAccess }));
@@ -296,16 +317,12 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
throw new BadRequestError({ message: constraintValidation.errors?.join("; ") ?? "Policy constraints not met" });
}
- const [requestedByUser, project, delegatedPolicy] = await Promise.all([
+ const [requestedByUser, project] = await Promise.all([
userDAL.findById(requestedByUserId),
- projectDAL.findById(projectId),
- policy.steps.length ? null : delegatedApprovalService.getPolicyByPolicyId(policy.id)
+ projectDAL.findById(projectId)
]);
if (!requestedByUser) throw new ForbiddenRequestError({ message: "User not found" });
if (!project) throw new NotFoundError({ message: `Project with ID '${projectId}' not found` });
- if (!policy.steps.length && !delegatedPolicy) {
- throw new BadRequestError({ message: `Policy '${policy.name}' has no approvers configured` });
- }
const activeGrant = await secretAccessApprovalGlobalResource.canAccess(projectId, requestedByUserId, {
envId,
@@ -332,14 +349,29 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
const parsedMs = requestExpirationTime ? ms(requestExpirationTime) : null;
const expiresAt = parsedMs && !Number.isNaN(parsedMs) ? new Date(Date.now() + parsedMs) : null;
- const created = await approvalRequestDAL.transaction(async (tx) => {
+ // A policy update locks the policy row for update, so sharing it here keeps a request from being
+ // created with approver steps the update is replacing with a delegated reviewer, or the reverse.
+ const { approvalRequest: created, policySteps } = await approvalRequestDAL.transaction(async (tx) => {
+ const lockedPolicy = await approvalPolicyDAL.findByIdForShare(policy.id, tx);
+ if (!lockedPolicy) {
+ throw new NotFoundError({ message: `Policy '${policy.name}' was deleted before the request could be created` });
+ }
+
+ const currentSteps = await approvalPolicyDAL.findStepsByPolicyId(policy.id, tx);
+ const delegatedPolicy = currentSteps.length
+ ? null
+ : await delegatedApprovalService.getPolicyByPolicyId(policy.id, tx);
+ if (!currentSteps.length && !delegatedPolicy) {
+ throw new BadRequestError({ message: `Policy '${policy.name}' has no approvers configured` });
+ }
+
const approvalRequest = await createApprovalRequestWithSteps(
{
projectId,
organizationId: actorOrgId,
policyId: policy.id,
policyType: ApprovalPolicyType.SecretAccess,
- policySteps: policy.steps,
+ policySteps: currentSteps,
requestData,
justification: note || null,
expiresAt,
@@ -354,11 +386,11 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
if (delegatedPolicy) {
await delegatedApprovalService.createRequest({ approvalRequest }, tx);
}
- return approvalRequest;
+ return { approvalRequest, policySteps: currentSteps };
});
const request = await $findRequestById(created.id);
- const [firstStep] = policy.steps;
+ const [firstStep] = policySteps;
if (firstStep) {
await notifySecretAccessStepApprovers(
{
@@ -390,7 +422,7 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
action: AccessRequestWebhookAction.Created,
request: legacyRequest,
project,
- policy: { ...policy, hasSequencedApprovers: policy.steps.length > 1 },
+ policy: { ...policy, hasSequencedApprovers: policySteps.length > 1 },
requestedByUser,
envName
});
@@ -419,6 +451,9 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
request.policyId,
"The policy associated with this access request has been deleted."
);
+ if (policy.delegatedApproval) {
+ throw new BadRequestError({ message: externallyReviewedAccessRequestMessage(requestId) });
+ }
if (!request.requesterId) {
throw new NotFoundError({ message: "The user who created this access request no longer exists" });
}
@@ -863,11 +898,13 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
}
const { delegatedPolicy } = await delegatedApprovalService.retryDispatch({ approvalRequest: request });
+ const auditDetails = await $describeRequestForAudit(request);
return {
request: { ...toLegacyAccessApprovalRequest(request), policyId: delegatedPolicy.policyId },
projectId: request.projectId,
- delegatedApprovalType: delegatedPolicy.type
+ delegatedApprovalType: delegatedPolicy.type,
+ ...auditDetails
};
};
@@ -913,10 +950,12 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
});
const cancelled = await $findRequestByIdFromPrimary(requestId);
+ const auditDetails = await $describeRequestForAudit(cancelled);
return {
request: { ...toLegacyAccessApprovalRequest(cancelled), policyId },
- projectId: request.projectId
+ projectId: request.projectId,
+ ...auditDetails
};
};
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts
index 0e84c1b0da..cf57c2a628 100644
--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts
@@ -8,6 +8,7 @@ import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-grou
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
import { TQueueServiceFactory } from "@app/queue";
import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
+import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";
import {
TApprovalRequestApprovalsDALFactory,
TApprovalRequestDALFactory,
@@ -50,6 +51,7 @@ export type TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep = {
TSecretAccessApprovalGlobalPolicyBridgeDALFactory,
"findSecretAccessPolicies"
>;
+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findByIdForShare" | "findStepsByPolicyId">;
secretAccessApprovalGlobalRequestBridgeDAL: Pick<
TSecretAccessApprovalGlobalRequestBridgeDALFactory,
| "findSecretAccessRequestById"
diff --git a/frontend/src/hooks/api/accessApproval/mutation.tsx b/frontend/src/hooks/api/accessApproval/mutation.tsx
index 93ac3f680a..c4c9f2778e 100644
--- a/frontend/src/hooks/api/accessApproval/mutation.tsx
+++ b/frontend/src/hooks/api/accessApproval/mutation.tsx
@@ -245,7 +245,7 @@ export const useCancelAccessRequest = () => {
>({
mutationFn: async ({ requestId }) => {
const { data } = await apiRequest.post(
- `/api/v1/access-approvals/requests/${requestId}/cancel`
+ `/api/v1/access-approvals/requests/${requestId}/cancel-delegated-dispatch`
);
return data;
},
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
index 01f3d2cc6a..970c1776bd 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
@@ -140,16 +140,7 @@ export const AccessApprovalRequest = ({
projectId: string;
onConfigurePolicies: () => void;
}) => {
- const [selectedRequest, setSelectedRequest] = useState<
- | (TAccessApprovalRequest & {
- user: { firstName?: string | null; lastName?: string | null; email?: string | null } | null;
- isRequestedByCurrentUser: boolean;
- isSelfApproveAllowed: boolean;
- isApprover: boolean;
- isDisabled?: boolean;
- })
- | null
- >(null);
+ const [selectedRequestId, setSelectedRequestId] = useState<string | null>(null);
const { handlePopUpOpen, popUp, handlePopUpClose } = usePopUp([
"requestAccess",
@@ -565,30 +556,38 @@ export const AccessApprovalRequest = ({
const handleSelectRequest = useCallback(
(request: TAccessApprovalRequest) => {
- const details = generateRequestDetails(request);
- const memberUser = membersGroupById?.[request.requestedByUserId]?.user;
-
navigate({ search: (prev) => ({ ...prev, requestId: request.id }) });
-
- setSelectedRequest({
- ...request,
- user: details.isRequestedByCurrentUser
- ? user
- : memberUser || {
- firstName: request.requestedByUser?.firstName,
- lastName: request.requestedByUser?.lastName,
- email: request.requestedByUser?.email
- },
- isRequestedByCurrentUser: details.isRequestedByCurrentUser,
- isSelfApproveAllowed: details.isSelfApproveAllowed,
- isApprover: details.isApprover
- });
-
+ setSelectedRequestId(request.id);
handlePopUpOpen("reviewRequest");
},
- [generateRequestDetails, membersGroupById, user, setSelectedRequest, handlePopUpOpen]
+ [navigate, handlePopUpOpen]
);
+ // The polled list is the source of truth, so the open sheet follows a dispatch that fails or
+ // completes instead of showing the snapshot it was opened with.
+ const selectedRequest = useMemo(() => {
+ if (!selectedRequestId) return null;
+ const request = requests?.find((r) => r.id === selectedRequestId);
+ if (!request) return null;
+
+ const details = generateRequestDetails(request);
+ const memberUser = membersGroupById?.[request.requestedByUserId]?.user;
+
+ return {
+ ...request,
+ user: details.isRequestedByCurrentUser
+ ? user
+ : memberUser || {
+ firstName: request.requestedByUser?.firstName,
+ lastName: request.requestedByUser?.lastName,
+ email: request.requestedByUser?.email
+ },
+ isRequestedByCurrentUser: details.isRequestedByCurrentUser,
+ isSelfApproveAllowed: details.isSelfApproveAllowed,
+ isApprover: details.isApprover
+ };
+ }, [selectedRequestId, requests, generateRequestDetails, membersGroupById, user]);
+
const isFiltered = Boolean(
search ||
validEnvFilter ||
@@ -597,7 +596,7 @@ export const AccessApprovalRequest = ({
);
useEffect(() => {
- if (requestId && !selectedRequest && requests?.length) {
+ if (requestId && !selectedRequestId && requests?.length) {
const foundRequest = requests.find((r) => r.id === requestId);
if (foundRequest) {
handleSelectRequest(foundRequest);
@@ -1073,7 +1072,7 @@ export const AccessApprovalRequest = ({
}
handlePopUpClose("reviewRequest");
- setSelectedRequest(null);
+ setSelectedRequestId(null);
refetchRequests();
}}
canBypass={generateRequestDetails(selectedRequest).canBypass}
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
index ee4fb93f21..90c655dacd 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
@@ -1058,43 +1058,47 @@ export const ReviewAccessRequestModal = ({
{delegatedStatus && (
<section className="flex flex-col gap-3">
<h3 className="text-sm font-normal text-foreground">Status</h3>
- <ItemGroup
- className={twMerge(
- "gap-0 rounded-lg border border-border bg-container",
- delegatedStatus.variant === "danger" && "border-danger/25"
- )}
- >
- <Item className="flex-nowrap items-start rounded-none border-0">
- <ItemContent className="min-w-0 gap-1">
- <span className="text-sm text-foreground">
- {delegatedStatus.getMessage(delegatedApprovalName)}
- </span>
- {!isRetryingDelegatedDispatch &&
- request.delegatedApproval?.statusReason && (
- <span className="text-xs break-words text-muted">
- {request.delegatedApproval.statusReason}
- </span>
- )}
- </ItemContent>
- <ItemActions className="shrink-0 items-center gap-3">
- <span className="text-xs whitespace-nowrap text-muted">
- Requested {format(new Date(request.createdAt), "MMM d, yyyy h:mm aa")}
- </span>
- {canRetryDispatch && (
- <Button
- type="button"
- size="sm"
- variant="outline"
- isPending={retryDelegatedApprovalDispatch.isPending}
- onClick={handleRetryDispatch}
- >
- <RefreshCwIcon />
- Retry
- </Button>
+ <Item variant="outline">
+ <ItemMedia variant="icon">
+ {delegatedStatus.variant === "danger" && (
+ <TriangleAlertIcon className="text-danger" />
+ )}
+ {delegatedStatus.variant === "success" && (
+ <CheckIcon className="text-success" />
+ )}
+ {delegatedStatus.variant === "warning" && (
+ <HourglassIcon className="text-warning" />
+ )}
+ </ItemMedia>
+ <ItemContent>
+ <span className="text-sm text-foreground">
+ {delegatedStatus.getMessage(delegatedApprovalName)}
+ </span>
+ {!isRetryingDelegatedDispatch &&
+ request.delegatedApproval?.statusReason && (
+ <span className="text-xs break-words text-muted">
+ {request.delegatedApproval.statusReason}
+ </span>
)}
- </ItemActions>
- </Item>
- </ItemGroup>
+ </ItemContent>
+ <ItemActions>
+ <span className="text-xs whitespace-nowrap text-muted">
+ Requested {format(new Date(request.createdAt), "MMM d, yyyy h:mm aa")}
+ </span>
+ {canRetryDispatch && (
+ <Button
+ type="button"
+ size="sm"
+ variant="outline"
+ isPending={retryDelegatedApprovalDispatch.isPending}
+ onClick={handleRetryDispatch}
+ >
+ <RefreshCwIcon />
+ Retry
+ </Button>
+ )}
+ </ItemActions>
+ </Item>
</section>
)}
</>