Merge branch 'master' into profile_display

2026-03-10 13:15:05 +00:00 · 2019-10-24 22:12:02 -04:00
parent 4200c05ca1 1b3ac4d05a
commit a498b4748f
17 changed files with 291 additions and 244 deletions
--- a/functions/handlers/post.js
+++ b/functions/handlers/post.js
@@ -15,29 +15,28 @@ exports.putPost = (req, res) => {
    };

    admin.firestore().collection('posts').add(newPost)
-            .then((doc) => {
-            const resPost = newPost;
-            resPost.postId = doc.id;
-            return res.status(200).json(resPost);
-        })
-        .catch((err) => {
-            console.error(err);
-            return res.status(500).json({ error: 'something is wrong'});
-        });
+    .then((doc) => {
+        const resPost = newPost;
+        resPost.postId = doc.id;
+        return res.status(200).json(resPost);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({ error: 'something is wrong'});
+    });
 };

 exports.getallPostsforUser = (req, res) => {
-
    admin.firestore().collection('posts').where('userHandle', '==', 'new user' ).get()
-        .then((data) => {
-            let posts = [];
-            data.forEach(function(doc) {
-                posts.push(doc.data());
-            });
-            return res.status(200).json(posts);
-        })
-        .catch((err) => {
-            console.error(err);
-            return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
-        })
-    }
+    .then((data) => {
+        let posts = [];
+        data.forEach(function(doc) {
+            posts.push(doc.data());
+        });
+        return res.status(200).json(posts);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
+    })
+};
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -1,4 +1,5 @@
 /* eslint-disable promise/catch-or-return */
+
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
 const { validateUpdateProfileInfo } = require("../util/validator");
@@ -6,6 +7,8 @@ const { validateUpdateProfileInfo } = require("../util/validator");
 const firebase = require("firebase");
 firebase.initializeApp(config);

