fr/deguapp
1
1
Fork 1
Code Issues 18 Pull Requests 1 Actions Releases 2 Activity

Merge pull request 'Fixes: error handling on login page #13' (#39) from fr/error-handling-login into main

Browse Source 
Reviewed-on: #39
This commit is contained in:
Filip Rojek 2024-06-03 16:21:31 +02:00
commit 81ce9eb546
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/app/context/AuthContext.js
View File

@ -90,7 +90,7 @@ export function AuthProvider({ children }) {
}); });
if (resUser.status != 200) { if (resUser.status != 200) {
throw Error("user does not have user data"); throw Error("Username or password is incorrect!");
} }
const userData = await resUser.json(); const userData = await resUser.json();
@ -104,7 +104,7 @@ export function AuthProvider({ children }) {
await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt); await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt);
} catch (err) { } catch (err) {
console.error("Failed to log in", err); console.error("Failed to log in", err);
return { error: true, msg: err.res }; return { error: true, msg: err };
} }
} }

8
frontend/app/login.js
View File

@ -20,8 +20,12 @@ function LoginPage() {
} }
}, [authState.authenticated]); }, [authState.authenticated]);
function login() { async function login() {
onLogin(email, pass); const res = await onLogin(email, pass);
if (res !== undefined && res.error === true) {
alert(res.msg);
return;
}
} }
return ( return (