Merge pull request #615 from watson-developer-cloud/user-agent

Changed header so user-agent is not overwritten, instead appended

Author: germanattanasio

lib/requestwrapper.ts

@@ -220,7 +220,7 @@ export function createRequest(parameters, _callback) {
   // Headers
   options.headers = extend({}, options.headers);
   if (!isBrowser) {
-    options.headers['User-Agent'] = pkg.name + '-nodejs-' + pkg.version;
+    options.headers['User-Agent'] = `${pkg.name}-nodejs-${pkg.version};${options.headers['User-Agent'] || ''}`;
   }
 
   // Query params

test/unit/test.requestWrapper.js

@@ -4,8 +4,11 @@ const createRequest = require('../../lib/requestwrapper').createRequest;
 const formatError = require('../../lib/requestwrapper').formatErrorIfExists;
 const assert = require('assert');
 const isStream = require('isstream');
+const watson = require('../../index');
+const pjson = require('../../package.json');
 
 describe('requestwrapper', () => {
+  const noop = function() {};
   it('should emit error stream on missing parameters when callback is undefined', () => {
     const parameters = {
       options: {
@@ -17,6 +20,38 @@ describe('requestwrapper', () => {
     };
     assert(isStream(createRequest(parameters, '')));
   });
+
+  it('header should be accurate', () => {
+    const service = {
+      username: 'batman',
+      password: 'bruce-wayne',
+      url: 'http://ibm.com:80',
+      version: 'v1',
+      version_date: '2017-05-26'
+    };
+    const service2 = {
+      username: 'batman',
+      password: 'bruce-wayne',
+      url: 'http://ibm.com:80',
+      version: 'v1',
+      version_date: '2017-05-26',
+      headers: {
+        'User-Agent': 'openwhisk'
+      }
+    };
+    const conversation = watson.conversation(service);
+    const conversation_ow = watson.conversation(service2);
+    const payload = {
+      workspace_id: 'workspace1'
+    };
+    const req = conversation.getIntents(payload, noop);
+    const req2 = conversation_ow.getIntents(payload, noop);
+    assert.equal(req.headers['User-Agent'], 'watson-developer-cloud-nodejs-' + pjson.version + ';');
+    assert.equal(
+      req2.headers['User-Agent'],
+      'watson-developer-cloud-nodejs-' + pjson.version + ';' + 'openwhisk'
+    );
+  });
 });
 
 describe('formatError', () => {