allow basic-auth url in vcap_services - fixes issue #327 (#328)

* allow basic-auth url in vcap_services - fixes issue #327

* updated CHANGES.md

* construct URL from username/password/host from VCAP instead of using url

* encode the host too

Author: glynnbird

CHANGES.md

@@ -1,5 +1,6 @@
 # UNRELEASED
 - [FIXED] Case where `username` and `password` options were not used if a `url` was supplied.
+- [FIXED] Case where vcapServices was supplied with a basic-auth url
 
 # 2.3.0 (2018-06-08)
 - [FIXED] Removed addition of `statusCode` to response objects returned by promises.

lib/reconfigure.js

@@ -94,6 +94,9 @@ module.exports = function(config) {
           outUrl = 'https://' + encodeURIComponent(credentials.host);
           if (credentials.apikey) {
             outCreds.iamApiKey = credentials.apikey;
+          } else if (credentials.username && credentials.password) {
+            outUrl = 'https://' + encodeURIComponent(credentials.username) + ':' +
+                               encodeURIComponent(credentials.password) + '@' + encodeURIComponent(credentials.host);
           }
           break;
         } else {

test/legacy/reconfigure.js

@@ -246,6 +246,15 @@ describe('Reconfigure', function() {
     done();
   });
 
+  // Issue cloudant/nodejs-cloudant#327
+  it('allows a vcap_services basic-auth url', function(done) {
+    var credentials = { vcapServices: {"cloudantNoSQLDB":[{"credentials":{"username":"x","password":"y","host":"z.cloudant.com","port":443,"url":"https://x:[email protected]"},"syslog_drain_url":null,"volume_mounts":[],"label":"cloudantNoSQLDB","provider":null,"plan":"Shared","name":"iot-cloudantNoSQLDB","tags":["data_management","ibm_created","lite","ibm_dedicated_public"]}]} };
+    var outCreds = reconfigure(credentials);
+    outCreds.outUrl.should.be.a.String;
+    outCreds.outUrl.should.equal('https://x:[email protected]');
+    done();
+  });
+
   it('errors for empty vcap', function(done) {
     var config = {vcapServices: {}};
     should(function() { reconfigure(config); }).throw('Missing Cloudant service in vcapServices');