Merge pull request #8 from Watson-Personal-Assistant/Ari---Multi-tenant-Audio-gateway-is-not-working-for-new-Tenant-#514

added support for tenantID that is sent to audio gateway

Author: arivatibm

config/configure.properties.example

@@ -11,6 +11,9 @@ IAMAPIKey=
 # Choosing which skill set to use (Required parameter)
 skillset=
 
+# tenant ID can be passed (Optional parameter for customers with just one tenant - Required parameter for customers that have more then one tenant linked on their IBM ID account)
+#tenantID=
+
 # Client language specific preferences can be passed (Optional parameter with a default value: en-US)
 #language=en-US
 

src/main/java/wa/client/Client.java

@@ -98,6 +98,8 @@ public class Client extends WebSocketListener implements ThreadManager, Runnable
     private Boolean watsonSsl = true;
 
     private String userID = null;
+    
+    private String tenantID = null;
 
     private String watsonVoice = null;
 
@@ -1071,7 +1073,9 @@ private void initialize(Properties props) {
 
         String noSsl = props.getProperty("nossl", "false");
         watsonSsl = noSsl.equalsIgnoreCase("false");
-        // the userId
+        tenantID = props.getProperty("tenantID");
+        if (tenantID == null)
+        		tenantID="";
         userID = props.getProperty("userID");
         watsonVoice = props.getProperty("voice");
         commandSocketPort = Integer.parseInt(props.getProperty("cmdSocketPort", "10010"));
@@ -1090,6 +1094,7 @@ private void initialize(Properties props) {
         LOG.info("WATSON PORT (Optional): " + watsonPort);
         LOG.info("SKILLSET: " + skillset);
         LOG.info("WATSON IAM API Key: " + (null == iamApiKey ? "null" : "*****"));
+        LOG.info("TENANT ID (Optional): " + tenantID);
         LOG.info("USER ID (Optional): " + userID);
         LOG.info("Language (Optional): " + language);
         LOG.info("Engine (Optional): " + engine);
@@ -1229,7 +1234,10 @@ private synchronized void connect() throws InterruptedException {
             // Build request
             String webSocketUrl = (watsonSsl ? "wss" : "ws") + "://" + watsonHost + (watsonPort == null ? "" : ":" + watsonPort) + "?skillset=" + skillset + "&userID=" + userID
                     + "&language=" + language + "&engine=" + engine;
-            Request request = new Request.Builder().url(webSocketUrl).addHeader("Authorization", "Bearer " + iamAccessToken).build();
+            Request request = new Request.Builder().url(webSocketUrl)
+            		.addHeader("Authorization", "Bearer " + iamAccessToken)
+            		.addHeader("tenantid", tenantID)
+            		.build();
 
             // initialize the watch dog
             Runnable cleanup = new CleanUp(this.audioInput, this.audioOutput, this.indicator);