From f68ffedba8692490047f9b74f2194b1c3da10aee Mon Sep 17 00:00:00 2001
From: Gilgard <Hjelljord.alida@gmail.com>
Date: Tue, 26 Apr 2022 13:36:56 +0200
Subject: [PATCH] Bugfix for reroute after login
---
src/components/LoginForm.vue | 17 ++++++++---------
src/utils/token-utils.js | 6 +++++-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index a986f45..9d8afb4 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -158,18 +158,17 @@ export default {
if (loginResponse.isLoggedIn === false) {
this.message = "Feil e-post/passord";
this.$store.commit("logout");
- }
- else if (loginResponse.isLoggedIn === true) {
+ } else if (loginResponse.isLoggedIn === true) {
this.$store.commit("saveToken", loginResponse.token);
- await this.$router.push("/endre");
- }
- else {
+
+ let user = parseUserFromToken(loginResponse.token);
+ console.log(user);
+ let id = user.accountId;
+ console.log(id);
+ this.$router.push("/profile/" + id);
+ } else {
console.log("Something went wrong");
}
-
- let user = parseUserFromToken();
- let id = user.account_id;
- this.$router.push("/profile/" + id);
},
validate() {
diff --git a/src/utils/token-utils.js b/src/utils/token-utils.js
index baf7765..ba37787 100644
--- a/src/utils/token-utils.js
+++ b/src/utils/token-utils.js
@@ -6,7 +6,11 @@ export function tokenHeader() {
return { Authorization: token };
}
-export function parseUserFromToken() {
+export function parseCurrentUser() {
let token = store.state.user.token;
return jwt_decode(token);
}
+
+export function parseUserFromToken(token) {
+ return jwt_decode(token);
+}
--
GitLab