Merge pull request #710 from PierreBrisorgueil/fixSignout

fix(_app): signout & routes redirection if unAuthorized 🐛

Author: PierreBrisorgueil

src/modules/_app/app.router.js

@@ -4,6 +4,7 @@
 import Vue from 'vue';
 import Router from 'vue-router';
 import store from '@/modules/_app/app.store';
+import config from '@/config';
 
 import home from '@/modules/home/router/home.router';
 import auth from '@/modules/auth/router/auth.router';
@@ -29,9 +30,12 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   // meta
   document.title = to.name;
+  const userRoles = localStorage.getItem(`${config.cookie.prefix}UserRoles`)
+    ? localStorage.getItem(`${config.cookie.prefix}UserRoles`).split(',')
+    : [];
   // secu
-  if (to.matched.some((record) => record.meta.requiresAuth)) {
-    if (store.getters.isLoggedIn) {
+  if (to.matched.some((record) => record.meta.roles)) {
+    if (store.getters.isLoggedIn && to.meta.roles.some((r) => userRoles.includes(r))) {
       next();
       return;
     }

src/modules/_core/components/core.header.component.vue

@@ -169,7 +169,7 @@ export default {
     signout() {
       this.$store.dispatch('signout').then(() => {
         this.$store.dispatch('refreshNav');
-        if (this.$route.path !== '/') this.$router.push('/home');
+        if (this.$route.path !== '/') this.$router.push('/');
       });
     },
   },

src/modules/home/components/home.banner.component.vue

@@ -120,10 +120,10 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['subscription']),
+    ...mapGetters(['homeSubscription']),
     email: {
       get() {
-        return this.subscription.email;
+        return this.homeSubscription.email;
       },
       set(email) {
         this.save = true;
@@ -136,9 +136,9 @@ export default {
       return `${this.config.home.temporalBackground}/${`0${new Date().getHours()}`.slice(-2)}.jpg`;
     },
     createSubscription() {
-      if (this.rules.email(this.subscription.email)) {
+      if (this.rules.email(this.homeSubscription.email)) {
         this.$store
-          .dispatch('createSubscription', this.subscription)
+          .dispatch('createSubscription', this.homeSubscription)
           .catch((err) => console.log(err));
       }
     },

src/modules/home/stores/home.store.js

@@ -17,7 +17,7 @@ const whitelists = ['email', 'news'];
 const getters = {
   contents: (state) => state.contents,
   news: (state) => state.news,
-  subscription: (state) => state.subscription,
+  homeSubscription: (state) => state.subscription,
   contact: (state) => state.contact,
   statistics: (state) => state.statistics,
 };