Merge branch '16' into 'master'

#16 Use HTML history and redirect correctly when not logged in See merge request linagora/lgs/openpaas/openpaas-videoconference-app!24
linagora · Nov 22, 2018 · d077d97 · d077d97
2 parents 8116a1a + e2c3dad
commit d077d97
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/components/ApplicationsMenu.vue b/src/components/ApplicationsMenu.vue
@@ -13,7 +13,7 @@
             <v-container grid-list-xl fluid>
                 <v-layout row wrap>
                     <v-flex xs4 d-flex>
-                        <router-link :to="{ name: 'home' }">
+                        <router-link :to="{ name: 'Home' }">
                             <v-icon large color="blue">home</v-icon>
                         </router-link>
                     </v-flex>

diff --git a/src/router.js b/src/router.js
@@ -6,10 +6,12 @@ import VideoConference from "@/views/VideoConference.vue";
 Vue.use(Router);
 
 export default new Router({
+  base: process.env.BASE_URL, // Needed for dev/build and HTML history
+  mode: "history",
   routes: [
     {
       path: "/",
-      name: "home",
+      name: "Home",
       redirect: {
         name: "VideoConference",
         params: { conferenceid: process.env.VUE_APP_JITSI_DEFAULT_CONFERENCE_ROOM }

diff --git a/src/views/Login.vue b/src/views/Login.vue
@@ -38,8 +38,10 @@ export default {
   },
   methods: {
     login() {
+      const redirectHistory = this.$auth.redirect();
+      const redirect = redirectHistory ? { name: redirectHistory.from.name, params: redirectHistory.from.params } : { name: 'Home' };
+
       this.logMeIn = true;
-      const redirect = this.$auth.redirect();
       this.$auth
         .login({
           url: "api/jwt/generate",
@@ -48,7 +50,7 @@ export default {
             password: this.password
           },
           rememberMe: false,
-          redirect: { path: redirect.from.path }
+          redirect
         })
         .then(response => {
           this.$store.dispatch("session/setJWTToken", response.data);