ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 10:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Invalid credential message displays after non-exisitng email is passed in

Browse Source
This commit is contained in:
Aaron Sun 2019-10-28 20:14:38 -04:00
parent 9525ff7d0a
commit c482f56762
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
functions/handlers/users.js
View File

@ -126,7 +126,7 @@ exports.login = (req, res) => {
user.email = doc.data().email; user.email = doc.data().email;
} }
else { else {
res.status(500).send("No such doc"); return res.status(403).json({ general: "Invalid credentials. Please try again." });
} }
return; return;
}) })
@ -142,17 +142,18 @@ exports.login = (req, res) => {
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email") { if (err.code === "auth/user-not-found" || err.code === "auth/wrong-password") {
return res return res.status(403).json({ general: "Invalid credentials. Please try again." });
.status(403)
.json({ general: "Invalid credentials. Please try again." });
} }
return res.status(500).json({ error: err.code }); return res.status(500).json({ error: err.code });
}); });
return; return;
}) })
.catch(function(err) { .catch(function(err) {
res.status(500).send(err); if(!doc.exists) {
return res.status(403).json({ general: "Invalid credentials. Please try again." });
}
return res.status(500).send(err);
}); });
} }
// Email/username field is username // Email/username field is username
@ -168,10 +169,8 @@ exports.login = (req, res) => {
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
if (err.code === "auth/invalid-email" || err.code === "auth/wrong-password") { if (err.code === "auth/user-not-found" || err.code === "auth/wrong-password") {
return res return res.status(403).json({ general: "Invalid credentials. Please try again." });
.status(403)
.json({ general: "Invalid credentials. Please try again." });
} }
return res.status(500).json({ error: err.code }); return res.status(500).json({ error: err.code });
}); });