Fixed conflicts with Sprint 2 checkpoint and the most up-to-date version

functions/handlers/post.js

@@ -1,4 +1,3 @@
-/* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
 const admin = require('firebase-admin');
 
@@ -17,7 +16,6 @@ exports.putPost = (req, res) => {
 
     admin.firestore().collection('posts').add(newPost)
     .then((doc) => {
-        doc.update({postId: doc.id})
         const resPost = newPost;
         resPost.postId = doc.id;
         return res.status(200).json(resPost);
@@ -65,7 +63,3 @@ exports.getallPosts = (req, res) => {
     res.status(500).send("Failed to retrieve posts from database.", err);
     });
 };
-
-exports.getFilteredPosts = (req, res) => {
-    admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
-};

functions/handlers/topic.js

@@ -1,60 +1,52 @@
+/* eslint-disable promise/always-return */
 const { admin, db } = require("../util/admin");
 exports.putTopic = (req, res) => {
-  const newTopic = {
-    topic: req.body.topic
-  };
 
-  admin
-    .firestore()
-    .collection("topics")
-    .add(newTopic)
-    .then(doc => {
-      const resTopic = newTopic;
-      return res.status(200).json(resTopic);
+    const newTopic = {
+        topic: req.body.topic
+    };
+
+    admin.firestore().collection('topics').add(newTopic)
+    .then((doc) => {
+        const resTopic = newTopic;
+        newTopic.topicId = doc.id;
+        return res.status(200).json(resTopic);
     })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "something is wrong" });
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({ error: 'something is wrong'});
     });
 };
 
 exports.getAllTopics = (req, res) => {
-  admin
-    .firestore()
-    .collection("topics")
-    .get()
-    .then(data => {
-      let topics = [];
-      data.forEach(function(doc) {
-        topics.push({
-          topic: doc.data().topic,
-          id: doc.id
+    admin.firestore().collection('topics').get()
+    .then((data) => {
+        let topics = [];
+        data.forEach(function(doc) {
+            topics.push(doc.data());
         });
-      });
-      return res.status(200).json(topics);
+        return res.status(200).json(topics);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to fetch all topics.'})
     })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "Failed to fetch all topics." });
-    });
 };
 
 exports.deleteTopic = (req, res) => {
-  const topic = db.doc(`/topics/${req.params.topicId}`);
-  topic
-    .get()
-    .then(doc => {
-      if (!doc.exists) {
-        return res.status(404).json({ error: "Topic not found" });
-      } else {
-        return topic.delete();
-      }
+    const topic = db.doc(`/topics/${req.params.topicId}`);
+    topic.get().then((doc) => {
+        if (!doc.exists) {
+            return res.status(404).json({error: 'Topic not found'});
+        } else {
+            return topic.delete();
+        }
     })
     .then(() => {
-      return res.json({ message: "Topic successfully deleted!" });
+        res.json({ message: 'Topic successfully deleted!'});
     })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "Failed to delete topic." });
-    });
-};
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to delete topic.'})
+    })
+}

functions/handlers/users.js

