Merge a2e9473 into 97ce3b8

openmrs · Feb 19, 2018 · f6f3fce · f6f3fce
2 parents 97ce3b8 + a2e9473
commit f6f3fce
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/app/js/components/manageApps/Login.jsx b/app/js/components/manageApps/Login.jsx
@@ -1,22 +1,47 @@
 import React, { Component } from 'react';
 import { hashHistory } from 'react-router';
 import axios from 'axios';
+import { ApiHelper } from '../../helpers/apiHelper';
 import { Form, Button, FormControl, FormGroup, Col, ControlLabel, Checkbox, Nav, Modal } from 'react-bootstrap';
 class Login extends Component {
   constructor(props) {
     super(props);
     this.state = {
       username: '',
       password: '',
-      show: false
-    }
+      show: false,
+      checkLoggedInComplete: false
+    };
+
     this.handleLogin = this.handleLogin.bind(this);
     this.handleShow = this.handleShow.bind(this);
     this.handleClose = this.handleClose.bind(this);
   }
+
+  componentWillMount(){
+    this.checkLoginStatus();
+  }
+
+  checkLoginStatus(){
+    this.fetchLocation('/v1/session').then((response) => {
+      this.setState({checkLoggedInComplete: true});
+      response.authenticated ? hashHistory.push('/') : null;
+    });
+  }
+
+  fetchLocation(url) {
+    const apiHelper = new ApiHelper(null);
+    return new Promise(function(resolve, reject) {
+      apiHelper.get(url).then(response => {
+        resolve(response);
+      });
+    });
+  }
+
   handleClose() {
     this.setState({ show: false });
   }
+
   handleShow() {
     this.setState({ show: true });
   }
@@ -47,6 +72,7 @@ class Login extends Component {
 
   render() {
     return (
+      this.state.checkLoggedInComplete &&
       <div className="well">
         <a href="../../">
           <img src="img/openmrs-with-title-small.png" />