Fix redirect on login (#85)

* Fix redirect on login

* Fix typo

Author: tar-g

templates/vue/application/src/auth.js

@@ -1,6 +1,6 @@
 let authenticated = true;
 export default {
-  athenticated() {
+  authenticated() {
     return authenticated;
   },
   logIn() {

templates/vue/application/src/components/header-toolbar.vue

@@ -89,7 +89,8 @@ export default {
     onLogoutClick() {
       auth.logOut();
       this.$router.push({
-        path: "/login-form"
+        path: "/login-form",
+        query: { redirect: this.$route.path }
       });
     }
   },

templates/vue/application/src/router.js

@@ -80,12 +80,12 @@ const router = new Router({
 
 router.beforeEach((to, from, next) => {
 
-  if (to.name === "login-form" && auth.athenticated()) {
+  if (to.name === "login-form" && auth.authenticated()) {
     next({ name: "home" });
   }
 
   if (to.matched.some(record => record.meta.requiresAuth)) {
-    if (!auth.athenticated()) {
+    if (!auth.authenticated()) {
       next({
         name: "login-form",
         query: { redirect: to.fullPath }

templates/vue/application/src/views/login-form.vue

@@ -74,7 +74,7 @@ export default {
       }
 
       auth.logIn();
-      this.$router.push("/home");
+      this.$router.push(this.$route.query.redirect || "/home");
 
       e.validationGroup.reset();
     }