Merge pull request #80 from apigee-internal/custom-auth-uri-fixes

Formatting the url before handing it off to the cert lib.

Author: f1erro

.gitignore

@@ -41,4 +41,5 @@ tests/cache-config.yaml
 tmp-*
 default.yaml.bak
 *-*-*config.yaml
-test-token.txt
+test-token.txt
+env.sh

cli/lib/cert-lib.js

@@ -393,7 +393,7 @@ function isApigeeError(err, code) {
 
 function getPublicKey(organization, environment, authUri,cb) {
 
-  const uri = util.format(authUri + '/publicKey', organization, environment);
+  const uri = authUri + '/publicKey';
   request({
     uri: uri,
   }, function(err, res) {

cli/lib/cert.js

@@ -44,15 +44,23 @@ Cert.prototype.installCert = function(options, cb) {
 
 Cert.prototype.checkCert = function(options, cb) {
 
-
-
   assert(options.org,"org is required");
   assert(options.env,"env is required")
 
   assert(options.username,"username is required");
   assert(options.password,"password is required")
 
   const config = edgeconfig.load({ source: configLocations.getSourcePath(options.org, options.env) });
+  if (options.url) {
+    if (options.url.indexOf('://') === -1) {
+      options.url = 'https://' + options.url;
+    }
+    config.edge_config.authUri = options.url + '/edgemicro-auth';
+  } else {
+    var newAuthURI = util.format(config.edge_config.authUri, options.org, options.env);
+    config.edge_config.authUri = newAuthURI;
+  }
+
   cert(config).checkCertWithPassword(options, (err, res) => {
     if (err) {
       if(cb){
@@ -94,6 +102,15 @@ Cert.prototype.retrievePublicKey = function(options,cb) {
  assert(options.env,"env is required")
 
   const config = edgeconfig.load({ source: configLocations.getSourcePath(options.org, options.env) });
+  if (options.url) {
+    if (options.url.indexOf('://') === -1) {
+      options.url = 'https://' + options.url;
+    }
+    config.edge_config.authUri = options.url + '/edgemicro-auth';
+  } else {
+    var newAuthURI = util.format(config.edge_config.authUri, options.org, options.env);
+    config.edge_config.authUri = newAuthURI;
+  }
   cert(config).retrievePublicKey(options, (err, certificate) => {
     if (err) {
       cb && cb(err);
@@ -133,4 +150,4 @@ function printError(err) {
   } else {
     console.log(err);
   }
-}
+}

cli/lib/configure.js

@@ -50,6 +50,9 @@ Configure.prototype.configure = function configure(options, cb) {
       options.url = 'https://' + options.url;
     }
     defaultConfig.edge_config.authUri = options.url + '/edgemicro-auth';
+  } else {
+    var newAuthURI = util.format(defaultConfig.edge_config.authUri, options.org, options.env);
+    defaultConfig.edge_config.authUri = newAuthURI;
   }
 
   authUri = defaultConfig.edge_config.authUri;
@@ -153,8 +156,7 @@ function configureEdgemicroWithCreds(options, cb) {
       agentConfig['edge_config']['jwt_public_key'] = results[0]; // get deploy results
       agentConfig['edge_config'].bootstrap = results[2].bootstrap; // get genkeys results
     } else {
-      agentConfig['edge_config']['jwt_public_key'] =
-        options.url ? authUri + '/publicKey' : util.format(authUri + '/publicKey', options.org, options.env);
+      agentConfig['edge_config']['jwt_public_key'] = authUri + '/publicKey';
       agentConfig['edge_config'].bootstrap = results[1].bootstrap;
     }