Merge pull request #16 from george-vrancianu/corweb-24

Fixes "Malformed request url" issue CORWEB-24

src/actions/MigrationActions/MigrationActions.js

@@ -52,7 +52,8 @@ MigrationActions.loadMigrations.listen(() => {
 
 MigrationActions.loadMigrations.shouldEmit = () => {
   let projectId = Reflux.GlobalState.userStore.currentUser.project.id
-  return typeof projectId !== "undefined";
+  let scoped = Reflux.GlobalState.userStore.currentUser.scoped
+  return typeof projectId !== "undefined" && scoped
 }
 
 MigrationActions.loadReplicas.listen(() => {
@@ -67,7 +68,9 @@ MigrationActions.loadReplicas.listen(() => {
 
 MigrationActions.loadReplicas.shouldEmit = () => {
   let projectId = Reflux.GlobalState.userStore.currentUser.project.id
-  return typeof projectId !== "undefined";
+
+  let scoped = Reflux.GlobalState.userStore.currentUser.scoped
+  return typeof projectId !== "undefined" && scoped
 }
 
 MigrationActions.loadMigration.listen((migration) => {

src/components/ApiCaller/ApiCaller.js

@@ -87,7 +87,7 @@ class ApiCaller {
           }
           if (result.status == 401) {
             this.resetHeaders()
-            Location.push("/login")
+            window.location.href = "/"
           }
           reject({ status: request.status });
         }

src/stores/UserStore/UserStore.js

@@ -29,6 +29,7 @@ class UserStore extends Reflux.Store
 {
   user = {
     id: null,
+    scoped: false,
     name: "-",
     email: "-",
     created: new Date(),
@@ -80,6 +81,12 @@ class UserStore extends Reflux.Store
     })
   }
 
+  onLoginScope() {
+    let currentUser = this.state.currentUser
+    currentUser.scoped = false
+    this.setState({ currentUser: currentUser })
+  }
+
   onLoginScopeSuccess(response) {
     this.setState({ loadingState: false })
 
@@ -88,6 +95,7 @@ class UserStore extends Reflux.Store
     currentUser.name = response.data.token.user.name
     currentUser.token = response.headers['X-Subject-Token'] || response.headers['x-subject-token']
     currentUser.project = response.data.token.project
+    currentUser.scoped = true
 
     cookie.save('token', currentUser.token, { path: "/", expires: moment().add(1, 'hour').toDate() })
     cookie.save('projectId', currentUser.project.id, { path: "/", expires: moment().add(1, 'months').toDate() })