+var handle2Email = new Map();
+
 exports.signup = (req, res) => {
  const newUser = {
    email: req.body.email,
@@ -71,11 +74,12 @@ exports.signup = (req, res) => {
    .then((idToken) => {
      token = idToken;
      const userCred = {
-        email: req.body.email,
+        email: newUser.email,
        handle: newUser.handle,
        createdAt: newUser.createdAt,
        userId
      };
+      handle2Email.set(userCred.handle, userCred.email);
      return db.doc(`/users/${newUser.handle}`).set(userCred);
    })
    .then(() => {
@@ -93,16 +97,22 @@ exports.signup = (req, res) => {
 exports.login = (req, res) => {
  const user = {
    email: req.body.email,
+    handle: req.body.handle,
    password: req.body.password
  };

  // Auth validation
  let errors = {};

+  const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
  // Email check
  if (user.email.trim() === "") {
    errors.email = "Email must not be blank.";
  }
+  else if (!user.email.match(emailRegEx)) {
+    user.email = handle2Email.get(user.email);
+  }

  // Password check
  if (user.password.trim() === "") {
@@ -125,7 +135,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." });
@@ -134,6 +144,44 @@ exports.login = (req, res) => {
    });
 };

+//Deletes user account
+exports.deleteUser = (req, res) => {
+  var currentUser;
+
+  firebase.auth().onAuthStateChanged(function(user) {
+    currentUser = user;
+    if (currentUser) {
+      /*db.collection("users").doc(`${currentUser.handle}`).delete()
+      .then(function() {
+        res.status(200).send("Removed user from database.");
+        return;
+      })
+      .catch(function(err) {
+        res.status(500).send("Failed to remove user from database.", err);
+      });*/
+
+      //let ref = db.collection('users');
+      //let userDoc = ref.where('userId', '==', currentUser.uid).get();
+      //userDoc.ref.delete();
+
+      currentUser.delete()
+      .then(function() {
+        console.log("User successfully deleted.");
+        res.status(200).send("Deleted user.");
+        return;
+      })
+      .catch(function(err) {
+        console.log("Error deleting user.", err);
+        res.status(500).send("Failed to delete user.");
+      });
+    } 
+    else {
+      console.log("Cannot get user.");
+      res.status(500).send("Cannot get user.");
+    }
+  });
+};
+
 // Returns all data in the database for the user who is currently signed in
 exports.getProfileInfo = (req, res) => {
  db.collection("users")
@@ -153,7 +201,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
@@ -209,3 +257,5 @@ exports.getAuthenticatedUser = (req, res) => {
      return res.status(500).json({ error: err.code });
    });
 };
+
+
--- a/functions/index.js
+++ b/functions/index.js
@@ -15,6 +15,7 @@ const {
  getProfileInfo,
  login,
  signup,
+  deleteUser,
  updateProfileInfo
 } = require("./handlers/users");

@@ -27,6 +28,9 @@ app.post("/signup", signup);
 // and password
 app.post("/login", login);

+//Deletes user account
+app.delete("/delete", deleteUser);
+
 app.get("/getUser", fbAuth, getUserDetails);

 // Returns all profile data of the currently logged in user
--- a/functions/package-lock.json
+++ b/functions/package-lock.json
@@ -34,21 +34,6 @@
        "dom-storage": "2.1.0",
        "tslib": "1.10.0",
        "xmlhttprequest": "1.8.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/app-types": {
@@ -70,15 +55,9 @@
      "integrity": "sha512-foQHhvyB0RR+mb/+wmHXd/VOU+D8fruFEW1k79Q9wzyTPpovMBa1Mcns5fwEWBhUfi8bmoEtaGB8RSAHnTFzTg=="
    },
    "@firebase/database": {
-<<<<<<< HEAD
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.3.tgz",
-      "integrity": "sha512-LnXKRE1AmjlS+iRF7j8vx+Ni8x85CmLP5u5Pw5rDKhKLn2eTR1tJKD937mUeeGEtDHwR1rrrkLYOqRR2cSG3hQ==",
-=======
      "version": "0.5.4",
      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
      "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "requires": {
        "@firebase/database-types": "0.4.3",
        "@firebase/logger": "0.1.25",
@@ -113,11 +92,7 @@
    "@firebase/firestore": {
      "version": "1.5.3",
      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.5.3.tgz",
-<<<<<<< HEAD
-      "integrity": "sha512-CPYLvkGZBKE47oQC9a0q13UMVRj3LvnSbB1nOerktE3CGRHKy44LxDumamN8Kj067hV/80mKK9FdbeUufwO/Rg==",
-=======
      "integrity": "sha512-O/yAbXpitOA6g627cUl0/FHYlkTy1EiEKMKOlnlMOJF2fH+nLVZREXjsrCC7N2tIvTn7yYwfpZ4zpSNvrhwiTA==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "requires": {
        "@firebase/firestore-types": "1.5.0",
        "@firebase/logger": "0.1.25",
@@ -126,21 +101,6 @@
        "@grpc/proto-loader": "^0.5.0",
        "grpc": "1.23.3",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/firestore-types": {
@@ -173,16 +133,6 @@
        "@firebase/util": "0.2.28",
        "idb": "3.0.2",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/installations-types": {
@@ -190,6 +140,11 @@
      "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.1.2.tgz",
      "integrity": "sha512-fQaWIW8hyX1XUN7+FCSPjvM1agFjGidVuF4Sxi7aFwfyh5t+4fD2VpM4wCQbWmodnx4fZLvsuQd9mkxxU+lGYQ=="
    },
+    "@firebase/logger": {
+      "version": "0.1.25",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
+      "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
+    },
    "@firebase/messaging": {
      "version": "0.4.11",
      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.11.tgz",
@@ -198,16 +153,6 @@
        "@firebase/messaging-types": "0.3.2",
        "@firebase/util": "0.2.28",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/messaging-types": {
@@ -225,21 +170,6 @@
        "@firebase/performance-types": "0.0.3",
        "@firebase/util": "0.2.28",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/performance-types": {
@@ -272,16 +202,6 @@
        "@firebase/storage-types": "0.3.3",
        "@firebase/util": "0.2.28",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/storage-types": {
@@ -289,6 +209,14 @@
      "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.3.tgz",
      "integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w=="
    },
+    "@firebase/util": {
+      "version": "0.2.28",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
+      "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
+      "requires": {
+        "tslib": "1.10.0"
+      }
+    },
    "@firebase/webchannel-wrapper": {
      "version": "0.2.26",
      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.26.tgz",
@@ -607,12 +535,6 @@
      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
      "dev": true
    },
-    "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
    "ansi-styles": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -830,28 +752,28 @@
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "requires": {
            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
      }
    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    }
-  }
-},
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -1190,15 +1112,9 @@
      }
    },
    "end-of-stream": {
-<<<<<<< HEAD
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-=======
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
      "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "optional": true,
      "requires": {
        "once": "^1.4.0"
@@ -1274,7 +1190,6 @@
        "progress": "^2.0.0",
        "regexpp": "^2.0.1",
        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
        "strip-json-comments": "^2.0.1",
        "table": "^5.2.3",
        "text-table": "^0.2.0"
@@ -1556,33 +1471,6 @@
        "@firebase/polyfill": "0.3.22",
        "@firebase/storage": "0.3.12",
        "@firebase/util": "0.2.28"
-      },
-      "dependencies": {
-        "@firebase/database": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
-          "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
-          "requires": {
-            "@firebase/database-types": "0.4.3",
-            "@firebase/logger": "0.1.25",
-            "@firebase/util": "0.2.28",
-            "faye-websocket": "0.11.3",
-            "tslib": "1.10.0"
-          }
-        },
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "firebase-admin": {
@@ -1710,8 +1598,7 @@
    "functional-red-black-tree": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "optional": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
    },
    "gaxios": {
      "version": "2.0.1",
@@ -2259,15 +2146,9 @@
      }
    },
    "gtoken": {
-<<<<<<< HEAD
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.0.0.tgz",
-      "integrity": "sha512-XaRCfHJxhj06LmnWNBzVTAr85NfAErq0W1oabkdqwbq3uL/QTB1kyvGog361Uu2FMG/8e3115sIy/97Rnd4GjQ==",
-=======
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.0.tgz",
      "integrity": "sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "optional": true,
      "requires": {
        "gaxios": "^2.0.0",
@@ -2441,8 +2322,7 @@
    "imurmurhash": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "optional": true
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
    },
    "inflight": {
      "version": "1.0.6",
@@ -2457,8 +2337,7 @@
    "inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "optional": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
    "inquirer": {
      "version": "6.5.2",
@@ -2476,7 +2355,6 @@
        "mute-stream": "0.0.7",
        "run-async": "^2.2.0",
        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
        "strip-ansi": "^5.1.0",
        "through": "^2.3.6"
      },
@@ -2525,14 +2403,6 @@
      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
      "optional": true
    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
    "is-obj": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
@@ -2929,7 +2799,6 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "optional": true,
      "requires": {
        "wrappy": "1"
      }
@@ -3374,8 +3243,7 @@
    "signal-exit": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "optional": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
    },
    "slice-ansi": {
      "version": "2.1.0",
@@ -3384,8 +3252,7 @@
      "dev": true,
      "requires": {
        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
+        "astral-regex": "^1.0.0"
      }
    },
    "snakeize": {
@@ -3425,31 +3292,12 @@
      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
    "string_decoder": {
      "version": "0.10.31",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
      "optional": true
    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      }
-    },
    "strip-json-comments": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -3496,7 +3344,6 @@
          "dev": true,
          "requires": {
            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
            "strip-ansi": "^5.1.0"
          }
        },
@@ -3755,8 +3602,7 @@
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "optional": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
    },
    "write": {
      "version": "1.0.3",
--- a/functions/util/fbAuth.js
+++ b/functions/util/fbAuth.js
@@ -32,6 +32,7 @@ module.exports = (req, res, next) => {
        .then((data) => {
            req.user.handle = data.docs[0].data().handle;  // Save username
            req.user.imageUrl = data.docs[0].data().imageUrl;
+            req.userData = data.docs[0].data();  // Stores all user data from the database
            return next();
        })
        .catch((err) => {
--- a/functions/util/validator.js
+++ b/functions/util/validator.js
@@ -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 {