From c1444da64f728720153438c34508cfa2bf0e9121 Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Sat, 31 Mar 2018 18:58:32 +0200
Subject: [PATCH] Remove login failed event

It got replaced by a snack.
---
 ui/src/Layout.js                  |  6 ++----
 ui/src/actions/UserAction.js      |  5 +----
 ui/src/pages/Login.js             |  8 --------
 ui/src/stores/CurrentUserStore.js | 10 ----------
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/ui/src/Layout.js b/ui/src/Layout.js
index 0a7e1b8..69f5e6f 100644
--- a/ui/src/Layout.js
+++ b/ui/src/Layout.js
@@ -52,7 +52,6 @@ class Layout extends Component {
         loggedIn: CurrentUserStore.isLoggedIn(),
         admin: CurrentUserStore.isAdmin(),
         name: CurrentUserStore.getName(),
-        loginFailed: CurrentUserStore.isLoginFailed(),
         version: Layout.defaultVersion,
     };
 
@@ -79,7 +78,6 @@ class Layout extends Component {
             ...this.state,
             loggedIn: CurrentUserStore.isLoggedIn(),
             admin: CurrentUserStore.isAdmin(),
-            loginFailed: CurrentUserStore.isLoginFailed(),
             name: CurrentUserStore.getName(),
         });
     };
@@ -88,7 +86,7 @@ class Layout extends Component {
     showSettings = () => this.setState({...this.state, showSettings: true});
 
     render() {
-        const {name, admin, version, loggedIn, showSettings, loginFailed} = this.state;
+        const {name, admin, version, loggedIn, showSettings} = this.state;
         const {classes} = this.props;
         const theme = this.state.darkTheme ? darkTheme : lightTheme;
         return (
@@ -105,7 +103,7 @@ class Layout extends Component {
                         <main className={classes.content}>
                             <Switch>
                                 <Route exact path="/login" render={() =>
-                                    (loggedIn ? (<Redirect to="/"/>) : (<Login loginFailed={loginFailed}/>))}/>
+                                    (loggedIn ? (<Redirect to="/"/>) : (<Login/>))}/>
                                 {(loggedIn || getToken() != null) ? null : <Redirect to="/login"/>}
                                 <Route exact path="/" component={Messages}/>
                                 <Route exact path="/messages/:id" component={Messages}/>
diff --git a/ui/src/actions/UserAction.js b/ui/src/actions/UserAction.js
index c15d679..46874c5 100644
--- a/ui/src/actions/UserAction.js
+++ b/ui/src/actions/UserAction.js
@@ -23,10 +23,7 @@ export function login(username, password) {
         snack(`A client named '${name}' was created for your session.`);
         setAuthorizationToken(resp.data.token);
         GlobalAction.initialLoad();
-    }).catch(() => {
-        snack('Login failed');
-        dispatcher.dispatch({type: 'LOGIN_FAILED'});
-    });
+    }).catch(() => snack('Login failed'));
 }
 
 /** Log the user out. */
diff --git a/ui/src/pages/Login.js b/ui/src/pages/Login.js
index 8ca2e7c..5142f78 100644
--- a/ui/src/pages/Login.js
+++ b/ui/src/pages/Login.js
@@ -2,17 +2,11 @@ import React, {Component} from 'react';
 import Button from 'material-ui/Button';
 import Grid from 'material-ui/Grid';
 import TextField from 'material-ui/TextField';
-import Typography from 'material-ui/Typography';
 import Container from '../component/Container';
 import * as UserAction from '../actions/UserAction';
 import DefaultPage from '../component/DefaultPage';
-import PropTypes from 'prop-types';
 
 class Login extends Component {
-    static propTypes = {
-        loginFailed: PropTypes.bool.isRequired,
-    };
-
     constructor() {
         super();
         this.state = {username: '', password: ''};
@@ -28,7 +22,6 @@ class Login extends Component {
 
     render() {
         const {username, password} = this.state;
-        const {loginFailed} = this.props;
         return (
             <DefaultPage title="Login" maxWidth={250} hideButton={true}>
                 <Grid item xs={12} style={{textAlign: 'center'}}>
@@ -42,7 +35,6 @@ class Login extends Component {
                                     style={{marginTop: 15, marginBottom: 5}} onClick={this.login}>
                                 Login
                             </Button>
-                            {loginFailed && <Typography>Login Failed</Typography>}
                         </form>
                     </Container>
                 </Grid>
diff --git a/ui/src/stores/CurrentUserStore.js b/ui/src/stores/CurrentUserStore.js
index 05f8d40..5164458 100644
--- a/ui/src/stores/CurrentUserStore.js
+++ b/ui/src/stores/CurrentUserStore.js
@@ -5,11 +5,6 @@ class CurrentUserStore extends EventEmitter {
     constructor() {
         super();
         this.currentUser = null;
-        this.loginFailed = false;
-    }
-
-    isLoginFailed() {
-        return this.loginFailed;
     }
 
     get() {
@@ -35,14 +30,9 @@ class CurrentUserStore extends EventEmitter {
 
     handle(data) {
         if (data.type === 'REMOVE_CURRENT_USER') {
-            this.loginFailed = false;
             this.set(null);
         } else if (data.type === 'SET_CURRENT_USER') {
-            this.loginFailed = false;
             this.set(data.payload);
-        } else if (data.type === 'LOGIN_FAILED') {
-            this.loginFailed = true;
-            this.emit('change');
         }
     }
 }