Feature/delete user account

.gitignore

@@ -3,4 +3,5 @@ node_modules/
 src/**/*.css
 build/* 
 npm-debug.log
-TODO
+TODO
+mongo/

routes/follow/follow.js

@@ -7,6 +7,8 @@ router.route("/:project_id").post(function(req, res) {
 
     const { _id: user_id } = req.user;
     const { project_id } = req.params;
+
+    console.log('Follow/Unfollow Request', project_id, req.user._id);
 
     // Find existing project
     Project.findById(project_id, function(err, project) {
@@ -18,7 +20,7 @@ router.route("/:project_id").post(function(req, res) {
         if (userStatus.status === 'following') {
           // User is already following. Unfollow.
           userStatus.remove();
-          console.log('Unfollowed', project);
+          console.log('Unfollowed', project.title);
         }
       } else {
         // User not associated to project
@@ -27,7 +29,7 @@ router.route("/:project_id").post(function(req, res) {
           _id: user_id,
           status: 'following'
         });
-        console.log('Followed', project);  
+        console.log('Followed', project.title);  
       }
       project.save(function(err, update) {
         if (err) throw err;

routes/users/users.js

@@ -6,6 +6,8 @@ const request = require('request');
 const User = require('../../model/users');
 const userHelpers = require('./userHelpers.js')
 
+const Project = require('../../model/projects');
+
  // USER ROUTES
 
 router.route('/')
@@ -45,7 +47,10 @@ router.route('/:user_id')
   .get(function(req, res) {
     User.findById(req.params.user_id, function(err, user) {
       if (err) { res.send(err); }
-      else { 
+      else if (!user) {
+          console.log("User not found!");
+          res.send("User not found!");
+      } else { 
           let user_filtered = {
             _id: user._id,
             username: user.username,
@@ -54,7 +59,7 @@ router.route('/:user_id')
             skillset: user.skillset
           };
           // Only if user is requesting own info, share email address.
-          if (req.user._id === req.params.user_id) {
+          if (req.user && req.user._id === req.params.user_id) {
             user_filtered.email = user.email;
           }
           // respond with full user data only if logged in.
@@ -91,15 +96,62 @@ router.route('/:user_id')
 
   //delete method for removing a user from our database
   .delete(function(req, res) {
-   User.findById(req.user._id)
-     .exec(function (err, user) {
-       if (!user._id.equals(req.user._id)) return res.json({ message: 'Users do not match'});
-       //selects the user by its ID, then removes it.
-       User.remove({ _id: req.params.user_id }, function(err, user) {
-         if (err) { res.send(err); }
-         return res.json({ message: 'User has been deleted' })
-       })
-     })
+    console.log('Delete User request', req.params.user_id);
+    User.findById(req.params.user_id)
+      .exec(function (err, user) {
+        if (err) return res.send(err);
+        if (String(user._id) == String(req.user._id)) {
+          // user to be deleted is owned by the logged in user
+          // Find and remove owned projects
+          Project.deleteMany({
+            users: { 
+                $elemMatch: {
+                    _id: user._id,
+                    status: "owner"
+                }
+            }     
+          })
+          .exec(function (err, res) {
+              if (err) throw err;
+              console.log("Projects deleted", res.deletedCount);
+          });
+          // also find followed projects and remove status
+          Project.find({
+            users: { 
+                $elemMatch: {
+                    _id: user._id,
+                    status: "following"
+                }
+            }
+          })
+          .exec(function (err, projects) {
+              if (err) throw err;
+              if (projects) {
+                projects.forEach(function(project) {
+                  //unfollow all followed projects
+                  let status = project.users.id(user._id);
+                  status.remove();
+                  project.save(function(err, update) {
+                    if (err) throw err;
+                    console.log("Unfollowed projects", update.title);
+                  });
+                });
+
+              }
+          });
+          // Finally remove user account
+          console.log('User to be deleted', user.username);
+          user.remove();
+          user.save(function(err, update) {
+            if (err) throw err;
+          });
+          return res.redirect('/');
+        } else {
+          // user to be deleted is not owned by the logged in user
+          console.log('logged in user ID does not match user to be deleted');
+          return res.send('Cannot delete account not owned by the user');
+        }
+      }) 
   });
 
 router.route('/contact/:user_id')

src/components/atoms/Button.js

@@ -9,7 +9,6 @@ import { withRouter } from 'react-router-dom';
 class Button extends Component {
   handleClick = (e) => {
     if (this.props.onClick) {
-      console.log('button click', this.props.label);
       this.props.onClick(e);
     }
     if (this.props.redirect) {
@@ -18,8 +17,6 @@ class Button extends Component {
   }
   render(){
     const style = this.props.style || null;
-
-    console.log("Button style: ", style);
     return(
       <button className="btn" style={style} onClick={this.handleClick}>{this.props.label}</button>
     )

src/components/molecules/Nav.js

@@ -56,7 +56,6 @@ class Nav extends Component {
     }
   };
   render() {
-    console.log("Nav", this.props);
     return <div>
         <nav className="navbar navbar-expand-lg navbar-dark bg-dark">
           <a id="navbar-brand" className="navbar-brand" onClick={this.handleClick}>

src/components/molecules/ProjectInfo.js

@@ -76,7 +76,6 @@ class ProjectInfo extends Component {
     const isOwner = user && owner && user._id === owner._id;
     let buttons = null;
 
-    console.log('render', project);
     if (!projectId) {
       //this is the '/projects/view/' route without projectId
       return <ProjectList {...this.props} />;

src/components/molecules/UserInfo.js

@@ -4,6 +4,8 @@
 ------------------------*/
 
 import React, { Component } from 'react';
