From 5493417feef215b1ed998e1fb7fa85f7d93c665c Mon Sep 17 00:00:00 2001
From: Luke Heath <luke@fleetdm.com>
Date: Tue, 8 Nov 2022 15:34:18 -0600
Subject: [PATCH] Ensure invite form always returns a base error (#8615)

---
 .../components/forms/ResetPasswordForm/ResetPasswordForm.jsx  | 4 +++-
 frontend/utilities/format_error_response/index.ts             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx b/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx
index a34e7f912b..d9c6f4ecb6 100644
--- a/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx
+++ b/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx
@@ -12,6 +12,7 @@ const formFields = ["new_password", "new_password_confirmation"];
 
 class ResetPasswordForm extends Component {
   static propTypes = {
+    baseError: PropTypes.string,
     handleSubmit: PropTypes.func,
     fields: PropTypes.shape({
       new_password: formFieldInterface.isRequired,
@@ -20,10 +21,11 @@ class ResetPasswordForm extends Component {
   };
 
   render() {
-    const { fields, handleSubmit } = this.props;
+    const { baseError, fields, handleSubmit } = this.props;
 
     return (
       <form onSubmit={handleSubmit} className={baseClass}>
+        {baseError && <div className="form__base-error">{baseError}</div>}
         <InputFieldWithIcon
           {...fields.new_password}
           autofocus
diff --git a/frontend/utilities/format_error_response/index.ts b/frontend/utilities/format_error_response/index.ts
index 65a82d6b39..c05a9bbfa0 100644
--- a/frontend/utilities/format_error_response/index.ts
+++ b/frontend/utilities/format_error_response/index.ts
@@ -14,7 +14,7 @@ const formatServerErrors = (errors: IError[]) => {
     if (result[name]) {
       result[name] = join([result[name], reason], ", ");
     } else {
-      result[name] = reason;
+      result.base = reason; // Ensure a base error is always returned
     }
   });