Merge pull request #1019 from hpcc-systems/yadhap/clear-pw-after-failed-login

Cleaer Password after failed login attempt

Author: FancMa01

Tombolo/client-reactjs/src/components/login/login.js

@@ -14,6 +14,8 @@ const Login = () => {
   const [azureLoginAttempted, setAzureLoginAttempted] = useState(false);
   const [email, setEmail] = useState(null);
 
+  const [loginForm] = Form.useForm();
+
   // When the form is submitted, this function is called
   const onFinish = async (values) => {
     const { email, password } = values;
@@ -45,6 +47,7 @@ const Login = () => {
 
     //handle login failed
     if (test?.type === Constants.LOGIN_FAILED) {
+      loginForm.resetFields();
       setLoading(false);
       return;
     }
@@ -119,7 +122,7 @@ const Login = () => {
       {expiredPassword && <ExpiredPassword email={email} />}
       {!unverifiedUserLoginAttempt && !expiredPassword && (
         <>
-          <Form onFinish={onFinish} layout="vertical">
+          <Form onFinish={onFinish} layout="vertical" form={loginForm}>
             {loading && (
               <div
                 style={{

Tombolo/client-reactjs/src/redux/actions/Auth.js

@@ -108,17 +108,13 @@ const loginBasicUserFunc = async (email, password, deviceInfo) => {
     },
     { headers: authHeader() }
   );
-
   const data = await response.json();
 
-  if (response.status === 401) {
-    if (data.message === 'password-expired') {
-      return data;
-    } else if (data.message === 'unverified') {
+  if (response.status === 401 || response.status === 403) {
+    if (data.message === 'unverified') {
       return data;
     } else {
       message.error(data.message);
-
       return;
     }
   } else if (!response.ok) {