From a84303588d2abec35bc802c1203465335a9e0f86 Mon Sep 17 00:00:00 2001
From: Fang-Pen Lin <hello@fangpenlin.com>
Date: Tue, 28 Oct 2025 16:26:02 -0700
Subject: [PATCH] More on the account

---
 backend/src/ee/routes/v1/pki-acme-router.ts   | 22 ++++++++-----------
 .../ee/services/pki-acme/pki-acme-types.ts    |  3 +--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/backend/src/ee/routes/v1/pki-acme-router.ts b/backend/src/ee/routes/v1/pki-acme-router.ts
index c8ca31186..e0762b7f3 100644
--- a/backend/src/ee/routes/v1/pki-acme-router.ts
+++ b/backend/src/ee/routes/v1/pki-acme-router.ts
@@ -3,7 +3,6 @@ import { z } from "zod";
 
 import {
   CreateAcmeAccountResponseSchema,
-  CreateAcmeAccountSchema,
   CreateAcmeOrderResponseSchema,
   CreateAcmeOrderSchema,
   DeactivateAcmeAccountResponseSchema,
@@ -24,10 +23,10 @@ import {
   RespondToAcmeChallengeResponseSchema,
   RespondToAcmeChallengeSchema
 } from "@app/ee/services/pki-acme/pki-acme-schemas";
+import { TCreateAcmeAccountPayload, TRawJwsPayload } from "@app/ee/services/pki-acme/pki-acme-types";
 import { ApiDocsTags } from "@app/lib/api-docs";
 import { getConfig } from "@app/lib/config/env";
 import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
-import { TRawJwsPayload } from "@app/ee/services/pki-acme/pki-acme-types";
 
 export const registerPkiAcmeRouter = async (server: FastifyZodProvider) => {
   const appCfg = getConfig();
@@ -112,28 +111,25 @@ export const registerPkiAcmeRouter = async (server: FastifyZodProvider) => {
       }
     },
     handler: async (req, res) => {
-      // TODO: check nonce here
-      const { payload, protectedHeader, jwk } = await server.services.pkiAcme.validateCreateAcmeAccountJwsPayload(
+      const { payload, jwk } = await server.services.pkiAcme.validateCreateAcmeAccountJwsPayload(
         req.body as TRawJwsPayload
       );
-
-      const account = await server.services.pkiAcme.createAcmeAccount(
+      const { status, body, headers } = await server.services.pkiAcme.createAcmeAccount(
         req.params.profileId,
         jwk,
         payload as TCreateAcmeAccountPayload
       );
-      // TODO: deal with existing account case here
-      res.code(201);
-      res.header(
-        "Location",
-        `${appCfg.SITE_URL}/api/v1/pki/acme/profiles/${req.params.profileId}/accounts/${account.accountUrl}`
-      );
+      // TODO: DRY
+      res.code(status);
+      for (const [key, value] of Object.entries(headers)) {
+        res.header(key, value);
+      }
 
       // TODO: DRY
       const nonce = await server.services.pkiAcme.getAcmeNewNonce(req.params.profileId);
       res.header("Replay-Nonce", nonce);
       res.header("Cache-Control", "no-store");
-      return account;
+      return body;
     }
   });
 
diff --git a/backend/src/ee/services/pki-acme/pki-acme-types.ts b/backend/src/ee/services/pki-acme/pki-acme-types.ts
index 9009bc0a7..fe1105ff8 100644
--- a/backend/src/ee/services/pki-acme/pki-acme-types.ts
+++ b/backend/src/ee/services/pki-acme/pki-acme-types.ts
@@ -1,6 +1,5 @@
 import { z } from "zod";
 
-import { JWK } from "jose";
 import {
   CreateAcmeAccountBodySchema,
   CreateAcmeAccountResponseSchema,
@@ -46,7 +45,7 @@ export type TJwsPayloadWithJwk = TJwsPayload & {
 export type TAcmeResponse<TPayload> = {
   status: number;
   headers: Record<string, string>;
-  payload: TPayload;
+  body: TPayload;
 };
 
 export type TPkiAcmeServiceFactory = {