Fix(push/upload): Fix to get new login system with push and upload. Pass in the argv object. Closes ionic-team#482

jbavari · jbavari · commit 618d7aca108c · 2015-06-15T12:57:55.000-06:00
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
@@ -9,24 +9,33 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
     Task = require('./task').Task,
-    IonicLoginTask = require('./login').IonicTask;
+    IonicAppLib = require('ionic-app-lib'),
+    Login = IonicAppLib.login,
+    LoginTask = require('./login');
+    // IonicLoginTask = require('./login').IonicTask;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic, argv) {
   var self = this;
-
   self.ionic = ionic;
   self.inputValues = {};
   self.inputFiles = {};
   self.useCmdArgs = false;
 
   this.getCmdLineOptions();
 
-  var login = new IonicLoginTask();
-  login.get(ionic, function(jar) {
+  Login.retrieveLogin()
+  .then(function(jar){
+    if (!jar) {
+      console.log('No previous login existed. Attempting to log in now.');
+      return LoginTask.login(argv);
+    }
+    return jar;
+  })
+  .then(function(jar) {
     self.jar = jar;
 
     if (argv._[1] && argv._[1].trim() == 'webhook_url') {
@@ -49,8 +58,11 @@ IonicTask.prototype.run = function(ionic) {
       // where y will put into live and n will put into dev
       self.set_production_mode(self);
     }
-  
-  });
+  })
+  .catch(function(ex) {
+    console.log('An error occurred', ex);
+  })
+
 };
 
 IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
@@ -20,7 +20,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   .then(function(jar){
     if (!jar) {
       console.log('No previous login existed. Attempting to log in now.');
-      return LoginTask.login();
+      return LoginTask.login(argv);
     }
     return jar;
   })
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ IonicTask.prototype.run = function run(ionic, argv) {`
`20`	`20`	`.then(function(jar){`
`21`	`21`	`if (!jar) {`
`22`	`22`	`console.log('No previous login existed. Attempting to log in now.');`
`23`		`- return LoginTask.login();`
	`23`	`+ return LoginTask.login(argv);`
`24`	`24`	`}`
`25`	`25`	`return jar;`
`26`	`26`	`})`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ionic",`
`3`		`- "version": "1.5.1",`
	`3`	`+ "version": "1.5.2",`
`4`	`4`	`"preferGlobal": true,`
`5`	`5`	`"description": "A tool for creating and developing Ionic Framework mobile apps.",`
`6`	`6`	`"homepage": "http://ionicframework.com/",`