[minor] Added reset property with defaults and better message

nodejitsu · Aug 12, 2011 · 5c9b510 · 5c9b510
1 parent 3574246
commit 5c9b510
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/lib/jitsu.js b/lib/jitsu.js
@@ -225,6 +225,19 @@ jitsu.setupUserNoWarn = function(callback) {
   //
   var tries = 0;
 
+  function offerReset (username) {
+    jitsu.prompt.get(['reset'], function (err, res) {
+      if (err) {
+        return callback(err);
+      }
+      if (/^y[es]*/i.test(res.reset)) {
+        return jitsu.commands.run(['users', 'forgot', username], callback);
+      }
+
+      callback(new Error('Invalid username / password.'));
+    });
+  }
+
   (function setupAuth () {
     jitsu.prompt.get(['username', 'password'], function (err, result) {
       if (err) {
@@ -256,19 +269,6 @@ jitsu.setupUserNoWarn = function(callback) {
       });
     });
   })();
-
-  function offerReset(username) {
-    jitsu.prompt.get(['reset'], function (err, res) {
-      if (err) {
-        return callback(err);
-      }
-      if (/^y[es]*/i.test(res.reset)) {
-        return jitsu.commands.run(['users', 'forgot', username], callback);
-      }
-      return callback(new Error('Password Reset Pending.'));
-    });
-  }
-
 };
 
 //

diff --git a/lib/jitsu/properties.js b/lib/jitsu/properties.js
@@ -36,5 +36,11 @@ properties.properties = {
     name: 'username',
     validator: /^[\w|\-]+$/,
     warning: 'Username can only be letters, numbers, and dashes'
+  },
+  reset: {
+    name: 'request password reset',
+    validator: /y[es]?|n[o]?/,
+    warning: 'Must respond yes or no',
+    default: 'no'
   }
 };