Update db schema, load cert from cert body instead

This commit is contained in:
Fang-Pen Lin
2025-11-07 09:20:44 -08:00
parent f85d913017
commit 089157b237
4 changed files with 20 additions and 26 deletions
@@ -12,6 +12,7 @@ export const PkiAcmeChallengesSchema = z.object({
authId: z.string().uuid(), authId: z.string().uuid(),
type: z.string(), type: z.string(),
status: z.string(), status: z.string(),
error: z.string().nullable().optional(),
validatedAt: z.date().nullable().optional(), validatedAt: z.date().nullable().optional(),
createdAt: z.date(), createdAt: z.date(),
updatedAt: z.date() updatedAt: z.date()
+4 -6
View File
@@ -10,17 +10,15 @@ import { TImmutableDBKeys } from "./models";
export const PkiAcmeOrdersSchema = z.object({ export const PkiAcmeOrdersSchema = z.object({
id: z.string().uuid(), id: z.string().uuid(),
accountId: z.string().uuid(), accountId: z.string().uuid(),
certificateId: z.string().uuid().nullable().optional(),
notBefore: z.date().nullable().optional(), notBefore: z.date().nullable().optional(),
notAfter: z.date().nullable().optional(), notAfter: z.date().nullable().optional(),
expiresAt: z.date(), expiresAt: z.date(),
csr: z.string().nullable().optional(),
error: z.string().nullable().optional(),
status: z.string(), status: z.string(),
createdAt: z.date(), createdAt: z.date(),
updatedAt: z.date(), updatedAt: z.date()
csr: z.string().nullable().optional(),
certificate: z.string().nullable().optional(),
certificateChain: z.string().nullable().optional(),
error: z.string().nullable().optional(),
certificateId: z.string().uuid().nullable().optional()
}); });
export type TPkiAcmeOrders = z.infer<typeof PkiAcmeOrdersSchema>; export type TPkiAcmeOrders = z.infer<typeof PkiAcmeOrdersSchema>;
@@ -599,8 +599,7 @@ export const pkiAcmeServiceFactory = ({
// TODO: this should be the same transaction? // TODO: this should be the same transaction?
let errorToReturn: Error | undefined; let errorToReturn: Error | undefined;
try { try {
const { certificate, certificateChain, certificateId } = const { certificateId } = await certificateV3Service.signCertificateFromProfile({
await certificateV3Service.signCertificateFromProfile({
actor: ActorType.ACME_ACCOUNT, actor: ActorType.ACME_ACCOUNT,
actorId: accountId, actorId: accountId,
actorAuthMethod: null, actorAuthMethod: null,
@@ -621,10 +620,6 @@ export const pkiAcmeServiceFactory = ({
{ {
status: AcmeOrderStatus.Valid, status: AcmeOrderStatus.Valid,
csr, csr,
// TODO: we actually don't need to store the certificate and certificate chain here
// It appears that the certificate and certificate chain are stored in the certificate_body table already
certificateChain,
certificate,
certificateId certificateId
}, },
tx tx