fix(app-info): wait for fetch app info until checking user login

fix #475
ibi-group · Sep 5, 2019 · 8407ed7 · 8407ed7
1 parent 20e411c
commit 8407ed7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/common/containers/App.js b/lib/common/containers/App.js
@@ -44,11 +44,15 @@ function wrapComponentInAuthStrategy (
     componentWillMount () {
       const {checkLogin, fetchAppInfo, user} = this.props
       const userIsLoggedIn: boolean = !!user.token
+      // Fetch app info before component mounts in order to ensure that checks
+      // for enabled modules result use the correct config data.
       fetchAppInfo()
-      checkLogin(userIsLoggedIn)
-      if (userIsLoggedIn) {
-        this._checkIfAdmin()
-      }
+        .then(() => {
+          checkLogin(userIsLoggedIn)
+          if (userIsLoggedIn) {
+            this._checkIfAdmin()
+          }
+        })
     }
 
     componentWillReceiveProps (nextProps) {

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
@@ -115,7 +115,7 @@ export function checkJobStatus () {
  * commits, the repo URL, and the specific configuration used by the backend
  * server.
  */
-export function fetchAppInfo () {
+export async function fetchAppInfo () {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     // fetch info.  If an error occurs or response json doesn't match, set
     // server info to value indicating an unknown commit and repoUrl