+import { Modal, ModalHeader, ModalBody, Form, FormGroup, Input }  from "reactstrap";
+
 import Button from '../atoms/Button.js';
 import Loader from "../atoms/Loader.js";
 import defaultAvatar from "../../images/default-avatar.png";
@@ -14,7 +16,8 @@ class UserInfo extends Component {
         super(props);
         this.state = {
             user: null,
-            projects: null
+            projects: null,
+            showModal: false
         };
     }
     componentDidMount() {
@@ -46,6 +49,14 @@ class UserInfo extends Component {
     handleClick = (e) => {
         this.props.history.push('/project/view/' + e.target.id);
     }
+    toggleModal = () => {
+        this.setState({
+          showModal: !this.state.showModal
+        });
+    }
+    deleteUser = () => {
+        this.props.onUserDelete(this.props.match.params.id);
+    }
     renderInfo = (user, projects) => {
         if (user) {
             return (
@@ -102,9 +113,26 @@ class UserInfo extends Component {
                     </div>
                     <div className='d-flex justify-content-around btn-section'>
                         {(this.props.user && user._id === this.props.user._id) ? 
-                            (<Button label='Edit Profile' redirect='/user/edit/' />) : 
+                            (<div>
+                                <Button label='Edit Profile' redirect='/user/edit/' />
+                                <button className='btn' onClick={this.toggleModal}>Delete User</button>
+                             </div>
+                            ) : 
                             (<Button label={'Contact ' + user.displayName} redirect={'/contact/'+user._id} />)
                         }
+
+                        <Modal isOpen={this.state.showModal} toggle={this.toggleModal} className={this.props.className}>
+                            <ModalHeader toggle={this.toggleModal}>
+                                Delete your account.
+                            </ModalHeader>
+                            <ModalBody className="text-center">
+                                This will also delete all of your owned projects, and this action cannot be undone. <br/> Are you sure? 
+                                <div>
+                                    <button className='btn' onClick={this.deleteUser}>Yes</button>
+                                    <button className='btn' onClick={this.toggleModal}>NO</button>
+                                </div>
+                            </ModalBody>
+                        </Modal>
                     </div>
                 </div>
             );

src/js/apiCalls.js

@@ -10,6 +10,7 @@ const apiCall = {
   // Retrieve all projects from server
   getAllProjects(next) {
     // get projects from api
+    console.log('get all projects url', apiUrl + '/api/projects');
     axios.get(apiUrl + '/api/projects')
     .then(res => {
       next({data: res.data});
@@ -115,6 +116,19 @@ const apiCall = {
       next({error: err});
       throw err;
     });
+  },
+
+  // delete user
+  deleteUser(id, next) {
+    console.log('deleteUser');
+    axios.delete(`${apiUrl}/api/users/${id}`)
+    .then(res => {
+      next({data: res.data});
+    })
+    .catch(err => {
+      next({error: err});
+      throw err;
+    });
   }
 };