diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue index a986f45f67e18ee7834405e64a493da89cedc72e..9d8afb4563c0f7c182fad24eda2b40016abbd784 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 baf77654f57a548de5a335038ed9fed4628d80e2..ba37787fbb3f43cfdce7ba11aba70d2d3c8b5bff 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); +}