Browse Source

Fix incorrect response while wrong credentials was provided

Signed-off-by: Chunwea Woo <chw644@hotmail.com>
pull/1295/head
LancerComet 3 years ago committed by Chunwea Woo
parent
commit
cbb22e7441
  1. 28
      packages/nocodb/src/lib/noco/rest/RestAuthCtrl.ts

28
packages/nocodb/src/lib/noco/rest/RestAuthCtrl.ts

@ -635,17 +635,19 @@ export default class RestAuthCtrl {
try { try {
if (!user || !user.email) { if (!user || !user.email) {
if (err) { if (err) {
// This exception was thrown directly before. // err: { msg: string }
return res.status(400).send(err);
}
if (info) {
// info: { message: string }
// Info was thrown directly before.
// In order to avoid breaking change, both "msg" and "message" are returned. // In order to avoid breaking change, both "msg" and "message" are returned.
const message = err.message ?? '' const message = info.message ?? '';
return res.status(400).send({ return res.status(400).send({
msg: message, msg: message,
message message
}); });
} }
if (info) {
return res.status(400).send(info);
}
return res.status(400).send({ msg: 'Your signin has failed' }); return res.status(400).send({ msg: 'Your signin has failed' });
} }
@ -700,13 +702,7 @@ export default class RestAuthCtrl {
try { try {
if (!user || !user.email) { if (!user || !user.email) {
if (err) { if (err) {
// This exception was thrown directly before. return res.status(400).send(err);
// In order to avoid breaking change, both "msg" and "message" are returned.
const message = err.message ?? ''
return res.status(400).send({
msg: message,
message
});
} }
if (info) { if (info) {
return res.status(400).send(info); return res.status(400).send(info);
@ -765,13 +761,7 @@ export default class RestAuthCtrl {
try { try {
if (!user || !user.email) { if (!user || !user.email) {
if (err) { if (err) {
// This exception was thrown directly before. return res.status(400).send(err);
// In order to avoid breaking change, both "msg" and "message" are returned.
const message = err.message ?? ''
return res.status(400).send({
msg: message,
message
});
} }
if (info) { if (info) {
return res.status(400).send(info); return res.status(400).send(info);

Loading…
Cancel
Save