From eea2f56b490c1ab8f6016d023087a15f92b65866 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Thu, 24 Oct 2019 15:27:20 -0400
Subject: [PATCH] Code for removing user from db still in progress (commented
 out)

---
 functions/handlers/post.js            | 43 +++++++++++++--------------
 functions/handlers/users.js           | 24 +++++++++++----
 twistter-frontend/src/pages/Delete.js |  8 ++---
 3 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/functions/handlers/post.js b/functions/handlers/post.js
index 5f361fe..e3d0c01 100644
--- 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.'})
+    })
+};
diff --git a/functions/handlers/users.js b/functions/handlers/users.js
index 7f5a39a..7e4b018 100644
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -151,19 +151,33 @@ exports.deleteUser = (req, res) => {
   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!");
+        console.log("User successfully deleted.");
         res.status(200).send("Deleted user.");
         return;
       })
-      .catch(function(error) {
+      .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");
+    } 
+    else {
+      console.log("Cannot get user.");
+      res.status(500).send("Cannot get user.");
     }
   });
 };
diff --git a/twistter-frontend/src/pages/Delete.js b/twistter-frontend/src/pages/Delete.js
index 22f1682..ab610b1 100644
--- a/twistter-frontend/src/pages/Delete.js
+++ b/twistter-frontend/src/pages/Delete.js
@@ -7,7 +7,7 @@ import Button from "@material-ui/core/Button";
 import withStyles from "@material-ui/core/styles/withStyles";
 
 // Redux stuff
-import { deleteUser } from "../redux/actions/userActions";
+import { logoutUser } from "../redux/actions/userActions";
 import { connect } from "react-redux";
 
 const styles = {
@@ -32,7 +32,7 @@ const styles = {
 export class Delete extends Component {
 
   componentDidMount() {
-    this.props.deleteUser();
+    this.props.logoutUser();
     this.props.history.push('/');
   }
 
@@ -45,10 +45,10 @@ const mapStateToProps = (state) => ({
   user: state.user
 });
 
-const mapActionsToProps = { deleteUser };
+const mapActionsToProps = { logoutUser };
 
 Delete.propTypes = {
-  deleteUser: PropTypes.func.isRequired,
+  logoutUser: PropTypes.func.isRequired,
   user: PropTypes.object.isRequired,
   classes: PropTypes.object.isRequired
 };