@@ -54,7 +54,7 @@ exports.signup = (req, res) => {
 
   db.doc(`/users/${newUser.handle}`)
     .get()
-    .then(doc => {
+    .then((doc) => {
       if (doc.exists) {
         return res
           .status(400)
@@ -64,28 +64,25 @@ exports.signup = (req, res) => {
         .auth()
         .createUserWithEmailAndPassword(newUser.email, newUser.password);
     })
-    .then(data => {
+    .then((data) => {
       userId = data.user.uid;
       return data.user.getIdToken();
     })
-    .then(idToken => {
+    .then((idToken) => {
       token = idToken;
-      const defaultImageUrl = `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/no-img.png?alt=media`;
       const userCred = {
         email: newUser.email,
         handle: newUser.handle,
         createdAt: newUser.createdAt,
         userId,
-        followedTopics: [],
-        imageUrl: defaultImageUrl,
-        verified: false
+        followedTopics: []
       };
       return db.doc(`/users/${newUser.handle}`).set(userCred);
     })
     .then(() => {
       return res.status(201).json({ token });
     })
-    .catch(err => {
+    .catch((err) => {
       console.error(err);
       if (err.code === "auth/email-already-in-use") {
         return res.status(500).json({ email: "This email is already taken." });
@@ -123,156 +120,116 @@ exports.login = (req, res) => {
   // Email/username field is username since it's not in email format
   if (!user.email.match(emailRegEx)) {
     var userDoc = db.collection("users").doc(`${user.email}`);
-    userDoc
-      .get()
-      .then(function(doc) {
+    userDoc.get()
+    .then(function(doc) {
         if (doc.exists) {
           user.email = doc.data().email;
-        } else {
-          return res
-            .status(403)
-            .json({ general: "Invalid credentials. Please try again." });
+        }
+        else {
+          return res.status(403).json({ general: "Invalid credentials. Please try again." });
         }
         return;
+    })
+    .then(function() {
+      firebase
+      .auth()
+      .signInWithEmailAndPassword(user.email, user.password)
+      .then((data) => {
+        return data.user.getIdToken();
       })
-      .then(function() {
-        firebase
-          .auth()
-          .signInWithEmailAndPassword(user.email, user.password)
-          .then(data => {
-            return data.user.getIdToken();
-          })
-          .then(token => {
-            return res.status(200).json({ token });
-          })
-          .catch(err => {
-            console.error(err);
-            if (
-              err.code === "auth/user-not-found" ||
-              err.code === "auth/invalid-email" ||
-              err.code === "auth/wrong-password"
-            ) {
-              return res
-                .status(403)
-                .json({ general: "Invalid credentials. Please try again." });
-            }
-            return res.status(500).json({ error: err.code });
-          });
-        return;
+      .then((token) => {
+        return res.status(200).json({ token });
       })
-      .catch(function(err) {
-        if (!doc.exists) {
-          return res
-            .status(403)
-            .json({ general: "Invalid credentials. Please try again." });
+      .catch((err) => {
+        console.error(err);
+        if (err.code === "auth/user-not-found" || err.code === "auth/invalid-email" || err.code === "auth/wrong-password") {
+          return res.status(403).json({ general: "Invalid credentials. Please try again." });
         }
-        return res.status(500).send(err);
+        return res.status(500).json({ error: err.code });
       });
+      return;
+    })
+    .catch(function(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
   else {
     firebase
-      .auth()
-      .signInWithEmailAndPassword(user.email, user.password)
-      .then(data => {
-        return data.user.getIdToken();
-      })
-      .then(token => {
-        return res.status(200).json({ token });
-      })
-      .catch(err => {
-        console.error(err);
-        if (
-          err.code === "auth/user-not-found" ||
-          err.code === "auth/invalid-email" ||
-          err.code === "auth/wrong-password"
-        ) {
-          return res
-            .status(403)
-            .json({ general: "Invalid credentials. Please try again." });
-        }
-        return res.status(500).json({ error: err.code });
-      });
+    .auth()
+    .signInWithEmailAndPassword(user.email, user.password)
+    .then((data) => {
+      return data.user.getIdToken();
+    })
+    .then((token) => {
+      return res.status(200).json({ token });
+    })
+    .catch((err) => {
+      console.error(err);
+      if (err.code === "auth/user-not-found" || err.code === "auth/invalid-email" || err.code === "auth/wrong-password") {
+        return res
+              .status(403)
+              .json({ general: "Invalid credentials. Please try again." });
+      }
+      return res.status(500).json({ error: err.code });
+    });
   }
 };
 
-//Deletes user account and all associated data
+//Deletes user account
 exports.deleteUser = (req, res) => {
-  // Get the profile image filename
-  // `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/${imageFileName}?alt=media`
-  let imageFileName;
-  req.userData.imageUrl
-    ? (imageFileName = req.userData.imageUrl.split("/o/")[1].split("?alt=")[0])
-    : (imageFileName = "no-img.png");
-
-  const userId = req.userData.userId;
-  let errors = {};
-
-  function thenFunction(data) {
-    console.log(`${data} data for ${req.userData.handle} has been deleted.`);
-  }
-
-  function catchFunction(data, err) {
-    console.error(err);
-    errors[data] = err;
-  }
-
-  // Deletes user from authentication
-  let auth = admin.auth().deleteUser(userId);
-
-  // Deletes database data
-  let data = db
-    .collection("users")
-    .doc(`${req.user.handle}`)
-    .delete();
-
-  // Deletes any custom profile image
-  let image;
-  if (imageFileName !== "no-img.png") {
-    image = admin
-      .storage()
-      .bucket()
-      .file(imageFileName)
-      .delete();
-  } else {
-    image = Promise.resolve();
-  }
-
-  // Deletes all users posts
-  let posts = db
-    .collection("posts")
-    .where("userHandle", "==", req.user.handle)
-    .get()
-    .then(query => {
-      query.forEach(snap => {
-        snap.ref.delete();
-      });
-      return;
-    });
-
-  let promises = [
-    auth.then(thenFunction("auth")).catch(err => catchFunction("auth", err)),
-    data.then(thenFunction("data")).catch(err => catchFunction("data", err)),
-    image.then(thenFunction("image")).catch(err => catchFunction("image", err)),
-    posts.then(thenFunction("posts")).catch(err => catchFunction("image", err))
-  ];
-
-  // Wait for all promises to resolve
-  let waitPromise = Promise.all(promises);
-
-  waitPromise
-    .then(() => {
-      if (Object.keys(errors) > 0) {
-        return res.status(500).json(errors);
-      } else {
-        return res.status(200).json({
-          message: `All data for ${req.userData.handle} has been deleted.`
+  var currentUser;
+  firebase.auth().onAuthStateChanged(function(user) {
+    currentUser = user;
+    if (currentUser) {
+      var post_query = db.collection("posts").where("userHandle", "==", req.user.handle);
+      post_query.get()
+      .then(function(myPosts) {
+        myPosts.forEach(function(doc) {
+          doc.ref.delete();
         });
-      }
-    })
-    .catch(err => {
-      return res.status(500).json({ error: err });
-    });
+        return;
+      })
+      .then(function() {
+        res.status(200).send("Successfully removed all user's posts from database.");
+        return;
+      })
+      .catch(function(err) {
+        res.status(500).send("Failed to remove all user's posts from database.", err);
+      });
+
+
+
+      db.collection("users").doc(`${req.user.handle}`).delete()
+      .then(function() {
+        res.status(200).send("Sucessfully removed user from database.");
+        return;
+      })
+      .catch(function(err) {
+        res.status(500).send("Failed to remove user from database.", err);
+      });
+
+
+      
+      currentUser.delete()
+      .then(function() {
+        console.log("Successfully deleted user.");
+        res.status(200).send("Sucessfully deleted user.");
+        return;
+      })
+      .catch(function(err) {
+        console.log("Failed to delete user.", err);
+        res.status(500).send("Failed to delete user.");
+      });
+    } 
+    else {
+      console.log("Failed to deleter user or cannot get user.");
+      res.status(500).send("Failed to deleter user or cannot get user.");
+    }
+  });
 };
 
 // Returns all data in the database for the user who is currently signed in
@@ -280,10 +237,10 @@ exports.getProfileInfo = (req, res) => {
   db.collection("users")
     .doc(req.user.handle)
     .get()
-    .then(data => {
+    .then((data) => {
       return res.status(200).json(data.data());
     })
-    .catch(err => {
+    .catch((err) => {
       console.error(err);
       return res.status(500).json(err);
     });
@@ -301,11 +258,13 @@ exports.updateProfileInfo = (req, res) => {
     .set(profileData, { merge: true })
     .then(() => {
       console.log(`${req.user.handle}'s profile info has been updated.`);
-      return res.status(201).json({
-        general: `${req.user.handle}'s profile info has been updated.`
-      });
+      return res
+        .status(201)
+        .json({
+          general: `${req.user.handle}'s profile info has been updated.`
+        });
     })
-    .catch(err => {
+    .catch((err) => {
       console.error(err);
       return res.status(500).json({
         error: "Error updating profile data"
@@ -317,15 +276,14 @@ exports.getUserDetails = (req, res) => {
   let userData = {};
   db.doc(`/users/${req.body.handle}`)
     .get()
-    .then(doc => {
+    .then((doc) => {
       if (doc.exists) {
         userData = doc.data();
-        return res.status(200).json({ userData });
-      } else {
-        return res.status(400).json({ error: "User not found." });
-      }
-    })
-    .catch(err => {
+        return res.status(200).json({userData});
+    } else {
+      return res.status(400).json({error: "User not found."})
+    }})
+    .catch((err) => {
       console.error(err);
       return res.status(500).json({ error: err.code });
     });
@@ -335,159 +293,17 @@ exports.getAuthenticatedUser = (req, res) => {
   let credentials = {};
   db.doc(`/users/${req.user.handle}`)
     .get()
-    .then(doc => {
+    .then((doc) => {
       if (doc.exists) {
         credentials = doc.data();
-        return res.status(200).json({ credentials });
-      } else {
-        return res.status(400).json({ error: "User not found." });
-      }
-    })
-    .catch(err => {
+        return res.status(200).json({credentials});
+    } else {
+      return res.status(400).json({error: "User not found."})
+    }})
+    .catch((err) => {
       console.error(err);
       return res.status(500).json({ error: err.code });
     });
 };
 
-// Verifies the user sent to the request
-// Must be run by the Admin user
-exports.verifyUser = (req, res) => {
-  if (req.userData.handle !== "Admin") {
-    return res.status(403).json({ error: "This must be done as Admin" });
-  }
 
-  db.doc(`/users/${req.body.user}`)
-    .get()
-    .then(doc => {
-      if (doc.exists) {
-        let verifiedUser = doc.data();
-        verifiedUser.verified = true;
-        return db
-          .doc(`/users/${req.body.user}`)
-          .set(verifiedUser, { merge: true });
-      } else {
-        return res
-          .status(400)
-          .json({ error: `User ${req.body.user} was not found` });
-      }
-    })
-    .then(() => {
-      return res
-        .status(201)
-        .json({ message: `${req.body.user} is now verified` });
-    })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: err.code });
-    });
-};
-
-// Unverifies the user sent to the request
-// Must be run by admin
-exports.unverifyUser = (req, res) => {
-  if (req.userData.handle !== "Admin") {
-    return res.status(403).json({ error: "This must be done as Admin" });
-  }
-
-  db.doc(`/users/${req.body.user}`)
-    .get()
-    .then(doc => {
-      if (doc.exists) {
-        let unverifiedUser = doc.data();
-        unverifiedUser.verified = false;
-        return db
-          .doc(`/users/${req.body.user}`)
-          .set(unverifiedUser, { merge: true });
-      } else {
-        return res
-          .status(400)
-          .json({ error: `User ${req.body.user} was not found` });
-      }
-    })
-    .then(() => {
-      return res
-        .status(201)
-        .json({ message: `${req.body.user} is no longer verified` });
-    })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: err.code });
-    });
-};
-exports.getUserHandles = (req, res) => {
-  admin
-    .firestore()
-    .collection("users")
-    .get()
-    .then(data => {
-      let users = [];
-      data.forEach(function(doc) {
-        users.push(doc.data().handle);
-      });
-      return res.status(200).json(users);
-    })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "Failed to get all user handles." });
-    });
-};
-
-exports.addSubscription = (req, res) => {
-  let new_following = [];
-  let userRef = db.doc(`/users/${req.userData.handle}`);
-  userRef.get().then(doc => {
-    new_following = doc.data().following;
-    new_following.push(req.body.following);
-
-    // add stuff
-    userRef
-      .set({ following: new_following }, { merge: true })
-      .then(doc => {
-        return res
-          .status(201)
-          .json({ message: `Following ${req.body.following}` });
-      })
-      .catch(err => {
-        return res.status(500).json({ err });
-      });
-  });
-};
-
-exports.getSubs = (req, res) => {
-  let data = [];
-  db.doc(`/users/${req.userData.handle}`)
-    .get()
-    .then(doc => {
-      data = doc.data().following;
-      return res.status(200).json({ data });
-    })
-    .catch(err => {
-      return res.status(500).json({ err });
-    });
-};
-
-exports.removeSub = (req, res) => {
-  let new_following = [];
-  let userRef = db.doc(`/users/${req.userData.handle}`);
-  userRef.get().then(doc => {
-    new_following = doc.data().following;
-    // remove username from array
-    new_following.forEach(function(follower, index) {
-      if (follower === `${req.body.unfollow}`) {
-        new_following.splice(index, 1);
-      }
-    });
-
-    // update database
-    userRef
-      .set({ following: new_following }, { merge: true })
-      .then(doc => {
-        return res
-          .status(202)
-          .json({ message: `Successfully unfollow ${req.body.unfollow}` });
-      })
-      .catch(err => {
-        return res.status(500).json({ err });
-      });
-  });
-};