fix: properly handle errors when posting CSR's (#55)

canonical · Aug 14, 2024 · 3d2ebfa · 3d2ebfa
1 parent 2c79151
commit 3d2ebfa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/ui/src/app/certificate_requests/asideForm.tsx b/ui/src/app/certificate_requests/asideForm.tsx
@@ -8,15 +8,21 @@ import { AsideContext } from "../aside";
 export default function CertificateRequestsAsidePanel(): JSX.Element {
     const asideContext = useContext(AsideContext)
     const [cookies, setCookie, removeCookie] = useCookies(['user_token']);
+    const [errorText, setErrorText] = useState<string>("")
     const queryClient = useQueryClient()
     const mutation = useMutation(postCSR, {
         onSuccess: () => {
+            setErrorText("")
             asideContext.setIsOpen(false)
             queryClient.invalidateQueries('csrs')
         },
+        onError: (e: Error) => {
+            setErrorText(e.message)
+        }
     })
     const [CSRPEMString, setCSRPEMString] = useState<string>("")
     const handleTextChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
+        setErrorText("")
         setCSRPEMString(event.target.value);
     }
     const handleFileChange = (event: ChangeEvent<HTMLInputElement>) => {
@@ -53,26 +59,36 @@ export default function CertificateRequestsAsidePanel(): JSX.Element {
                         <input type="file" name="upload" accept=".pem,.csr" onChange={handleFileChange}></input>
                     </div>
                     <div className="p-form__group row">
-                        <SubmitCSR csrText={CSRPEMString} onClickFunc={() => mutation.mutate({ authToken: cookies.user_token, csr: CSRPEMString })} />
+                        <SubmitCSR csrText={CSRPEMString} errorText={errorText} onClickFunc={() => mutation.mutate({ authToken: cookies.user_token, csr: CSRPEMString })} />
                     </div>
                 </form>
             </div>
         </div >
     )
 }
 
-function SubmitCSR({ csrText, onClickFunc }: { csrText: string, onClickFunc: any }) {
+function SubmitCSR({ csrText, errorText, onClickFunc }: { csrText: string, errorText: string, onClickFunc: any }) {
     let csrIsValid = false
     try {
         extractCSR(csrText.trim())
         csrIsValid = true
     }
     catch { }
-
     const validationComponent = csrText == "" ? <></> : csrIsValid ? <div><i className="p-icon--success"></i>Valid CSR</div> : <div><i className="p-icon--error"></i>Invalid CSR</div>
-    const buttonComponent = csrIsValid ? <button className="p-button--positive u-float-right" name="submit" onClick={onClickFunc} >Submit</button> : <button className="p-button--positive u-float-right" name="submit" disabled={true} onClick={onClickFunc} >Submit</button>
+    const buttonComponent = csrIsValid ? (
+        <button className="p-button--positive u-float-right" name="submit" onClick={(e) => { e.preventDefault(); onClickFunc() }} > Submit</button >
+    ) : (
+        <button className="p-button--positive u-float-right" name="submit" disabled={true} onClick={(e) => { e.preventDefault(); onClickFunc() }} >Submit</button>)
     return (
         <>
+            {errorText != "" &&
+                <div className="p-notification--negative">
+                    <div className="p-notification__content">
+                        <h5 className="p-notification__title">Error</h5>
+                        <p className="p-notification__message">{errorText.split("error: ")}</p>
+                    </div>
+                </div>
+            }
             {validationComponent}
             {buttonComponent}
         </>

diff --git a/ui/src/app/queries.ts b/ui/src/app/queries.ts
@@ -39,7 +39,8 @@ export async function postCSR(params: { authToken: string, csr: string }) {
         body: params.csr.trim()
     })
     if (!response.ok) {
-        throw new Error(`${response.status}: ${HTTPStatus(response.status)}`)
+        const responseText = await response.text()
+        throw new Error(`${response.status}: ${HTTPStatus(response.status)}. ${responseText}`)
     }
     return response.json()
 }