Merge pull request #1983 from LuisReinoso/feature/issue-1982

Issues-1982 - Add IAM authentication for Watson TTS

mycroft/tts/ibm_tts.py

@@ -29,7 +29,11 @@ def __init__(self, lang, config,
         self.type = "wav"
         user = self.config.get("user") or self.config.get("username")
         password = self.config.get("password")
-        self.auth = HTTPBasicAuth(user, password)
+        api_key = self.config.get("apikey")
+        if api_key is None:
+            self.auth = HTTPBasicAuth(user, password)
+        else:
+            self.auth = HTTPBasicAuth("apikey", api_key)
 
     def build_request_params(self, sentence):
         params = self.PARAMS.copy()
@@ -51,10 +55,11 @@ def validate_connection(self):
         config = Configuration.get().get("tts", {}).get("watson", {})
         user = config.get("user") or config.get("username")
         password = config.get("password")
-        if user and password:
+        apikey = config.get("apikey")
+        if user and password or apikey:
             return
         else:
-            raise ValueError('user and/or password for IBM tts is not defined')
+            raise ValueError('user/pass or apikey for IBM tts is not defined')
 
     def get_tts_class(self):
         return WatsonTTS