Skip to content

Commit 35ecc8f

Browse files
committed
Handle error
1 parent bd1de47 commit 35ecc8f

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

server.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ app.use(bodyParser.json());
2626

2727
app.post( '/sign-in', ( req, res ) => {
2828

29-
console.warn( req.body );
30-
3129
jwt.sign( req.body ,config.tokenSecret , { expiresIn: 3600 }, ( err, token ) => {
3230
if ( ! token ) {
3331
res.json({ success: false, error: 'Token could not be generated' });
@@ -39,11 +37,15 @@ app.post( '/sign-in', ( req, res ) => {
3937
console.warn( response.data );
4038
res.json( {
4139
success: true,
40+
status: 200,
4241
token,
4342
userData: response.data.user.data
4443
} );
4544
} )
46-
.catch( err => console.warn( err ) );
45+
.catch( err => {
46+
const responseReceived = err.response.data;
47+
res.status(404).json({ success: false, status: 400, errorMessage: responseReceived.message });
48+
} );
4749
}
4850

4951
} );

src/components/Login.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ class Login extends React.Component {
3939
axios.post( `${siteUrl}/sign-in`, loginData )
4040
.then( ( res ) => {
4141

42+
console.warn( 'came res' );
43+
if ( 200 !== res.data.status ) {
44+
this.setState( { error: res.data.errorMessage, loading: false } );
45+
}
4246

4347
const { token } = res.data;
4448
const { user_nicename, user_email } = res.data.userData;
@@ -57,7 +61,10 @@ class Login extends React.Component {
5761
this.setState( { userNiceName, userEmail, loggedIn: true, loading: false } )
5862

5963
} )
60-
.catch( err => this.setState( { error: err.message, loading: false } ) );
64+
.catch( err => {
65+
const responseReceived = err.response.data;
66+
{ this.setState({ error: responseReceived.errorMessage, loading: false } ) }
67+
} );
6168
};
6269

6370
handleOnChange = ( event ) => {
@@ -103,7 +110,7 @@ class Login extends React.Component {
103110
</label>
104111
<br/>
105112
<button className="btn btn-primary mb-3" type="submit">Login</button>
106-
<p>{ loading && <img src={Loader} alt="Loader"/> }</p>
113+
<p>{ loading && <img src={Loader} className="loader" alt="Loader"/> }</p>
107114
</form>
108115
</div>
109116
</React.Fragment>

src/style.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.loader {
2+
position: absolute;
3+
left: 0;
4+
right: 0;
5+
top: 0;
6+
bottom: 0;
7+
margin: auto;
8+
width: 100px;
9+
}

0 commit comments

Comments
 (0)