Merge pull request agola-io#22 from sgotti/login_redirect_previous_url

Redirect to previous url after login

Author: sgotti

src/App.vue

@@ -149,14 +149,6 @@ export default {
     };
   },
   watch: {
-    user: function(user) {
-      if (user) {
-        this.$router.push({
-          name: "user",
-          params: { username: this.user.username }
-        });
-      }
-    },
     $route: function() {
       this.userDropdownActive = false;
       this.createDropdownActive = false;

src/main.js

@@ -1,26 +1,24 @@
-import '@/css/tailwind.scss'
+import "@/css/tailwind.scss";
+import { getUser } from "@/util/auth";
 import "@mdi/font/css/materialdesignicons.css";
-
 import Vue from "vue";
 import Vue2Filters from "vue2-filters";
 import App from "./App.vue";
 import router from "./router";
 import store from "./store";
 
-import { getUser } from "@/util/auth";
-
 Vue.use(Vue2Filters);
 
 // TODO(sgotti) use vuex for login/logout
 new Vue({
   router,
   store,
-  created: function () {
-    let user = getUser()
+  created: function() {
+    let user = getUser();
     if (user) {
-      store.dispatch('setUser', user)
+      store.dispatch("setUser", user);
     }
-    store.dispatch("setRegisterUser", null)
+    store.dispatch("setRegisterUser", null);
   },
   render: h => h(App)
 }).$mount("#app");

src/util/auth.js

@@ -2,6 +2,7 @@ import store from "@/store";
 
 const ID_TOKEN_KEY = 'id_token';
 const USER_KEY = 'user';
+const LOGIN_REDIRECT_KEY = 'login_redirect';
 
 let API_URL = window.CONFIG.API_URL;
 let API_BASE_PATH = window.CONFIG.API_BASE_PATH;
@@ -125,3 +126,15 @@ export function isLoggedIn() {
     const idToken = getIdToken();
     return !!idToken;
 }
+
+export function getLoginRedirect() {
+    return sessionStorage.getItem(LOGIN_REDIRECT_KEY);
+}
+
+export function setLoginRedirect(url) {
+    sessionStorage.setItem(LOGIN_REDIRECT_KEY, url);
+}
+
+export function unsetLoginRedirect() {
+    return sessionStorage.removeItem(LOGIN_REDIRECT_KEY);
+}