From 9e1a3c6fe0cdbfbaa46cffbb5849df6b5a3925a8 Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Fri, 5 Dec 2025 14:55:55 -0300
Subject: [PATCH] Improve pkcs12 error message

---
 .../components/CertificateExportModal.tsx     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx
index 23138202e..8fc59e013 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx
@@ -53,12 +53,7 @@ const exportFormSchema = z
   .refine(
     (data) => {
       if (data.format === "pkcs12") {
-        return (
-          data.pkcs12Password &&
-          data.pkcs12Password.length >= 6 &&
-          data.pkcs12Alias &&
-          data.pkcs12Alias.trim() !== ""
-        );
+        return data.pkcs12Password && data.pkcs12Alias && data.pkcs12Alias.trim() !== "";
       }
       return true;
     },
@@ -67,6 +62,18 @@ const exportFormSchema = z
       path: ["pkcs12Password"]
     }
   )
+  .refine(
+    (data) => {
+      if (data.format === "pkcs12") {
+        return data.pkcs12Password && data.pkcs12Password.length >= 6;
+      }
+      return true;
+    },
+    {
+      message: "PKCS12 password must be 6 characters or longer",
+      path: ["pkcs12Password"]
+    }
+  )
   .refine(
     (data) => {
       if (data.format === "pkcs12" && data.pkcs12Password) {