Skip to content

Commit 4876e57

Browse files
Handle connections error message in frontend
1 parent 714a911 commit 4876e57

2 files changed

Lines changed: 34 additions & 12 deletions

File tree

frontend/src/components/login/login.js

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import '../Modal.css'
99
function Login({toggleModalBox, setDisplayModal}) {
1010
const [isLoggedIn, setLoggedIn] = useState(false);
1111
const [isError, setIsError] = useState(false);
12+
const [errorMessages, setErrorMessage] = useState([]);
1213
const [username, setUserName] = useState("");
1314
const [password, setPassword] = useState("");
1415
const { setAuthTokens } = useAuth();
@@ -20,12 +21,18 @@ function Login({toggleModalBox, setDisplayModal}) {
2021
'email': "",
2122

2223
};
23-
const response = await client.postRequest("/rest-auth/login", null, param);
24-
if (response.status === 200) {
25-
setAuthTokens(response.data);
26-
setLoggedIn(true);
27-
} else {
24+
try {
25+
const response = await client.postRequest("/rest-auth/login", null, param);
26+
if (response.status === 200) {
27+
setAuthTokens(response.data);
28+
setLoggedIn(true);
29+
} else {
30+
setIsError(true);
31+
setErrorMessage(Object.values(response.data));
32+
}
33+
} catch (error) {
2834
setIsError(true);
35+
setErrorMessage(Object.values(error.response.data));
2936
}
3037
}
3138

@@ -71,7 +78,11 @@ function Login({toggleModalBox, setDisplayModal}) {
7178
</Button>
7279
</Form>
7380
<Link onClick={toggleModalBox}>Don't have an account?</Link>
74-
{ isError &&<Error>The username or password provided were incorrect!</Error> }
81+
{ isError &&<Error>
82+
Error:
83+
{errorMessages.map(message => <div>{message}</div>)}
84+
85+
</Error> }
7586
</Card>
7687
);
7788
}

frontend/src/components/login/signup.js

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ function Signup({toggleModalBox, setDisplayModal}) {
1313
const [password2, setPassword2] = useState("");
1414
const email = ""
1515
const { setAuthTokens } = useAuth();
16+
const [errorMessages, setErrorMessage] = useState([]);
1617

1718
async function postSignup() {
1819
const param = {
@@ -21,12 +22,18 @@ function Signup({toggleModalBox, setDisplayModal}) {
2122
'password2': password2,
2223

2324
};
24-
const response = await client.postRequest("/rest-auth/registration", null, param);
25-
if (response.status === 201) {
26-
setAuthTokens(response.data);
27-
setLoggedIn(true);
28-
} else {
25+
try {
26+
const response = await client.postRequest("/rest-auth/registration", null, param);
27+
if (response.status === 201) {
28+
setAuthTokens(response.data);
29+
setLoggedIn(true);
30+
} else {
31+
setIsError(true);
32+
setErrorMessage(Object.values(response.data));
33+
}
34+
} catch (error) {
2935
setIsError(true);
36+
setErrorMessage(Object.values(error.response.data));
3037
}
3138
}
3239

@@ -87,7 +94,11 @@ function Signup({toggleModalBox, setDisplayModal}) {
8794
</Form>
8895

8996
<Link onClick={toggleModalBox}>Already have an account?</Link>
90-
{ isError &&<Error>The username or password provided were incorrect!</Error> }
97+
{ isError &&<Error>
98+
Error:
99+
{errorMessages.map(message => <div>{message}</div>)}
100+
101+
</Error> }
91102
</Card>
92103
);
93104
}

0 commit comments

Comments
 (0)