Update deploy to use correct oauth config

lib/deploy.js

@@ -1,51 +1,44 @@
-/*
-force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>
-*/
-var URL_REGEX = /force:\/\/(.*):(.*):(.*)@(.*)/;
-var TOKEN_REGEX = /.*\"access_token\":\"([A-Za-z0-9.!_]*)\".*/;
+const zipPath = '.salesforce/src.zip';
+const oauth_url = process.env.SALESFORCE_URL;
 
-var zipPath = '.salesforce/src.zip';
+const fs = require('fs');
+const jsforce = require('jsforce');
+const Promise = require('bluebird');
+const { oauthConfig } = require('./auth');
 
-var oauth_url = process.env.SALESFORCE_URL;
+const config = oauthConfig(oauth_url);
+const conn = new jsforce.Connection(config);
 
-if (!oauth_url) {
-  console.error("Force.com deployment failed because SALESFORCE_URL is not configured");
-  process.exit(1);
-}
+conn.on('refresh', function(accessToken, res) {
+  info(`refreshed access token`);
+});
 
-var matcher = oauth_url.match(URL_REGEX);
-var clientId = matcher[1];
-var clientSecret = matcher[2];
-var refreshToken = matcher[3];
-var instance = matcher[4];
+const prompt = function(message) {
+  console.log(`-----> ${message}`);
+};
 
-var fs = require('fs');
-var jsforce = require('jsforce');
-var Promise = require('bluebird');
+const info = function(message) {
+  console.log(`       ${message}`);
+};
 
-var connection = new jsforce.OAuth2({
-    clientId : clientId,
-    clientSecret : clientSecret
-  }).refreshToken(refreshToken)
-  .then(function(body) {
-    // Logging too be able to log in through the UI. Set as an env var?
-    console.log(body.access_token);
-    return new jsforce.Connection({
-      instanceUrl : `https://${instance}`,
-      accessToken : body.access_token
-    });
-  });
+const error = function(message) {
+  console.error(`       ${message}`);
+};
 
 console.log('-----> Deploying metadata');
-connection.then(function(conn) {
-  var zipStream = fs.createReadStream(zipPath);
-  conn.metadata.pollTimeout = 240*1000;
-  var deployLocator = conn.metadata.deploy(zipStream, {});
-  deployLocator.on('progress', function(results) {
-    console.log('       polling...');
-  });
-  deployLocator.complete(true, function(err, result) {
-    console.log('       ' + (result.success ? 'Success' : 'Failed'));
-  });
-})
-.catch(console.error);
+const zipStream = fs.createReadStream(zipPath);
+conn.metadata.pollTimeout = 240*1000;
+const deployLocator = conn.metadata.deploy(zipStream, {});
+deployLocator.on('progress', function(results) {
+  info('polling...');
+});
+deployLocator.complete(true, function(err, result) {
+  if(err) { error(err); }
+  info('done ? :' + result.done);
+  info('success ? : ' + result.true);
+  info('state : ' + result.state);
+  info('component errors: ' + result.numberComponentErrors);
+  info('components deployed: ' + result.numberComponentsDeployed);
+  info('tests completed: ' + result.numberTestsCompleted);
+  info('       ' + (result.success ? 'Success' : 'Failed'));
+});