allow autocomplete username. show login errors

kevinhughes27 · Jul 26, 2018 · c4a1bdc · c4a1bdc
1 parent 145493a
commit c4a1bdc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/clients/admin_next/src/auth.ts b/clients/admin_next/src/auth.ts
@@ -18,7 +18,9 @@ class Auth {
       headers,
       body
     }).then((response) => {
-      return response.json();
+      return response.status === 201
+        ? response.json()
+        : Promise.reject("Invalid username or password");
     }).then((data) => {
       this.setToken(data.jwt);
       return Promise.resolve();

diff --git a/clients/admin_next/src/components/App/LoginForm.tsx b/clients/admin_next/src/components/App/LoginForm.tsx
@@ -20,6 +20,7 @@ interface Props extends WithStyles<typeof styles> {
 interface State {
   email: string;
   password: string;
+  error?: string;
 }
 
 class LoginForm extends React.Component<Props, State> {
@@ -38,6 +39,8 @@ class LoginForm extends React.Component<Props, State> {
 
     auth.login(this.state.email, this.state.password).then(() => {
       this.props.onComplete();
+    }).catch((error) => {
+      this.setState({error});
     });
   }
 
@@ -64,10 +67,10 @@ class LoginForm extends React.Component<Props, State> {
                   name="email"
                   label="Username"
                   margin="normal"
-                  autoComplete="off"
                   fullWidth
                   value={this.state.email}
                   onChange={this.handleChange}
+                  helperText={this.state.error}
                 />
 
                 <TextField