Skip to content

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

feat(pki): application names in audit log events

bernie-ge35aefd4bcd3
diff --git a/backend/src/ee/routes/scep/pki-scep-router.ts b/backend/src/ee/routes/scep/pki-scep-router.ts
index 18554ad92a..bf11c4c272 100644
--- a/backend/src/ee/routes/scep/pki-scep-router.ts
+++ b/backend/src/ee/routes/scep/pki-scep-router.ts
@@ -185,6 +185,8 @@ export const registerPkiScepRouter = async (server: FastifyZodProvider) => {
actorOrgId: req.permission.orgId
});
+ const applicationName = await server.services.pkiApplication.getApplicationNameById(applicationId);
+
void server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: result.projectId,
@@ -194,7 +196,8 @@ export const registerPkiScepRouter = async (server: FastifyZodProvider) => {
profileId,
profileSlug: result.profileSlug,
expiresAt: result.expiresAt,
- applicationId
+ applicationId,
+ ...(applicationName && { applicationName })
}
}
});
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 37aef8ea85..a49e5af76a 100644
--- a/backend/src/ee/services/audit-log/audit-log-types.ts
+++ b/backend/src/ee/services/audit-log/audit-log-types.ts
@@ -3241,6 +3241,7 @@ interface CreatePkiAlert {
pkiAlertId: string;
pkiCollectionId?: string;
applicationId?: string;
+ applicationName?: string;
name: string;
alertBefore?: string;
eventType: PkiAlertEventType;
@@ -3252,6 +3253,7 @@ interface GetPkiAlert {
metadata: {
pkiAlertId: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -3261,6 +3263,7 @@ interface UpdatePkiAlert {
pkiAlertId: string;
pkiCollectionId?: string;
applicationId?: string;
+ applicationName?: string;
name?: string;
alertBefore?: string;
eventType?: PkiAlertEventType;
@@ -3272,6 +3275,7 @@ interface DeletePkiAlert {
metadata: {
pkiAlertId: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -3339,6 +3343,7 @@ interface CreateCertificateInventoryView {
columns?: string[];
isShared?: boolean;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -3351,6 +3356,7 @@ interface UpdateCertificateInventoryView {
columns?: string[];
isShared?: boolean;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -3360,6 +3366,7 @@ interface DeleteCertificateInventoryView {
viewId: string;
name: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -3747,6 +3754,7 @@ interface AttachPkiApplicationProfiles {
type: EventType.ATTACH_PKI_APPLICATION_PROFILES;
metadata: {
applicationId: string;
+ applicationName?: string;
profileIds: string[];
};
}
@@ -3755,6 +3763,7 @@ interface DetachPkiApplicationProfile {
type: EventType.DETACH_PKI_APPLICATION_PROFILE;
metadata: {
applicationId: string;
+ applicationName?: string;
profileId: string;
};
}
@@ -3818,6 +3827,7 @@ interface GetPkiApplicationEnrollment {
type: EventType.GET_PKI_APPLICATION_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -3826,6 +3836,7 @@ interface SetPkiApplicationApiEnrollment {
type: EventType.SET_PKI_APPLICATION_API_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
autoRenew: boolean;
renewBeforeDays: number | null;
@@ -3836,6 +3847,7 @@ interface ClearPkiApplicationApiEnrollment {
type: EventType.CLEAR_PKI_APPLICATION_API_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -3844,6 +3856,7 @@ interface SetPkiApplicationEstEnrollment {
type: EventType.SET_PKI_APPLICATION_EST_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
disableBootstrapCaValidation: boolean;
};
@@ -3853,6 +3866,7 @@ interface ClearPkiApplicationEstEnrollment {
type: EventType.CLEAR_PKI_APPLICATION_EST_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -3861,6 +3875,7 @@ interface SetPkiApplicationAcmeEnrollment {
type: EventType.SET_PKI_APPLICATION_ACME_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
skipDnsOwnershipVerification: boolean;
skipEabBinding: boolean;
@@ -3871,6 +3886,7 @@ interface ClearPkiApplicationAcmeEnrollment {
type: EventType.CLEAR_PKI_APPLICATION_ACME_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -3879,6 +3895,7 @@ interface RevealPkiApplicationAcmeEabSecret {
type: EventType.REVEAL_PKI_APPLICATION_ACME_EAB_SECRET;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -3887,6 +3904,7 @@ interface RotatePkiApplicationAcmeEabSecret {
type: EventType.ROTATE_PKI_APPLICATION_ACME_EAB_SECRET;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -3895,6 +3913,7 @@ interface SetPkiApplicationScepEnrollment {
type: EventType.SET_PKI_APPLICATION_SCEP_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
challengeType: string;
signRaWithCa: boolean;
@@ -3907,6 +3926,7 @@ interface ClearPkiApplicationScepEnrollment {
type: EventType.CLEAR_PKI_APPLICATION_SCEP_ENROLLMENT;
metadata: {
applicationId: string;
+ applicationName: string;
profileId: string;
};
}
@@ -4044,6 +4064,7 @@ interface IssueCertificateFromProfile {
status: CertificateRequestStatus;
serialNumber?: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4058,6 +4079,7 @@ interface SignCertificateFromProfile {
status: CertificateRequestStatus;
serialNumber?: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4071,6 +4093,7 @@ interface OrderCertificateFromProfile {
status: CertificateRequestStatus;
serialNumber?: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4611,6 +4634,7 @@ interface GetPkiSyncEvent {
destination: string;
syncId: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4622,6 +4646,7 @@ interface GetPkiSyncCertificatesEvent {
certificateIds: string[];
destination: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4632,6 +4657,7 @@ interface CreatePkiSyncEvent {
name: string;
destination: string;
applicationId?: string;
+ applicationName?: string;
connectionId?: string;
connectionName?: string;
targetHost?: string;
@@ -4647,6 +4673,7 @@ interface UpdatePkiSyncEvent {
pkiSyncId: string;
name: string;
applicationId?: string;
+ applicationName?: string;
destination?: string;
connectionId?: string;
connectionName?: string;
@@ -4663,6 +4690,7 @@ interface DeletePkiSyncEvent {
name: string;
destination: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4727,6 +4755,7 @@ interface PkiSyncSetDefaultCertificateEvent {
name: string;
certificateId: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -4736,6 +4765,7 @@ interface PkiSyncClearDefaultCertificateEvent {
pkiSyncId: string;
name: string;
applicationId?: string;
+ applicationName?: string;
};
}
@@ -7120,6 +7150,7 @@ interface ScepDynamicChallengeGeneratedEvent {
profileSlug: string;
expiresAt: string;
applicationId?: string;
+ applicationName?: string;
};
}
diff --git a/backend/src/server/routes/v1/certificate-inventory-view-router.ts b/backend/src/server/routes/v1/certificate-inventory-view-router.ts
index fc64ab71b3..300c114d98 100644
--- a/backend/src/server/routes/v1/certificate-inventory-view-router.ts
+++ b/backend/src/server/routes/v1/certificate-inventory-view-router.ts
@@ -149,6 +149,10 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodP
actorAuthMethod: req.permission.authMethod,
actor: req.permission.type
});
+ const applicationName = view.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(view.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -160,7 +164,8 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodP
filters: req.body.filters,
columns: req.body.columns,
isShared: req.body.isShared,
- ...(view.applicationId && { applicationId: view.applicationId })
+ ...(view.applicationId && { applicationId: view.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -209,6 +214,10 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodP
actorAuthMethod: req.permission.authMethod,
actor: req.permission.type
});
+ const applicationName = view.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(view.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -220,7 +229,8 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodP
filters: req.body.filters,
columns: req.body.columns,
isShared: req.body.isShared,
- ...(view.applicationId && { applicationId: view.applicationId })
+ ...(view.applicationId && { applicationId: view.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -258,6 +268,10 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodP
actorAuthMethod: req.permission.authMethod,
actor: req.permission.type
});
+ const applicationName = view.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(view.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -266,7 +280,8 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodP
metadata: {
viewId: req.params.viewId,
name: view.name,
- ...(view.applicationId && { applicationId: view.applicationId })
+ ...(view.applicationId && { applicationId: view.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
diff --git a/backend/src/server/routes/v1/certificate-router.ts b/backend/src/server/routes/v1/certificate-router.ts
index 85ab84cec4..ebae210bfd 100644
--- a/backend/src/server/routes/v1/certificate-router.ts
+++ b/backend/src/server/routes/v1/certificate-router.ts
@@ -236,6 +236,10 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
removeRootsFromChain: requestBody.removeRootsFromChain
});
+ const applicationName = requestBody.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(requestBody.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: data.projectId,
@@ -248,7 +252,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
profileName: data.profileName,
status: data.status,
...(data.serialNumber && { serialNumber: data.serialNumber }),
- ...(requestBody.applicationId && { applicationId: requestBody.applicationId })
+ ...(requestBody.applicationId && { applicationId: requestBody.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -293,6 +298,10 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
basicConstraints: attributes?.basicConstraints
});
+ const applicationName = requestBody.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(requestBody.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: data.projectId,
@@ -306,7 +315,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
commonName: extractedCsrData.commonName || "",
status: data.status,
...(data.serialNumber && { serialNumber: data.serialNumber }),
- ...(requestBody.applicationId && { applicationId: requestBody.applicationId })
+ ...(requestBody.applicationId && { applicationId: requestBody.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -377,6 +387,10 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
removeRootsFromChain: requestBody.removeRootsFromChain
});
+ const applicationName = requestBody.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(requestBody.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: data.projectId,
@@ -390,7 +404,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
profileName: data.profileName,
status: data.status,
...(data.serialNumber && { serialNumber: data.serialNumber }),
- ...(requestBody.applicationId && { applicationId: requestBody.applicationId })
+ ...(requestBody.applicationId && { applicationId: requestBody.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
diff --git a/backend/src/server/routes/v1/pki-alert-router.ts b/backend/src/server/routes/v1/pki-alert-router.ts
index 06414f6528..47fbc3b306 100644
--- a/backend/src/server/routes/v1/pki-alert-router.ts
+++ b/backend/src/server/routes/v1/pki-alert-router.ts
@@ -73,6 +73,10 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
projectId: req.internalCertManagerProjectId
});
+ const applicationName = alert.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -83,7 +87,8 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
name: alert.name,
eventType: alert.eventType,
alertBefore: alert.alertBefore,
- ...(alert.applicationId && { applicationId: alert.applicationId })
+ ...(alert.applicationId && { applicationId: alert.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -218,6 +223,10 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
actorOrgId: req.permission.orgId
});
+ const applicationName = alert.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: alert.projectId,
@@ -225,7 +234,8 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
type: EventType.GET_PKI_ALERT,
metadata: {
pkiAlertId: alert.id,
- ...(alert.applicationId && { applicationId: alert.applicationId })
+ ...(alert.applicationId && { applicationId: alert.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -289,6 +299,10 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
...req.body
});
+ const applicationName = alert.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: alert.projectId,
@@ -299,7 +313,8 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
name: alert.name,
eventType: alert.eventType,
alertBefore: alert.alertBefore,
- ...(alert.applicationId && { applicationId: alert.applicationId })
+ ...(alert.applicationId && { applicationId: alert.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
@@ -361,6 +376,10 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
actorOrgId: req.permission.orgId
});
+ const applicationName = alert.applicationId
+ ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)
+ : undefined;
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: alert.projectId,
@@ -368,7 +387,8 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {
type: EventType.DELETE_PKI_ALERT,
metadata: {
pkiAlertId: alert.id,
- ...(alert.applicationId && { applicationId: alert.applicationId })
+ ...(alert.applicationId && { applicationId: alert.applicationId }),
+ ...(applicationName && { applicationName })
}
}
});
diff --git a/backend/src/server/routes/v1/pki-application-alert-router.ts b/backend/src/server/routes/v1/pki-application-alert-router.ts
index e778bd1f35..8739088793 100644
--- a/backend/src/server/routes/v1/pki-application-alert-router.ts
+++ b/backend/src/server/routes/v1/pki-application-alert-router.ts
@@ -86,6 +86,8 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid
...req.body
});
+ const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -94,6 +96,7 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid
metadata: {
pkiAlertId: alert.id,
applicationId: req.params.applicationId,
+ ...(applicationName && { applicationName }),
name: alert.name,
alertBefore: alert.alertBefore ?? undefined,
eventType: alert.eventType
@@ -145,6 +148,8 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid
...req.body
});
+ const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -153,6 +158,7 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid
metadata: {
pkiAlertId: alert.id,
applicationId: req.params.applicationId,
+ ...(applicationName && { applicationName }),
name: alert.name,
alertBefore: alert.alertBefore ?? undefined,
eventType: alert.eventType
@@ -201,6 +207,8 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid
alertId: req.params.alertId
});
+ const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -208,7 +216,8 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid
type: EventType.DELETE_PKI_ALERT,
metadata: {
pkiAlertId: alert.id,
- applicationId: req.params.applicationId
+ applicationId: req.params.applicationId,
+ ...(applicationName && { applicationName })
}
}
});
diff --git a/backend/src/server/routes/v1/pki-application-enrollment-routers/acme-enrollment-router.ts b/backend/src/server/routes/v1/pki-application-enrollment-routers/acme-enrollment-router.ts
index cbb3f7ec0b..697f993818 100644
--- a/backend/src/server/routes/v1/pki-application-enrollment-routers/acme-enrollment-router.ts
+++ b/backend/src/server/routes/v1/pki-application-enrollment-routers/acme-enrollment-router.ts
@@ -62,6 +62,7 @@ export const registerPkiApplicationAcmeEnrollmentRouter = async (server: Fastify
type: EventType.SET_PKI_APPLICATION_ACME_ENROLLMENT,
metadata: {
applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
profileId: req.params.profileId,
skipDnsOwnershipVerification: result.acme.skipDnsOwnershipVerification,
skipEabBinding: result.acme.skipEabBinding
@@ -111,7 +112,11 @@ export const registerPkiApplicationAcmeEnrollmentRouter = async (server: Fastify
projectId: req.internalCertManagerProjectId,
event: {
type: EventType.CLEAR_PKI_APPLICATION_ACME_ENROLLMENT,
- metadata: { applicationId: req.params.applicationId, profileId: req.params.profileId }
+ metadata: {
+ applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
+ profileId: req.params.profileId
+ }
}
});
await server.services.telemetry.sendPostHogEvents({
@@ -163,7 +168,11 @@ export const registerPkiApplicationAcmeEnrollmentRouter = async (server: Fastify
projectId: req.internalCertManagerProjectId,
event: {
type: EventType.REVEAL_PKI_APPLICATION_ACME_EAB_SECRET,
- metadata: { applicationId: req.params.applicationId, profileId: req.params.profileId }
+ metadata: {
+ applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
+ profileId: req.params.profileId
+ }
}
});
return result;
@@ -198,7 +207,11 @@ export const registerPkiApplicationAcmeEnrollmentRouter = async (server: Fastify
projectId: req.internalCertManagerProjectId,
event: {
type: EventType.ROTATE_PKI_APPLICATION_ACME_EAB_SECRET,
- metadata: { applicationId: req.params.applicationId, profileId: req.params.profileId }
+ metadata: {
+ applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
+ profileId: req.params.profileId
+ }
}
});
return result;
diff --git a/backend/src/server/routes/v1/pki-application-enrollment-routers/api-enrollment-router.ts b/backend/src/server/routes/v1/pki-application-enrollment-routers/api-enrollment-router.ts
index c72fde6ca2..8e1980fff9 100644
--- a/backend/src/server/routes/v1/pki-application-enrollment-routers/api-enrollment-router.ts
+++ b/backend/src/server/routes/v1/pki-application-enrollment-routers/api-enrollment-router.ts
@@ -63,6 +63,7 @@ export const registerPkiApplicationApiEnrollmentRouter = async (server: FastifyZ
type: EventType.SET_PKI_APPLICATION_API_ENROLLMENT,
metadata: {
applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
profileId: req.params.profileId,
autoRenew: result.api.autoRenew,
renewBeforeDays: result.api.renewBeforeDays
@@ -124,6 +125,7 @@ export const registerPkiApplicationApiEnrollmentRouter = async (server: FastifyZ
type: EventType.CLEAR_PKI_APPLICATION_API_ENROLLMENT,
metadata: {
applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
profileId: req.params.profileId
}
}
diff --git a/backend/src/server/routes/v1/pki-application-enrollment-routers/enrollment-state-router.ts b/backend/src/server/routes/v1/pki-application-enrollment-routers/enrollment-state-router.ts
index 613bf50117..0a15a20355 100644
--- a/backend/src/server/routes/v1/pki-application-enrollment-routers/enrollment-state-router.ts
+++ b/backend/src/server/routes/v1/pki-application-enrollment-routers/enrollment-state-router.ts
@@ -90,6 +90,7 @@ export const registerPkiApplicationEnrollmentStateRouter = async (server: Fastif
type: EventType.GET_PKI_APPLICATION_ENROLLMENT,
metadata: {
applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
profileId: req.params.profileId
}
}
diff --git a/backend/src/server/routes/v1/pki-application-enrollment-routers/est-enrollment-router.ts b/backend/src/server/routes/v1/pki-application-enrollment-routers/est-enrollment-router.ts
index bf75477445..93904f8f69 100644
--- a/backend/src/server/routes/v1/pki-application-enrollment-routers/est-enrollment-router.ts
+++ b/backend/src/server/routes/v1/pki-application-enrollment-routers/est-enrollment-router.ts
@@ -55,6 +55,7 @@ export const registerPkiApplicationEstEnrollmentRouter = async (server: FastifyZ
type: EventType.SET_PKI_APPLICATION_EST_ENROLLMENT,
metadata: {
applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
profileId: req.params.profileId,
disableBootstrapCaValidation: result.est.disableBootstrapCaValidation
}
@@ -105,7 +106,11 @@ export const registerPkiApplicationEstEnrollmentRouter = async (server: FastifyZ
projectId: req.internalCertManagerProjectId,
event: {
type: EventType.CLEAR_PKI_APPLICATION_EST_ENROLLMENT,
- metadata: { applicationId: req.params.applicationId, profileId: req.params.profileId }
+ metadata: {
+ applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
+ profileId: req.params.profileId
+ }
}
});
await server.services.telemetry.sendPostHogEvents({
diff --git a/backend/src/server/routes/v1/pki-application-enrollment-routers/scep-enrollment-router.ts b/backend/src/server/routes/v1/pki-application-enrollment-routers/scep-enrollment-router.ts
index 8fda923835..7c92c64360 100644
--- a/backend/src/server/routes/v1/pki-application-enrollment-routers/scep-enrollment-router.ts
+++ b/backend/src/server/routes/v1/pki-application-enrollment-routers/scep-enrollment-router.ts
@@ -59,6 +59,7 @@ export const registerPkiApplicationScepEnrollmentRouter = async (server: Fastify
type: EventType.SET_PKI_APPLICATION_SCEP_ENROLLMENT,
metadata: {
applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
profileId: req.params.profileId,
challengeType: result.scep.challengeType,
signRaWithCa: result.signRaWithCa,
@@ -112,7 +113,11 @@ export const registerPkiApplicationScepEnrollmentRouter = async (server: Fastify
projectId: req.internalCertManagerProjectId,
event: {
type: EventType.CLEAR_PKI_APPLICATION_SCEP_ENROLLMENT,
- metadata: { applicationId: req.params.applicationId, profileId: req.params.profileId }
+ metadata: {
+ applicationId: req.params.applicationId,
+ applicationName: result.applicationName,
+ profileId: req.params.profileId
+ }
}
});
await server.services.telemetry.sendPostHogEvents({
diff --git a/backend/src/server/routes/v1/pki-application-profile-router.ts b/backend/src/server/routes/v1/pki-application-profile-router.ts
index 0bc32b850b..27c8675820 100644
--- a/backend/src/server/routes/v1/pki-application-profile-router.ts
+++ b/backend/src/server/routes/v1/pki-application-profile-router.ts
@@ -69,6 +69,8 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProv
profileIds: req.body.profileIds
});
+ const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -76,6 +78,7 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProv
type: EventType.ATTACH_PKI_APPLICATION_PROFILES,
metadata: {
applicationId: req.params.applicationId,
+ ...(applicationName && { applicationName }),
profileIds: req.body.profileIds
}
}
@@ -128,6 +131,8 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProv
profileId: req.params.profileId
});
+ const applicationName = await server.services.pkiApplication.getApplicationNameById(result.applicationId);
+
await server.services.auditLog.createAuditLog({
...req.auditLogInfo,
projectId: req.internalCertManagerProjectId,
@@ -135,6 +140,7 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProv
type: EventType.DETACH_PKI_APPLICATION_PROFILE,
metadata: {
applicationId: result.applicationId,
+ ...(applicationName && { applicationName }),
profileId: result.profileId
}
}
diff --git a/backend/src/server/routes/v1/pki-sync-routers/aws-elastic-load-balancer-pki-sync-router.ts b/backend/src/server/routes/v1/pki-sync-routers/aws-elastic-load-balancer-pki-sync-router.ts
index 0ea17ef610..1069d7419f 100644
--- a/backend/src/server/routes/v1/pki-sync-routers/aws-elastic-load-balancer-pki-sync-router.ts
+++ b/backend/src/server/routes/v1/pki-sync-routers/aws-elastic-load-balancer-pki-sync-router.ts
@@ -169,7 +169,8 @@ export const registerAwsElasticLoadBalancerPkiSyncRouter = async (
pkiSyncId,
name: pkiSyncInfo.name,
certificateId,
- ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId })
+ ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId }),
+ ...(pkiSyncInfo.applicationName && { applicationName: pkiSyncInfo.applicationName })
}
}
});
@@ -215,7 +216,8 @@ export const registerAwsElasticLoadBalancerPkiSyncRouter = async (
metadata: {
pkiSyncId,
name: pkiSyncInfo.name,
- ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId })
+ ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId }),
+ ...(pkiSyncInfo.applicationName && { applicationName: pkiSyncInfo.applicationName })
}
}
});
diff --git a/backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts b/backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts
index 7afcc2982d..464e8606a6 100644
--- a/backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts
+++ b/backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts
@@ -141,7 +141,8 @@ export const registerSyncPkiEndpoints = ({
metadata: {
syncId: pkiSyncId,
destination,
- ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId })
+ ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId }),
+ ...(pkiSync.applicationName && { applicationName: pkiSync.applicationName })
}
}
});
@@ -190,7 +191,8 @@ export const registerSyncPkiEndpoints = ({
hasCredentials: Boolean(req.body.credentials?.exportPassword),
hasPostSyncCommand: Boolean(req.body.syncOptions?.postSyncCommand),
hasHealthCheckCommand: Boolean(req.body.syncOptions?.healthCheckCommand),
- ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId })
+ ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId }),
+ ...(pkiSync.applicationName && { applicationName: pkiSync.applicationName })
}
}
});
@@ -247,6 +249,7 @@ export const registerSyncPkiEndpoints = ({
pkiSyncId,
name: pkiSync.name,
...(pkiSync.applicationId && { applicationId: pkiSync.applicationId }),
+ ...(pkiSync.applicationName && { applicationName: pkiSync.applicationName }),
destination: pkiSync.destination,
connectionId: pkiSync.connectionId,
connectionName: pkiSync.appConnectionName,
@@ -306,7 +309,8 @@ export const registerSyncPkiEndpoints = ({
pkiSyncId,
name: pkiSync.name,
destination: pkiSync.destination,
- ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId })
+ ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId }),
+ ...(pkiSync.applicationName && { applicationName: pkiSync.applicationName })
}
}
});
diff --git a/backend/src/server/routes/v1/pki-sync-routers/pki-sync-router.ts b/backend/src/server/routes/v1/pki-sync-routers/pki-sync-router.ts
index f466fcc443..a6a612c443 100644
--- a/backend/src/server/routes/v1/pki-sync-routers/pki-sync-router.ts
+++ b/backend/src/server/routes/v1/pki-sync-routers/pki-sync-router.ts
@@ -216,7 +216,8 @@ export const registerPkiSyncRouter = async (server: FastifyZodProvider, enableOp
metadata: {
syncId: pkiSyncId,
destination: pkiSync.destination,
- ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId })
+ ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId }),
+ ...(pkiSync.applicationName && { applicationName: pkiSync.applicationName })
}
}
});
@@ -270,7 +271,8 @@ export const registerPkiSyncRouter = async (server: FastifyZodProvider, enableOp
destination: pkiSyncInfo.destination,
count: certificates.length,
certificateIds: certificates.map((c) => c.certificateId),
- ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId })
+ ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId }),
+ ...(pkiSyncInfo.applicationName && { applicationName: pkiSyncInfo.applicationName })
}
}
});
@@ -331,7 +333,8 @@ export const registerPkiSyncRouter = async (server: FastifyZodProvider, enableOp
metadata: {
pkiSyncId,
name: pkiSyncInfo.name,
- ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId })
+ ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId }),
+ ...(pkiSyncInfo.applicationName && { applicationName: pkiSyncInfo.applicationName })
}
}
});
@@ -381,7 +384,8 @@ export const registerPkiSyncRouter = async (server: FastifyZodProvider, enableOp
metadata: {
pkiSyncId,
name: pkiSyncInfo.name,
- ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId })
+ ...(pkiSyncInfo.applicationId && { applicationId: pkiSyncInfo.applicationId }),
+ ...(pkiSyncInfo.applicationName && { applicationName: pkiSyncInfo.applicationName })
}
}
});
diff --git a/backend/src/services/pki-application/pki-application-enrollment-service.ts b/backend/src/services/pki-application/pki-application-enrollment-service.ts
index 7858608cde..5e259fd5f7 100644
--- a/backend/src/services/pki-application/pki-application-enrollment-service.ts
+++ b/backend/src/services/pki-application/pki-application-enrollment-service.ts
@@ -161,7 +161,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
});
}
- return { junction };
+ return { junction, application };
};
const $assertEditEnrollment = async (
@@ -173,7 +173,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod: TProjectPermission["actorAuthMethod"],
actorOrgId: TProjectPermission["actorOrgId"]
) => {
- const { junction } = await $loadJunction(applicationId, profileId, projectId);
+ const { junction, application } = await $loadJunction(applicationId, profileId, projectId);
const { permission } = await permissionService.getResourcePermission({
actor,
actorId,
@@ -191,7 +191,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
ResourcePermissionApplicationEnrollmentActions.Edit,
ResourcePermissionSub.ApplicationEnrollment
);
- return { junction };
+ return { junction, application };
};
const getEnrollment = async ({
@@ -203,7 +203,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TGetEnrollmentDTO) => {
- const { junction } = await $loadJunction(applicationId, profileId, projectId);
+ const { junction, application } = await $loadJunction(applicationId, profileId, projectId);
const { permission } = await permissionService.getResourcePermission({
actor,
@@ -237,6 +237,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
return {
applicationId,
+ applicationName: application.name,
profileId,
api: apiConfig
? {
@@ -296,7 +297,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TSetApiEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -341,6 +342,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
}
return {
applicationId,
+ applicationName: application.name,
profileId,
api: {
id: apiConfig.id,
@@ -360,7 +362,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TClearApiEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -371,7 +373,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
);
if (!junction.apiConfigId) {
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
}
await pkiApplicationProfileDAL.transaction(async (tx) => {
@@ -379,7 +381,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
await apiEnrollmentConfigDAL.deleteById(junction.apiConfigId as string, tx);
});
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
};
const setEstEnrollment = async ({
@@ -392,7 +394,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TSetEstEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -452,6 +454,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
}
return {
applicationId,
+ applicationName: application.name,
profileId,
est: { id: estConfigId, disableBootstrapCaValidation: config.disableBootstrapCaValidation ?? false }
};
@@ -467,7 +470,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TClearMethodEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -476,12 +479,12 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
);
- if (!junction.estConfigId) return { applicationId, profileId };
+ if (!junction.estConfigId) return { applicationId, applicationName: application.name, profileId };
await pkiApplicationProfileDAL.transaction(async (tx) => {
await pkiApplicationProfileDAL.update({ applicationId, profileId }, { estConfigId: null }, tx);
await estEnrollmentConfigDAL.deleteById(junction.estConfigId as string, tx);
});
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
};
const setAcmeEnrollment = async ({
@@ -494,7 +497,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TSetAcmeEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -537,6 +540,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
}
return {
applicationId,
+ applicationName: application.name,
profileId,
acme: {
id: acmeConfigId,
@@ -556,7 +560,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TClearMethodEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -565,12 +569,12 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
);
- if (!junction.acmeConfigId) return { applicationId, profileId };
+ if (!junction.acmeConfigId) return { applicationId, applicationName: application.name, profileId };
await pkiApplicationProfileDAL.transaction(async (tx) => {
await pkiApplicationProfileDAL.update({ applicationId, profileId }, { acmeConfigId: null }, tx);
await acmeEnrollmentConfigDAL.deleteById(junction.acmeConfigId as string, tx);
});
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
};
const revealAcmeEabSecret = async ({
@@ -582,7 +586,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TRevealEabSecretDTO) => {
- const { junction } = await $loadJunction(applicationId, profileId, projectId);
+ const { junction, application } = await $loadJunction(applicationId, profileId, projectId);
const { permission } = await permissionService.getResourcePermission({
actor,
actorId,
@@ -615,6 +619,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
return {
applicationId,
+ applicationName: application.name,
profileId,
eabKid: acmeConfig.id,
eabSecret: eabSecret.toString("base64url")
@@ -630,7 +635,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TRevealEabSecretDTO) => {
- const { junction } = await $loadJunction(applicationId, profileId, projectId);
+ const { junction, application } = await $loadJunction(applicationId, profileId, projectId);
const { permission } = await permissionService.getResourcePermission({
actor,
actorId,
@@ -654,7 +659,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
}
const { encryptedEabSecret } = await generateAndEncryptAcmeEabSecret(projectId, kmsService, projectDAL);
await acmeEnrollmentConfigDAL.updateById(junction.acmeConfigId, { encryptedEabSecret });
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
};
const setScepEnrollment = async ({
@@ -669,7 +674,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorRootOrgId,
actorParentOrgId
}: TSetScepEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -861,6 +866,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
}
return {
applicationId,
+ applicationName: application.name,
profileId,
scep: { id: scepConfigId, challengeType },
signRaWithCa,
@@ -880,7 +886,7 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
}: TClearMethodEnrollmentDTO) => {
- const { junction } = await $assertEditEnrollment(
+ const { junction, application } = await $assertEditEnrollment(
applicationId,
profileId,
projectId,
@@ -889,12 +895,12 @@ export const pkiApplicationEnrollmentServiceFactory = ({
actorAuthMethod,
actorOrgId
);
- if (!junction.scepConfigId) return { applicationId, profileId };
+ if (!junction.scepConfigId) return { applicationId, applicationName: application.name, profileId };
await pkiApplicationProfileDAL.transaction(async (tx) => {
await pkiApplicationProfileDAL.update({ applicationId, profileId }, { scepConfigId: null }, tx);
await scepEnrollmentConfigDAL.deleteById(junction.scepConfigId as string, tx);
});
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
};
return {
diff --git a/backend/src/services/pki-application/pki-application-service.ts b/backend/src/services/pki-application/pki-application-service.ts
index 02444df3d3..b5278d01ca 100644
--- a/backend/src/services/pki-application/pki-application-service.ts
+++ b/backend/src/services/pki-application/pki-application-service.ts
@@ -217,6 +217,11 @@ export const pkiApplicationServiceFactory = ({
return application;
};
+ const getApplicationNameById = async (applicationId: string) => {
+ const application = await pkiApplicationDAL.findById(applicationId);
+ return application?.name;
+ };
+
const getApplicationByName = async ({
name,
projectId,
@@ -576,6 +581,7 @@ export const pkiApplicationServiceFactory = ({
createApplication,
getApplicationById,
getApplicationByName,
+ getApplicationNameById,
listApplications,
updateApplication,
deleteApplication,
diff --git a/backend/src/services/pki-sync/pki-sync-service.ts b/backend/src/services/pki-sync/pki-sync-service.ts
index 785dc27b11..2601bc0545 100644
--- a/backend/src/services/pki-sync/pki-sync-service.ts
+++ b/backend/src/services/pki-sync/pki-sync-service.ts
@@ -823,7 +823,8 @@ export const pkiSyncServiceFactory = ({
);
}
- return pkiSyncDAL.deleteById(id);
+ const deleted = await pkiSyncDAL.deleteById(id);
+ return { ...deleted, applicationName: pkiSync.applicationName };
};
const listPkiSyncsByProjectId = async (
@@ -1189,7 +1190,13 @@ export const pkiSyncServiceFactory = ({
actor: OrgServiceActor
): Promise<{
addedCertificates: TCertificateSyncs[];
- pkiSyncInfo: { projectId: string; destination: string; name: string; applicationId?: string | null };
+ pkiSyncInfo: {
+ projectId: string;
+ destination: string;
+ name: string;
+ applicationId?: string | null;
+ applicationName?: string | null;
+ };
}> => {
const pkiSync = await pkiSyncDAL.findById(pkiSyncId);
if (!pkiSync) throw new NotFoundError({ message: "PKI sync not found" });
@@ -1243,7 +1250,8 @@ export const pkiSyncServiceFactory = ({
projectId: pkiSync.projectId,
destination: pkiSync.destination,
name: pkiSync.name,
- applicationId: pkiSync.applicationId
+ applicationId: pkiSync.applicationId,
+ applicationName: pkiSync.applicationName
}
};
};
@@ -1253,7 +1261,13 @@ export const pkiSyncServiceFactory = ({
actor: OrgServiceActor
): Promise<{
removedCount: number;
- pkiSyncInfo: { projectId: string; destination: string; name: string; applicationId?: string | null };
+ pkiSyncInfo: {
+ projectId: string;
+ destination: string;
+ name: string;
+ applicationId?: string | null;
+ applicationName?: string | null;
+ };
}> => {
const pkiSync = await pkiSyncDAL.findById(pkiSyncId);
if (!pkiSync) throw new NotFoundError({ message: "PKI sync not found" });
@@ -1289,7 +1303,8 @@ export const pkiSyncServiceFactory = ({
projectId: pkiSync.projectId,
destination: pkiSync.destination,
name: pkiSync.name,
- applicationId: pkiSync.applicationId
+ applicationId: pkiSync.applicationId,
+ applicationName: pkiSync.applicationName
}
};
};
@@ -1300,7 +1315,13 @@ export const pkiSyncServiceFactory = ({
): Promise<{
certificates: TPkiSyncCertificate[];
totalCount: number;
- pkiSyncInfo: { projectId: string; destination: string; name: string; applicationId?: string | null };
+ pkiSyncInfo: {
+ projectId: string;
+ destination: string;
+ name: string;
+ applicationId?: string | null;
+ applicationName?: string | null;
+ };
}> => {
const pkiSync = await pkiSyncDAL.findById(pkiSyncId);
if (!pkiSync) throw new NotFoundError({ message: "PKI sync not found" });
@@ -1357,7 +1378,8 @@ export const pkiSyncServiceFactory = ({
projectId: pkiSync.projectId,
destination: pkiSync.destination,
name: pkiSync.name,
- applicationId: pkiSync.applicationId
+ applicationId: pkiSync.applicationId,
+ applicationName: pkiSync.applicationName
}
};
};
@@ -1365,7 +1387,10 @@ export const pkiSyncServiceFactory = ({
const setCertificateAsDefault = async (
{ pkiSyncId, certificateId }: Omit<TSetCertificateAsDefaultDTO, "auditLogInfo">,
actor: OrgServiceActor
- ): Promise<{ message: string; pkiSyncInfo: { projectId: string; name: string; applicationId?: string | null } }> => {
+ ): Promise<{
+ message: string;
+ pkiSyncInfo: { projectId: string; name: string; applicationId?: string | null; applicationName?: string | null };
+ }> => {
const pkiSync = await pkiSyncDAL.findById(pkiSyncId);
if (!pkiSync) throw new NotFoundError({ message: "PKI sync not found" });
@@ -1403,14 +1428,22 @@ export const pkiSyncServiceFactory = ({
return {
message: "Certificate set as default",
- pkiSyncInfo: { projectId: pkiSync.projectId, name: pkiSync.name, applicationId: pkiSync.applicationId }
+ pkiSyncInfo: {
+ projectId: pkiSync.projectId,
+ name: pkiSync.name,
+ applicationId: pkiSync.applicationId,
+ applicationName: pkiSync.applicationName
+ }
};
};
const clearDefaultCertificate = async (
{ pkiSyncId }: Omit<TClearDefaultCertificateDTO, "auditLogInfo">,
actor: OrgServiceActor
- ): Promise<{ message: string; pkiSyncInfo: { projectId: string; name: string; applicationId?: string | null } }> => {
+ ): Promise<{
+ message: string;
+ pkiSyncInfo: { projectId: string; name: string; applicationId?: string | null; applicationName?: string | null };
+ }> => {
const pkiSync = await pkiSyncDAL.findById(pkiSyncId);
if (!pkiSync) throw new NotFoundError({ message: "PKI sync not found" });
@@ -1435,7 +1468,12 @@ export const pkiSyncServiceFactory = ({
return {
message: "Default certificate cleared",
- pkiSyncInfo: { projectId: pkiSync.projectId, name: pkiSync.name, applicationId: pkiSync.applicationId }
+ pkiSyncInfo: {
+ projectId: pkiSync.projectId,
+ name: pkiSync.name,
+ applicationId: pkiSync.applicationId,
+ applicationName: pkiSync.applicationName
+ }
};
};