Skip to content

Commit

Permalink
error msg fix
Browse files Browse the repository at this point in the history
  • Loading branch information
angelalvaigle committed Dec 16, 2024
1 parent 63ffe90 commit 3795eb8
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 20 deletions.
4 changes: 1 addition & 3 deletions gatewayservice/gateway-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ app.patch('/update-user', async (req, res) => {
);
res.json(userResponse.data);
} catch (error) {
res
.status(error.response.status)
.json({ error: error.response.data.error });
res.status(error.response.status).json({ msg: error.response.data.msg });
}
});

Expand Down
3 changes: 0 additions & 3 deletions middleware/auth-middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ export const authenticateUser = (req, res, next) => {
const { userId, role } = verifyJWT(token);
req.user = { userId, role };

console.log('auth mw req.user');
console.log(req.user);

next();
} catch (error) {
throw new UnauthenticatedError('Authentication invalid');
Expand Down
2 changes: 0 additions & 2 deletions middleware/errorhandler-middleware.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { StatusCodes } from 'http-status-codes';

const errorHandlerMiddleware = (err, req, res, next) => {
console.log('error handler');
console.log(err);
const statusCode = err.statusCode || StatusCodes.INTERNAL_SERVER_ERROR;
const msg = err.message || 'something went wrong';
res.status(statusCode).json({ msg });
Expand Down
4 changes: 0 additions & 4 deletions middleware/validation-middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ const withValidationErrors = (validateValues) => {
const errors = validationResult(req);
if (!errors.isEmpty()) {
const errorMessages = errors.array().map((error) => error.msg);
console.log('validation mw');
console.log(errorMessages);
throw new BadRequestError(errorMessages);
}
next();
Expand Down Expand Up @@ -83,8 +81,6 @@ export const validateUpdateUserInput = withValidationErrors([
.withMessage('email must be no more than 20 characters long')
.custom(async (email, { req }) => {
const user = await User.findOne({ email });
console.log(user);
console.log(req.user);
if (user && user._id.toString() !== req.user.userId) {
throw new BadRequestError('email already exists');
}
Expand Down
12 changes: 4 additions & 8 deletions users/userservice/user-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,8 @@ export const getCurrentUserController = async (req, res) => {
};

export const updateUserController = async (req, res) => {
try {
const newUser = { ...req.body };
delete newUser.password;
await User.findByIdAndUpdate(req.user.userId, newUser);
res.status(StatusCodes.OK).json({ msg: 'update user' });
} catch (error) {
res.status(500).json({ error: error.message });
}
const newUser = { ...req.body };
delete newUser.password;
await User.findByIdAndUpdate(req.user.userId, newUser);
res.status(StatusCodes.OK).json({ msg: 'update user' });
};
2 changes: 2 additions & 0 deletions users/userservice/user-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import express from 'express';
import mongoose from 'mongoose';
import userRouter from './user-router.js';
import errorHandlerMiddleware from './middleware/errorhandler-middleware.js';

const app = express();
const port = 8001;
Expand All @@ -14,6 +15,7 @@ mongoose.connect(mongoUri);

// userRouter
app.use('/', userRouter);
app.use(errorHandlerMiddleware);

const server = app.listen(port, () => {
console.log(`User Service listening at http://localhost:${port}`);
Expand Down

0 comments on commit 3795eb8

Please sign in to comment.