ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 13:15:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing editProfile bugs and making the database storage more efficient

Browse Source
This commit is contained in:
Clayton Wilson
2019-10-24 15:44:53 -04:00
parent b17fb1f3f0
commit 8f5020f881
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
functions/handlers/users.js
View File

@@ -125,7 +125,7 @@ exports.login = (req, res) => {
})
.catch((err) => {
console.error(err);
if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email") {
if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email" || err.code === "auth/user-not-found") {
return res
.status(403)
.json({ general: "Invalid credentials. Please try again." });
@@ -153,7 +153,7 @@ exports.updateProfileInfo = (req, res) => {
// TODO: Add functionality for adding/updating profile images
// Data validation
const { valid, errors, profileData } = validateUpdateProfileInfo(req.body);
const { valid, errors, profileData } = validateUpdateProfileInfo(req);
if (!valid) return res.status(400).json(errors);
// Update the database entry for this user

34
functions/util/validator.js
View File

@@ -9,23 +9,39 @@ const isEmpty = (str) => {
else return false;
};
exports.validateUpdateProfileInfo = (data) => {
exports.validateUpdateProfileInfo = (req) => {
const newData = req.body;
// const oldData = req.userData;
let errors = {};
let profileData = {};
let profileData = req.userData;
// ?: Should users be able to change their handles and emails?
// Only adds the key to the database if the values are not empty
if (!isEmpty(data.firstName)) profileData.firstName = data.firstName.trim();
if (!isEmpty(data.lastName)) profileData.lastName = data.lastName.trim();
if (!isEmpty(data.bio)) profileData.bio = data.bio.trim();
// Deletes any unused keys so that they aren't stored in the database
if (newData.firstName) {
profileData.firstName = newData.firstName.toString().trim();
} else {
delete profileData.firstName;
}
if (isEmpty(data.email)) {
if (newData.lastName) {
profileData.lastName = newData.lastName.toString().trim();
} else {
delete profileData.lastName;
}
if (newData.bio) {
profileData.bio = newData.bio.toString().trim();
} else {
delete profileData.bio;
}
if (isEmpty(newData.email)) {
errors.email = "Must not be empty.";
} else if (!isEmail(data.email)) {
} else if (!isEmail(newData.email)) {
errors.email = "Must be a valid email.";
} else {
profileData.email = data.email;
profileData.email = newData.email;
}
return {