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

Issue cert

Browse Source
This commit is contained in:
Fang-Pen Lin
2025-11-07 09:19:49 -08:00
parent bbdb026beb
commit e652c2a5a3
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/schemas/pki-acme-orders.ts
+1 -1
View File
@@ -18,7 +18,7 @@ export const PkiAcmeOrdersSchema = z.object({
updatedAt: z.date(), updatedAt: z.date(),
csr: z.string().nullable().optional(), csr: z.string().nullable().optional(),
certificate: z.string().nullable().optional(), certificate: z.string().nullable().optional(),
certificatechain: z.string().nullable().optional() certificateChain: z.string().nullable().optional()
}); });
export type TPkiAcmeOrders = z.infer<typeof PkiAcmeOrdersSchema>; export type TPkiAcmeOrders = z.infer<typeof PkiAcmeOrdersSchema>;
backend/src/ee/services/pki-acme/pki-acme-service.ts
+5 -4
View File
@@ -500,12 +500,12 @@ export const pkiAcmeServiceFactory = ({
orderId: string; orderId: string;
payload: TFinalizeAcmeOrderPayload; payload: TFinalizeAcmeOrderPayload;
}): Promise<TAcmeResponse<TAcmeOrderResource>> => { }): Promise<TAcmeResponse<TAcmeOrderResource>> => {
const order = await acmeOrderDAL.findByAccountAndOrderIdWithAuthorizations(accountId, orderId); let order = await acmeOrderDAL.findByAccountAndOrderIdWithAuthorizations(accountId, orderId);
if (!order) { if (!order) {
throw new NotFoundError({ message: "ACME order not found" }); throw new NotFoundError({ message: "ACME order not found" });
} }
if (order.status === AcmeOrderStatus.Ready) { if (order.status === AcmeOrderStatus.Ready) {
await acmeOrderDAL.transaction(async (tx) => { order = await acmeOrderDAL.transaction(async (tx) => {
const order = (await acmeOrderDAL.findByIdForFinalization(orderId, tx))!; const order = (await acmeOrderDAL.findByIdForFinalization(orderId, tx))!;
const profile = (await certificateProfileDAL.findById(profileId, tx))!; const profile = (await certificateProfileDAL.findById(profileId, tx))!;
if (order.status !== AcmeOrderStatus.Ready) { if (order.status !== AcmeOrderStatus.Ready) {
@@ -528,11 +528,12 @@ export const pkiAcmeServiceFactory = ({
{ {
status: AcmeOrderStatus.Valid, status: AcmeOrderStatus.Valid,
csr, csr,
certificate, certificateChain,
certificateChain certificate: certificate.toString("pem")
}, },
tx tx
); );
return await acmeOrderDAL.findByAccountAndOrderIdWithAuthorizations(accountId, orderId, tx);
}); });
} else if (order.status !== AcmeOrderStatus.Valid) { } else if (order.status !== AcmeOrderStatus.Valid) {
throw new AcmeOrderNotReadyError({ message: "ACME order is not ready" }); throw new AcmeOrderNotReadyError({ message: "ACME order is not ready" });