diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue index 82ba58cdfb84ebc5cf9fa14c76374d5661705cec..835d99bcd1927dc4ac37d23f1e11a746a6499c08 100644 --- a/src/components/LoginForm.vue +++ b/src/components/LoginForm.vue @@ -90,7 +90,7 @@ > </div> </div> - <div class="flex flex-row min-h-screen justify-center items-center"> + <div class="flex justify-center"> <label>{{ message }}</label> </div> </div> @@ -153,11 +153,17 @@ export default { const loginResponse = await doLogin(loginRequest); - if (loginResponse.data === "Login failed") { + if (loginResponse.isLoggedIn === false) { this.message = "Feil e-post/passord"; this.$store.commit("logout"); - } else { + } + else if(loginResponse.isLoggedIn === true){ this.$store.commit("saveToken", loginResponse); + this.message = loginResponse.token; + console.log("Logged in") + } + else { + console.log("Something went wrong") } }, diff --git a/src/utils/apiutil.js b/src/utils/apiutil.js index 8812b429588b3974d65292f39fcc60bd4dc3647c..f371b8134615b8388eef25645fb68f206d2699cc 100644 --- a/src/utils/apiutil.js +++ b/src/utils/apiutil.js @@ -1,13 +1,16 @@ import axios from "axios"; export function doLogin(loginRequest) { + const auth = {isLoggedIn: false, token: ""}; return axios .post(process.env.VUE_APP_BASEURL + "login/authentication", loginRequest) .then((response) => { - return response.data; + auth.isLoggedIn = true; + auth.token = response.data; + return auth; }) .catch((error) => { console.log(error.response); - return error.response; + return auth; }); }