Mercurial > gemma

comparison client/src/router.js @ 1122:a4c74a95c177 store-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor store refactoring removed unused getters from user store and renamed functions to adhere to nameing scheme removed unnecessary getter from map store
author Markus Kottlaender <markus@intevation.de>
date Tue, 06 Nov 2018 11:21:29 +0100
parents ca628dce90dd
children dc3f0277628a
comparison
equal deleted inserted replaced
1121:035dc35e1dfc 1122:a4c74a95c177
95 beforeEnter: (to, from, next) => { 95 beforeEnter: (to, from, next) => {
96 const expiresFromPastSession = toMillisFromString( 96 const expiresFromPastSession = toMillisFromString(
97 localStorage.getItem("expires") 97 localStorage.getItem("expires")
98 ); 98 );
99 if (sessionStillActive(expiresFromPastSession)) { 99 if (sessionStillActive(expiresFromPastSession)) {
100 store.commit("user/set_user", localStorage.getItem("user")); 100 store.commit("user/setUser", localStorage.getItem("user"));
101 store.commit("user/set_expires", expiresFromPastSession); 101 store.commit("user/setExpires", expiresFromPastSession);
102 store.commit("user/set_roles", localStorage.getItem("roles")); 102 store.commit("user/setRoles", localStorage.getItem("roles"));
103 store.commit("user/set_authenticate", true); 103 store.commit("user/setIsAuthenticate", true);
104 } else { 104 } else {
105 store.commit("user/clear_auth"); 105 store.commit("user/clearAuth");
106 } 106 }
107 next(); 107 next();
108 } 108 }
109 }, 109 },
110 { 110 {
114 ] 114 ]
115 }); 115 });
116 116
117 router.beforeEach((to, from, next) => { 117 router.beforeEach((to, from, next) => {
118 const requiresAuth = to.matched.some(record => record.meta.requiresAuth); 118 const requiresAuth = to.matched.some(record => record.meta.requiresAuth);
119 const loggedIn = store.getters["user/isAuthenticated"]; 119 const loggedIn = store.state.user.isAuthenticated;
120 const expiresFromPastSession = toMillisFromString( 120 const expiresFromPastSession = toMillisFromString(
121 localStorage.getItem("expires") 121 localStorage.getItem("expires")
122 ); 122 );
123 const authRequired = 123 const authRequired =
124 requiresAuth && !(loggedIn || sessionStillActive(expiresFromPastSession)); 124 requiresAuth && !(loggedIn || sessionStillActive(expiresFromPastSession));