diff --git a/src/front/src/pages/Welcome.vue b/src/front/src/pages/Welcome.vue index 6c74099..6966fe3 100644 --- a/src/front/src/pages/Welcome.vue +++ b/src/front/src/pages/Welcome.vue @@ -9,19 +9,16 @@ diff --git a/src/front/src/pages/auth/Login.vue b/src/front/src/pages/auth/Login.vue index 1771292..ec3b368 100644 --- a/src/front/src/pages/auth/Login.vue +++ b/src/front/src/pages/auth/Login.vue @@ -15,23 +15,20 @@ export default { name: "Login", + beforeCreate() { + authApi.session = authApi.session.bind(this); + authService.login = authService.login.bind(this); + authService.progressIfUserAuthenticated = authService.progressIfUserAuthenticated.bind(this); + + }, data() { return { email: "", password: "" }; }, - beforeCreate() { - authApi.session = authApi.session.bind(this); - authService.login = authService.login.bind(this); - }, async created() { - try { - await authApi.session(); - await this.$router.replace("/articles"); - } catch (e) { - console.log(e); - } + await authService.progressIfUserAuthenticated() }, methods: { submit: async function (evt) { diff --git a/src/front/src/pages/auth/Register.vue b/src/front/src/pages/auth/Register.vue index 2413848..d16845b 100644 --- a/src/front/src/pages/auth/Register.vue +++ b/src/front/src/pages/auth/Register.vue @@ -27,14 +27,10 @@ authApi.session = authApi.session.bind(this); authService.register = authService.register.bind(this); + authService.progressIfUserAuthenticated = authService.progressIfUserAuthenticated.bind(this); }, async created() { - try { - await authApi.session(); - await this.$router.replace("/articles"); - } catch (err) { - console.log(err); - } + await authService.progressIfUserAuthenticated(); }, methods: { register: async function (evt) { diff --git a/src/front/src/services/authService.js b/src/front/src/services/authService.js index b2e7f33..a6a36f7 100644 --- a/src/front/src/services/authService.js +++ b/src/front/src/services/authService.js @@ -35,7 +35,12 @@ export default { } }, async progressIfUserAuthenticated() { - + try { + await authApi.session(commonUtil.getAuthenticationHeaderBearer(this.$cookie.get('accessToken'))); + await this.$router.replace('/articles'); + } catch (err) { + console.log(err); + } }, async banishIfUserUnAuthenticated() { try {