diff --git a/packages/app/src/components/Login/index.jsx b/packages/app/src/components/Login/index.jsx index c78ff71c..a00044ce 100755 --- a/packages/app/src/components/Login/index.jsx +++ b/packages/app/src/components/Login/index.jsx @@ -82,8 +82,10 @@ export default class Login extends React.Component { this.toogleLoading(true) const loginProcess = await AuthModel.login(payload).catch((error) => { + console.error(error, error.response) + this.toogleLoading(false) - this.onError(error) + this.onError(error.response.data.message) return false }) diff --git a/packages/app/src/components/Login/index.less b/packages/app/src/components/Login/index.less index 5fe8093c..0ddb7d91 100755 --- a/packages/app/src/components/Login/index.less +++ b/packages/app/src/components/Login/index.less @@ -75,6 +75,7 @@ .field-error { color: red; font-size: 0.8rem; + margin: 20px 0; } } } diff --git a/packages/server/src/controllers/AuthController/endpoints/userLogin.js b/packages/server/src/controllers/AuthController/endpoints/userLogin.js index bdc6dcf9..bf695896 100755 --- a/packages/server/src/controllers/AuthController/endpoints/userLogin.js +++ b/packages/server/src/controllers/AuthController/endpoints/userLogin.js @@ -7,11 +7,15 @@ export default { fn: async (req, res) => { passport.authenticate("local", { session: false }, async (error, user, options) => { if (error) { - return res.status(500).json(`Error validating user > ${error.message}`) + return res.status(500).json({ + message: `Error validating user > ${error.message}`, + }) } if (!user) { - return res.status(401).json("Invalid credentials") + return res.status(401).json({ + message: "Invalid credentials", + }) } const token = await Token.createNewAuthToken(user, options) diff --git a/packages/server/src/controllers/AuthController/endpoints/userLogout.js b/packages/server/src/controllers/AuthController/endpoints/userLogout.js index b4f22252..6c7e7e48 100755 --- a/packages/server/src/controllers/AuthController/endpoints/userLogout.js +++ b/packages/server/src/controllers/AuthController/endpoints/userLogout.js @@ -8,18 +8,26 @@ export default { const { token, user_id } = req.body if (typeof user_id === "undefined") { - return res.status(400).json("No user_id provided") + return res.status(400).json({ + message: "No user_id provided", + }) } if (typeof token === "undefined") { - return res.status(400).json("No token provided") + return res.status(400).json({ + message: "No token provided", + }) } const session = await Session.findOneAndDelete({ user_id, token }) if (session) { - return res.json("done") + return res.json({ + message: "Session deleted", + }) } - return res.status(404).json("not found") + return res.status(404).json({ + message: "Session not found", + }) }, } \ No newline at end of file diff --git a/packages/server/src/controllers/AuthController/endpoints/userRegister.js b/packages/server/src/controllers/AuthController/endpoints/userRegister.js index c54c33f5..f243618e 100755 --- a/packages/server/src/controllers/AuthController/endpoints/userRegister.js +++ b/packages/server/src/controllers/AuthController/endpoints/userRegister.js @@ -10,7 +10,9 @@ export default { select: ["username", "email", "password", "fullName"], }, async (req, res) => { const result = await createUser(req.selection).catch((err) => { - return res.status(500).json(err.message) + return res.status(500).json({ + message: `Error creating user > ${err.message}`, + }) }) return res.json(result)