initialize from storage

Author: jakemcdermott

client/src/router/index.js

@@ -12,20 +12,26 @@ import VerifyEmail from '../views/VerifyEmail';
 
 import store from '../store';
 
-const redirectUnauthorizedToLogin = (to, from, next) => {
-  if (!store.getters['auth/isAuthenticated']) {
-    next('/login');
-  } else {
-    next();
-  }
+const requireAuthenticated = (to, from, next) => {
+  store.dispatch('auth/initialize')
+    .then(() => {
+      if (!store.getters['auth/isAuthenticated']) {
+        next('/login');
+      } else {
+        next();
+      }
+    });
 };
 
-const redirectAuthorizedToHome = (to, from, next) => {
-  if (store.getters['auth/isAuthenticated']) {
-    next('/home');
-  } else {
-    next();
-  }
+const requireUnauthenticated = (to, from, next) => {
+  store.dispatch('auth/initialize')
+    .then(() => {
+      if (store.getters['auth/isAuthenticated']) {
+        next('/home');
+      } else {
+        next();
+      }
+    });
 };
 
 const redirectLogout = (to, from, next) => {
@@ -38,19 +44,19 @@ Vue.use(Router);
 export default new Router({
   saveScrollPosition: true,
   routes: [
-    {
-      path: '/about',
-      component: About,
-      beforeEnter: redirectUnauthorizedToLogin,
-    },
     {
       path: '/',
       redirect: '/home',
     },
+    {
+      path: '/about',
+      component: About,
+      beforeEnter: requireAuthenticated,
+    },
     {
       path: '/home',
       component: Home,
-      beforeEnter: redirectUnauthorizedToLogin,
+      beforeEnter: requireAuthenticated,
     },
     {
       path: '/password_reset',
@@ -71,7 +77,7 @@ export default new Router({
     {
       path: '/login',
       component: Login,
-      beforeEnter: redirectAuthorizedToHome,
+      beforeEnter: requireUnauthenticated,
     },
     {
       path: '/logout',

client/src/store/auth.js

@@ -14,7 +14,7 @@ const TOKEN_STORAGE_KEY = 'TOKEN_STORAGE_KEY';
 const initialState = {
   authenticating: false,
   error: false,
-  token: localStorage.getItem(TOKEN_STORAGE_KEY),
+  token: null,
 };
 
 const getters = {
@@ -34,6 +34,15 @@ const actions = {
       .then(() => commit(LOGOUT))
       .finally(() => commit(REMOVE_TOKEN));
   },
+  initialize({ commit }) {
+    const token = localStorage.getItem(TOKEN_STORAGE_KEY);
+
+    if (token) {
+      commit(SET_TOKEN, token);
+    } else {
+      commit(REMOVE_TOKEN);
+    }
+  },
 };
 
 const mutations = {