GIFT-245

react-ui/src/app/dashboard/users/NewUser.jsx

@@ -62,7 +62,7 @@ export default class NewUser extends React.Component<{}, { user: * }> {
           window.location = '/dashboard/user';
         });
       }).catch(() => {
-        alert('Could not save user. An unknown error has occured.');
+        alert('Could not save user. An unknown error has occured. Perhaps a user with that email address already exists in the database?');
       });
     })
   }

server/apps/nominations/controllers/user.js

@@ -99,13 +99,15 @@ module.exports = {
     if (req.user.role !== 'admin') {
       res.status(401);
       res.json({ data: null });
+      return;
     }
 
     const { user } = req.body;
 
     if (user.password !== user.password_confirmation) {
       res.status(401);
       res.json({ data: null });
+      return;
     }
     console.log('start');
     // Find existing user with that email address
@@ -116,6 +118,8 @@ module.exports = {
         data: null,
         message: 'User already exists'
       });
+      console.log('User already exists');
+      return;
     }
 
     db.user.create({
@@ -131,6 +135,7 @@ module.exports = {
       approved: true,
       password: auth.hashPassword(user.password),
       affiliation_id: user.affiliation_id,
+      confirmation_email: false
     }).then((createdUser) => {
       console.log('made a user!', createdUser);
       res.json({ data: { user: { id: createdUser.id } } });