feat(ICP): Authenticate using basicauth if using TokenOptions with an icp-apikey

Author: mediumTaj

src/IBM.WatsonDeveloperCloud/Service/WatsonService.cs

@@ -25,6 +25,7 @@ public abstract class WatsonService : IWatsonService
     {
         const string PATH_AUTHORIZATION_V1_TOKEN = "/authorization/api/v1/token";
         const string ICP_PREFIX = "icp-";
+        const string APIKEY_AS_USERNAME = "apikey";
         public IClient Client { get; set; }
 
         public string ServiceName { get; set; }
@@ -89,7 +90,7 @@ protected WatsonService(string serviceName, string url, IClient httpClient)
         /// <param name="password">The password</param>
         public void SetCredential(string userName, string password)
         {
-            if (userName == "apikey" && !password.StartsWith(ICP_PREFIX))
+            if (userName == APIKEY_AS_USERNAME && !password.StartsWith(ICP_PREFIX))
             {
                 TokenOptions tokenOptions = new TokenOptions()
                 {
@@ -112,19 +113,26 @@ public void SetCredential(string userName, string password)
         /// <param name="options"></param>
         public void SetCredential(TokenOptions options)
         {
-            if (!string.IsNullOrEmpty(options.ServiceUrl))
-            {
-                if (!_userSetEndpoint)
-                {
-                    this.Endpoint = options.ServiceUrl;
-                }
+            if (options.IamApiKey.StartsWith(ICP_PREFIX))
+            {
+                SetCredential(APIKEY_AS_USERNAME, options.IamApiKey);
             }
             else
-            {
-                options.ServiceUrl = this.Endpoint;
-            }
-
-            _tokenManager = new TokenManager(options);
+            {
+                if (!string.IsNullOrEmpty(options.ServiceUrl))
+                {
+                    if (!_userSetEndpoint)
+                    {
+                        this.Endpoint = options.ServiceUrl;
+                    }
+                }
+                else
+                {
+                    options.ServiceUrl = this.Endpoint;
+                }
+
+                _tokenManager = new TokenManager(options);
+            }
         }
 
         public void SetEndpoint(string url)