From 453dc578299b89c01c88711b427f5b6658ae4eaa Mon Sep 17 00:00:00 2001
From: Fang-Pen Lin <hello@fangpenlin.com>
Date: Fri, 31 Oct 2025 16:47:20 -0700
Subject: [PATCH] Fix status handling

---
 backend/src/ee/services/pki-acme/pki-acme-challenge-dal.ts | 2 +-
 backend/src/server/plugins/error-handler.ts                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/ee/services/pki-acme/pki-acme-challenge-dal.ts b/backend/src/ee/services/pki-acme/pki-acme-challenge-dal.ts
index 665eb1f9e..424651aea 100644
--- a/backend/src/ee/services/pki-acme/pki-acme-challenge-dal.ts
+++ b/backend/src/ee/services/pki-acme/pki-acme-challenge-dal.ts
@@ -62,7 +62,7 @@ export const pkiAcmeChallengeDALFactory = (db: TDbClient) => {
     try {
       const [challenge] = (await (tx || db)(TableName.PkiAcmeChallenge)
         .where({ id })
-        .update({ status: AcmeChallengeStatus.Valid, validatedAt: new Date() })
+        .update({ status: AcmeChallengeStatus.Invalid })
         .returning("*")) as [TPkiAcmeChallenges];
 
       // Update pending auth to valid as well
diff --git a/backend/src/server/plugins/error-handler.ts b/backend/src/server/plugins/error-handler.ts
index 8f6b63141..1142694b5 100644
--- a/backend/src/server/plugins/error-handler.ts
+++ b/backend/src/server/plugins/error-handler.ts
@@ -251,7 +251,8 @@ export const fastifyErrHandler = fastifyPlugin(async (server: FastifyZodProvider
           reqId: req.id,
           status: error.status,
           type: `urn:ietf:params:acme:error:${error.type}`,
-          detail: error.detail
+          detail: error.detail,
+          message: error.message
           // TODO: add subproblems if they exist
         });
     } else {