Remove force, for and option to update the user

Author: Ilya Radchenko

README.md

@@ -37,9 +37,11 @@ Options:
   -l User's email address
   -p User's password
   -a Specify if this is an admin (flag) (default: false)
-  -f Force create user, overwrites previous user with the same email address (flag) (default: false)
 ```
 
+If a user exists with the given email address, you will have an option to update
+that user, or cancel the process.
+
 ### restart
 
 Restart strider (touch .strider)

add-user.js

@@ -18,36 +18,15 @@ module.exports = function(deps) {
         output: process.stdout
       });
 
-      Step(
-        function getEmail() {
+      Step(function getEmail() {
         var next = this;
 
         if (email) {
           next();
         } else {
           rl.question('Enter email []: ', function (em) {
             email = em;
-
-            User.findByEmail(email, function (err, users) {
-              if (users.length) {
-                if (force) {
-                  User.remove({ email: email }, function (error) {
-                    if (error) {
-                      console.error('Unable to remove existing user with email \'%s\'', email);
-                      process.exit(1);
-                    }
-
-                    next();
-                  });
-                } else {
-                  console.error('User already exists with the \'%s\' email address. Please enter a unique email address.', email);
-                  email = undefined;
-                  getEmail.call(next);
-                }
-              } else {
-                next();
-              }
-            });
+            next();
           });
         }
       },
@@ -92,24 +71,23 @@ module.exports = function(deps) {
 
         process.stdout.write('\nEmail:\t\t' + email + '\n');
         process.stdout.write('Password:\t' + password.replace(/.*/, '****') + '\n');
-process.stdout.write('isAdmin:\t' + (level ? 'y' : 'n') + '\n');
-
-rl.question('OK? (y/n) [y]', function (ok) {
-  if (ok === 'y' || ok === '') {
-    next();
-  } else {
-    console.log('Goodbye!');
-    process.exit();
-  }
-})
+        process.stdout.write('isAdmin:\t' + (level ? 'y' : 'n') + '\n');
+
+        rl.question('OK? (y/n) [y]', function (ok) {
+          if (ok === 'y' || ok === '') {
+            next();
+          } else {
+            console.log('Goodbye!');
+            process.exit();
+          }
+        })
       },
 
       function save() {
-        saveUser(email, password, level, force);
-      }
-      );
+        saveUser(email, password, level);
+      });
     } else {
-      saveUser(email, password, level, force);
+      saveUser(email, password, level);
     }
   }
 

commands/addUser.js

@@ -15,12 +15,6 @@ module.exports = function(deps, parser) {
     'default': false,
     flag: true
   })
-  .option('force', {
-    abbr: 'f',
-    help: 'Force create user, overwrites previous user with the same email address',
-    'default': false,
-    flag: true
-  })
   .callback(function(opts){
     deps.connect(function(err) {
       if (err) {

create-user.js

@@ -1,24 +1,60 @@
 'use strict';
 
+var readline = require('readline');
+
 module.exports = function(deps) {
   var User = deps.models().User;
 
-  function createUser(email, password, admin, force) {
-    var u = new User();
-
-    u.email = email;
-    u.created = new Date();
-    u.set('password', password);
-    u.account_level = admin;
-
-    u.save(function(err) {
+  function createUser(email, password, admin) {
+    User.findByEmail(email, function (err, users) {
       if (err) {
-        console.log('Error adding user:', err);
+        console.error('Failed to lookup users, please let us know at https://github.com/Strider-CD/strider-cli/issues: ', err);
         process.exit(1);
       }
 
-      console.log('\nUser %s successfully! Enjoy.', force ? 'overwritten' : 'added');
-      process.exit();
+      if (users.length) {
+        var rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+
+        rl.question('User already exists, overwrite? (y/n) [n]: ', function (overwrite) {
+          if (overwrite) {
+            User.update({ email: email }, {
+              password: password,
+              account_level: admin
+            }, function (err) {
+              if (err) {
+                console.log('Error updating user:', err);
+                process.exit(1);
+              }
+
+              console.log('User updated successfully! Enjoy.');
+              process.exit();
+            });
+          } else {
+            console.log('addUser cancelled');
+            process.exit();
+          }
+        });
+      } else {
+        var u = new User();
+
+        u.email = email;
+        u.created = new Date();
+        u.set('password', password);
+        u.account_level = admin;
+
+        u.save(function(err) {
+          if (err) {
+            console.log('Error adding user:', err);
+            process.exit(1);
+          }
+
+          console.log('User created successfully! Enjoy.');
+          process.exit();
+        });
+      }
     });
   }
 

save-user.js

@@ -5,7 +5,7 @@ module.exports = function(deps) {
   var Upgrade = deps.upgrade()
     , Config = deps.models().Config
 
-  function saveUser(email, password, admin, force) {
+  function saveUser(email, password, admin) {
     Upgrade.isFreshDb(function (err, isFresh) {
       if (isFresh) {
         Upgrade.needConfigObj(function (err, needsConfig) {
@@ -15,15 +15,15 @@ module.exports = function(deps) {
             c.version = Config.SCHEMA_VERSION;
 
             c.save(function () {
-              createUser(email, password, admin, force);
+              createUser(email, password, admin);
             });
           } else {
-            createUser(email, password, admin, force);
+            createUser(email, password, admin);
           }
         });
       } else {
         Upgrade.ensure(Config.SCHEMA_VERSION, function () {
-          createUser(email, password, admin, force);
+          createUser(email, password, admin);
         });
       }
     });