prioritizing email and password params for login if supplied

Author: Chris Raynor

bin/firebase

@@ -46,14 +46,14 @@ if (argv._.length === 0) {
       // Top-level functionality
 
       case 'login':
-        firebase.login();
+        firebase.login(argv);
         break;
       case 'logout':
-        firebase.logout(argv.d);
+        firebase.logout(argv);
         break;
       case 'ls':
       case 'list':
-        firebase.list();
+        firebase.list(argv);
         break;
 
       // Submodules

lib/app.js

@@ -52,7 +52,7 @@ function getPrompt(schema, onComplete, idx, results) {
 
 module.exports = {
   init: function(argv) {
-    auth.listFirebases().then(function(res) {
+    auth.listFirebases(argv).then(function(res) {
 
       var settingsFile = path.resolve('./firebase.json');
       if (fs.existsSync(settingsFile)) {
@@ -152,7 +152,7 @@ module.exports = {
     });
   },
   bootstrap: function(argv) {
-    _when.join(this.getTemplates(), auth.listFirebases()).done(function(resultSet) {
+    _when.join(this.getTemplates(), auth.listFirebases(argv)).done(function(resultSet) {
       var supportedTemplates = resultSet[0],
           res = resultSet[1];
 
@@ -329,7 +329,7 @@ module.exports = {
     });
   },
   deploy: function(argv) {
-    auth.requireLogin(function(err) {
+    auth.requireLogin(argv, function(err) {
       if (err) {
         console.log(chalk.red('Login Error'));
         process.exit(1);

lib/auth.js

@@ -12,11 +12,12 @@ var auth = {
                 '.firebaserc'
               ),
   maxRetries: 3,
-  requireLogin: function(callback) {
+  requireLogin: function(argv, callback) {
     var that = this;
 
-    if ((this.email.length === 0) || (this.token.length === 0)) {
-      // TODO: prioritize email/pass params passed in over existing credentials
+    if (argv.email && argv.password) {
+      this._attemptLogin(this.maxRetries, callback);
+    } else if ((this.email.length === 0) || (this.token.length === 0)) {
       console.log('Please sign into your Firebase account to continue...');
       this._attemptLogin(this.maxRetries, callback);
     } else {
@@ -254,9 +255,9 @@ var auth = {
     } catch (e) {}
     return config;
   },
-  listFirebases: function() {
+  listFirebases: function(argv) {
     return _when.promise(function(resolve, reject, notify) {
-      auth.requireLogin(function(err) {
+      auth.requireLogin(argv, function(err) {
         if (err) {
           var error = new Error('Login Unsuccessful');
               error.type = 'LOGIN';

lib/firebase.js

@@ -3,7 +3,7 @@ var auth = require('./auth'),
     chalk = require('chalk');
 
 module.exports = {
-  login: function() {
+  login: function(argv) {
     auth.login(function(err) {
       if (err) {
         console.log(chalk.red('Login Unsuccessful'));
@@ -13,8 +13,8 @@ module.exports = {
       }
     });
   },
-  logout: function(deleteAll) {
-    auth.logout(deleteAll, function(err) {
+  logout: function(argv) {
+    auth.logout(argv.d, function(err) {
       if (err) {
         console.log(chalk.red('Log Out Unsuccessful'));
         process.exit(1);
@@ -23,8 +23,8 @@ module.exports = {
       }
     });
   },
-  list: function() {
-    auth.listFirebases().then(function(res) {
+  list: function(argv) {
+    auth.listFirebases(argv).then(function(res) {
       res.showFirebases();
     }, function(error) {
       switch (error.type) {