From 8eb54d0f14c78a790fdf0ee8e34c6d57c363f543 Mon Sep 17 00:00:00 2001 From: AdrienLSH Date: Tue, 9 Jan 2024 19:55:55 +0100 Subject: [PATCH] fix: redirect to home after login --- frontend/static/js/api/client.js | 17 +++++++---------- frontend/static/js/views/accounts/LoginView.js | 12 ++++++------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js index 035a4d1..79110be 100644 --- a/frontend/static/js/api/client.js +++ b/frontend/static/js/api/client.js @@ -34,8 +34,8 @@ class Client async isAuthentificate() { if (this._logged == undefined) - this.logged = await this._test_logged(); - return this.logged; + this._logged = await this._test_logged(); + return this._logged; } async _get(uri, data) @@ -100,7 +100,7 @@ class Client async _update_logged(state) { - if (this.logged == state) + if (this._logged == state) return; if (state) @@ -112,19 +112,16 @@ class Client { this.me = undefined; } - this.logged = state; + this._logged = state; } async login(username, password) { let response = await this._post("/api/accounts/login", {username: username, password: password}) - - if (response.status != 200) - return response.status; + if (response.status == 200) + await this._update_logged(true); - this._update_logged(true); - - return 0; + return response.status; } async logout() diff --git a/frontend/static/js/views/accounts/LoginView.js b/frontend/static/js/views/accounts/LoginView.js index 3e40d0a..a18b144 100644 --- a/frontend/static/js/views/accounts/LoginView.js +++ b/frontend/static/js/views/accounts/LoginView.js @@ -7,16 +7,16 @@ async function login() let username = document.getElementById("username-input").value; let password = document.getElementById("password-input").value; + console.log(client._logged); let response_data = await client.login(username, password); - if (response_data == null) - { + if (response_data == 200) { navigateTo("/home"); - return; + } else { +//TODO: error field + clear("innerHTML", ["username", "user", "password"]); + fill_errors(response_data, "innerHTML"); } - - clear("innerHTML", ["username", "user", "password"]); - fill_errors(response_data, "innerHTML"); } export default class extends AbstractNonAuthentifiedView {