clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-04-25 03:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1295 from LancerComet/fix-incorrect-signin-response

Browse Source 
Fix incorrect response while wrong credentials was provided
This commit is contained in:
navi
2022-02-18 09:17:05 +00:00
committed by GitHub
parent 924a8fb8a0 cbb22e7441
commit 320b1bea76
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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