feat(authentication): add support to use basic auth for icp iam key

Author: mamoonraja

lib/ibm_watson/watson_service.rb

@@ -39,6 +39,7 @@ def initialize(vars)
     @password = nil
     @token_manager = nil
     @temp_headers = nil
+    @icp_prefix = vars[:password]&.start_with?("icp-") ? true : false
 
     user_agent_string = "watson-apis-ruby-sdk-" + IBMWatson::VERSION
     user_agent_string += " #{RbConfig::CONFIG["host"]}"
@@ -62,7 +63,7 @@ def initialize(vars)
     if !vars[:iam_access_token].nil? || !vars[:iam_apikey].nil?
       _token_manager(iam_apikey: vars[:iam_apikey], iam_access_token: vars[:iam_access_token], iam_url: vars[:iam_url])
     elsif !vars[:username].nil? && !vars[:password].nil?
-      if vars[:username] == "apikey"
+      if vars[:username] == "apikey" && !@icp_prefix
         iam_apikey(iam_apikey: vars[:password])
       else
         @username = vars[:username]
@@ -117,7 +118,7 @@ def request(args)
     args.delete_if { |_, v| v.nil? }
     args[:headers].delete("Content-Type") if args.key?(:form) || args[:json].nil?
 
-    if @username == "apikey"
+    if @username == "apikey" && !@icp_prefix
       iam_apikey(iam_apikey: @password)
       @username = nil
     end

test/unit/test_assistant_v1.rb

@@ -40,6 +40,37 @@ def test_plain_to_json
     assert_equal(response, service_response.result)
   end
 
+  def test_plain_to_json_icp
+    response = {
+      "text" => "I want financial advice today.",
+      "created" => "2016-07-11T16:39:01.774Z",
+      "updated" => "2015-12-07T18:53:59.153Z"
+    }
+    headers = {
+      "Content-Type" => "application/json"
+    }
+    stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/v1/workspaces/boguswid/counterexamples?version=2018-02-16")
+      .with(
+        body: "{\"text\":\"I want financial advice today.\"}",
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic YXBpa2V5OmljcC14eXo=",
+          "Content-Type" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 201, body: response.to_json, headers: headers)
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service_response = service.create_counterexample(
+      workspace_id: "boguswid",
+      text: "I want financial advice today."
+    )
+    assert_equal(response, service_response.result)
+  end
+
   def test_rate_limit_exceeded
     error_code = 429
     error_msg = "Rate limit exceeded"