From fd226b454ed759c34e37ae867f9d49cf3c3f276f Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sun, 27 Oct 2019 14:46:31 -0400
Subject: [PATCH] Delete users fully works now

---
 functions/handlers/users.js           |  8 ++------
 functions/index.js                    |  2 +-
 twistter-frontend/src/pages/Delete.js | 12 ++++++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/functions/handlers/users.js b/functions/handlers/users.js
index 7e4b018..cc54149 100644
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -151,18 +151,14 @@ exports.deleteUser = (req, res) => {
   firebase.auth().onAuthStateChanged(function(user) {
     currentUser = user;
     if (currentUser) {
-      /*db.collection("users").doc(`${currentUser.handle}`).delete()
+      db.collection("users").doc(`${req.user.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() {
diff --git a/functions/index.js b/functions/index.js
index 41a126c..45d181a 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -29,7 +29,7 @@ app.post("/signup", signup);
 app.post("/login", login);
 
 //Deletes user account
-app.delete("/delete", deleteUser);
+app.delete("/delete", fbAuth, deleteUser);
 
 app.get("/getUser/:handle", getUserDetails);
 
diff --git a/twistter-frontend/src/pages/Delete.js b/twistter-frontend/src/pages/Delete.js
index ab610b1..eafeecf 100644
--- a/twistter-frontend/src/pages/Delete.js
+++ b/twistter-frontend/src/pages/Delete.js
@@ -7,7 +7,8 @@ import Button from "@material-ui/core/Button";
 import withStyles from "@material-ui/core/styles/withStyles";
 
 // Redux stuff
-import { logoutUser } from "../redux/actions/userActions";
+//import { logoutUser } from "../redux/actions/userActions";
+import { deleteUser } from "../redux/actions/userActions";
 import { connect } from "react-redux";
 
 const styles = {
@@ -32,7 +33,8 @@ const styles = {
 export class Delete extends Component {
 
   componentDidMount() {
-    this.props.logoutUser();
+    //this.props.logoutUser();
+    this.props.deleteUser();
     this.props.history.push('/');
   }
 
@@ -45,10 +47,12 @@ const mapStateToProps = (state) => ({
   user: state.user
 });
 
-const mapActionsToProps = { logoutUser };
+//const mapActionsToProps = { logoutUser };
+const mapActionsToProps = { deleteUser };
 
 Delete.propTypes = {
-  logoutUser: PropTypes.func.isRequired,
+  //logoutUser: PropTypes.func.isRequired,
+  deleteUser: PropTypes.func.isRequired,
   user: PropTypes.object.isRequired,
   classes: PropTypes.object.isRequired
 };