From 4c95b21115a605daf32ff0cf65437503ecc5f0ad Mon Sep 17 00:00:00 2001
From: Josef Taha <josef.taha@tuwien.ac.at>
Date: Thu, 24 Nov 2022 19:01:49 +0100
Subject: [PATCH] Routes are redirected while login
---
fda-ui/layouts/default.vue | 6 +++++-
fda-ui/pages/login.vue | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fda-ui/layouts/default.vue b/fda-ui/layouts/default.vue
index 9023fb63f2..63c821f9ee 100644
--- a/fda-ui/layouts/default.vue
+++ b/fda-ui/layouts/default.vue
@@ -75,7 +75,7 @@
v-if="!token"
class="mr-2"
color="secondary"
- to="/login">
+ @click="login">
<v-icon left>mdi-login</v-icon> Login
</v-btn>
<v-btn
@@ -262,6 +262,10 @@ export default {
subtitle: item.item.description
}
},
+ login () {
+ let redirect = ![undefined ,'/', '/login'].includes(this.$router.currentRoute.path)
+ this.$router.push({ path: '/login', query: redirect ? { redirect: this.$router.currentRoute.path } : {}})
+ },
navigate (item) {
this.$router.push(this.metadata(item).link)
},
diff --git a/fda-ui/pages/login.vue b/fda-ui/pages/login.vue
index 07539ffc0f..b9b82425b2 100644
--- a/fda-ui/pages/login.vue
+++ b/fda-ui/pages/login.vue
@@ -96,7 +96,7 @@ export default {
delete user.token
this.$store.commit('SET_USER', user)
this.$toast.success('Welcome back!')
- this.$router.push('/container')
+ this.$router.push(this.$route.query.redirect ? this.$route.query.redirect : '/container')
} catch (err) {
if (err.response !== undefined && err.response.status !== undefined) {
if (err.response.status === 418) {
--
GitLab