Skip to content

Commit f124fcd

Browse files
committed
check feeback from instructor
1 parent 8368567 commit f124fcd

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

middlewares/errorHandler.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
const errorHandler = (err, req, res, next) => {
2-
if (err.statusCode) {
3-
return res.status(err.statusCode).send({ message: err.message });
4-
}
5-
if (err.name === 'ValidationError') {
6-
return res.status(400).send({ message: 'Invalid data passed' });
7-
}
8-
if (err.name === 'CastError') {
9-
return res.status(400).send({ message: 'Invalid ID format' });
10-
}
11-
if (err.code === 11000) {
12-
return res.status(409).send({ message: 'Email already exists' });
13-
}
14-
if (err.name === 'JsonWebTokenError' || err.name === 'TokenExpiredError') {
15-
return res.status(401).send({ message: 'Unauthorized access' });
16-
}
17-
return res.status(500).send({ message: 'Internal server error' });
2+
3+
const { statusCode = 500, message } = err;
4+
res
5+
.status(statusCode)
6+
.send({
7+
8+
message: statusCode === 500
9+
? 'An error occurred on the server'
10+
: message
11+
});
1812
};
13+
1914
module.exports = errorHandler;

utils/config.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module.exports = {
2-
JWT_SECRET:"securePassword123",
3-
JWT_EXPIRATION_TIME:"7d",
4-
// JWT_SECRET: process.env.JWT_SECRET ,
5-
// JWT_EXPIRATION_TIME: process.env.JWT_EXPIRATION_TIME,
6-
DOMAIN_URL : 'https://testwtwr.jumpingcrab.com'
2+
JWT_SECRET: process.env.JWT_SECRET || "securePassword123",
3+
JWT_EXPIRATION_TIME: process.env.JWT_EXPIRATION_TIME || "7d",
4+
DOMAIN_URL: 'https://testwtwr.jumpingcrab.com'
75
};

0 commit comments

Comments
 (0)