From 2245d6a22e7d6454e5f3fef5fda578b3b0a1dc07 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Wed, 24 Oct 2018 21:35:43 -0400
Subject: [PATCH] update LoginPage component and test pseudocode

---
 __tests__/tests/LoginPage.test.jsx | 26 +++++++-------------------
 src/pages/Login.jsx                |  6 +++---
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/__tests__/tests/LoginPage.test.jsx b/__tests__/tests/LoginPage.test.jsx
index cae51ad6b3..af79bcdd88 100644
--- a/__tests__/tests/LoginPage.test.jsx
+++ b/__tests__/tests/LoginPage.test.jsx
@@ -24,26 +24,14 @@ describe('<LoginPage />', () => {
     expect(submitButton.length).toBe(1);
   });
 
-  // initially renders empty username and password fields
-  // as well as state.username and state.password to empty strings
-  // initially sets state.error and state.loading to false
+  // initially renders empty username and password fields, sets empty error message and makes submit button not disabled
 
-  // on unmount, unmount is set to true
+  // typing into username and password fields (if the component is not unmounting) will clear out any error message
 
-  // typing into username and password fields (if the component is not unmounting)
-  // set state.username and state.password, as well as set state.error to empty string
-  // this is done through the handleUsernameChange and handlePasswordChange functions
-  // which both call safeSetState
+  // when the submit Button is clicked, as long as it is not disabled state.loading is set to true
+  // api.login is called with param 1 username and param 2 password
+  // if api.login returns an error, the state.error should be set to LOGIN_ERROR_MESSAGE, if the error object returned has response.status set to 401.
+  // regardless of error or not, after api.login returns, state.loading should be set to false
 
-  // when the submit Button is clicked, as long as it is not disabled (through state.loading
-  // being set tp true), state.loading is set to true (through safeSetState)
-  // api.login is called with param 1 username and param 2 password based on state
-  
-  // if api.login returns an error, the state.error should be set to LOGIN_ERROR_MESSAGE
-  // if the error object returned has response.status set to 401.
-
-  // regardless of error or not, after api.login returns state.loading should be set to false
-  // via safeSetState
-
-  // QUESTION: if api.login is valid, how does redirect happen?
+  // if api.isAuthenticated mock returns true, Redirect to / should be rendered
 });
\ No newline at end of file
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index ad0e5a872f..bc8d6112cc 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -63,9 +63,9 @@ class LoginPage extends Component {
     const { username, password, loading, error } = this.state;
     const { logo, loginInfo } = this.props;
 
-    // if (api.isAuthenticated()) {
-    //   return (<Redirect to="/" />);
-    // }
+    if (api.isAuthenticated()) {
+      return (<Redirect to="/" />);
+    }
 
     return (
       <Login