ibm_cloud_sdk_core 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24cf43bb93090b3c2cdb627369b7645ca17eadc7262f16fbb18b40e76f1285b2
-  data.tar.gz: 2d8be9a330480c90327a5b52d6d2121476aaaf85ecb5ef3e3574945b4ceb75f1
+  metadata.gz: 552a7ea5d30afc2a3e9764b365e6a1ea1666852e7eefe54e01e63dc949cfdf02
+  data.tar.gz: 5acfc4a1cfd2f358096bf4c6153282ad39761ed9535ee283dfb28a3f499c7858
 SHA512:
-  metadata.gz: 1294cd526ded8bccfd89556c9450e7111fcff4ae31162a9f4ea5004d6c718ca360a0b6a09a6f83bc1b3910993f8593d76add495736d361b1c876115df5f35ac9
-  data.tar.gz: de99be13ca0a0ce0e0a4d73852bb7c2f25171717bc654e51d7dca70a834f26c1c05a8cac4bf98b2f14f908e0467ad9cd06e8c3799da8e4dbad0c6457e3752189
+  metadata.gz: 967664c0155975c23714884c142259824a74e363df6134bbfaff7236701f61ef3ec5b37950509cd78fcbb37b185e75eda451891fdc88f02f5f9766b9e7c040ed
+  data.tar.gz: e9005fe810d53199e88963ff13a4099c09c624e7f7664243aae7be405bd5bf77d71639cf8a0ace8f61a55beb569eb14343f430bbc8e689abdd8ab42c86003c96

data/lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory.rb

@@ -26,11 +26,11 @@ module IBMCloudSdkCore
       else
         auth_type = config[:auth_type]
       end
-      return BasicAuthenticator.new(config) if auth_type == AUTH_TYPE_BASIC
-      return BearerTokenAuthenticator.new(config) if auth_type == AUTH_TYPE_BEARER_TOKEN
-      return CloudPakForDataAuthenticator.new(config) if auth_type == AUTH_TYPE_CP4D
-      return IamAuthenticator.new(config) if auth_type == AUTH_TYPE_IAM
-      return NoAuthAUthenticator.new if auth_type == AUTH_TYPE_NO_AUTH
+      return BasicAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_BASIC).zero?
+      return BearerTokenAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_BEARER_TOKEN).zero?
+      return CloudPakForDataAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_CP4D).zero?
+      return IamAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_IAM).zero?
+      return NoAuthAuthenticator.new if auth_type.casecmp(AUTH_TYPE_NO_AUTH).zero?
     end
   end
 end

data/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb

@@ -8,7 +8,7 @@ require_relative("../utils.rb")
 module IBMCloudSdkCore
   # Basic Authenticator
   class CloudPakForDataAuthenticator < Authenticator
-    attr_accessor :authentication_type
+    attr_accessor :authentication_type, :disable_ssl_verification
     def initialize(vars)
       defaults = {
         username: nil,
@@ -33,14 +33,14 @@ module IBMCloudSdkCore
     end
 
     # Adds the Authorization header, if possible
-    def authenticate(connector)
-      connector.default_options.headers.add("Authorization", "Bearer #{@token_manager.access_token}")
+    def authenticate(headers)
+      headers["Authorization"] = "Bearer #{@token_manager.access_token}"
     end
 
     # Checks if all the inputs needed are present
     def validate
       raise ArgumentError.new("The username or password shouldn\'t be None.") if @username.nil? || @password.nil?
-      raise ArgumentError.new("The url or password shouldn\'t be None.") if @url.nil?
+      raise ArgumentError.new("The url shouldn\'t be None.") if @url.nil?
       raise ArgumentError.new('The username shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your username') if check_bad_first_or_last_char(@username)
       raise ArgumentError.new('The password shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your password') if check_bad_first_or_last_char(@password)
       raise ArgumentError.new('The url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your url') if check_bad_first_or_last_char(@url)

data/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb

@@ -8,10 +8,7 @@ require_relative("../utils.rb")
 module IBMCloudSdkCore
   # Basic Authenticator
   class IamAuthenticator < Authenticator
-    DEFAULT_CLIENT_ID = "bx"
-    DEFAULT_CLIENT_SECRET = "bx"
-
-    attr_accessor :authentication_type
+    attr_accessor :authentication_type, :disable_ssl_verification, :client_id, :client_secret
     def initialize(vars)
       defaults = {
         url: nil,
@@ -39,7 +36,6 @@ module IBMCloudSdkCore
 
     def authenticate(headers)
       headers["Authorization"] = "Bearer #{@token_manager.access_token}"
-      headers
     end
 
     def validate
@@ -48,12 +44,7 @@ module IBMCloudSdkCore
       raise ArgumentError.new('The apikey shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your apikey') if check_bad_first_or_last_char(@apikey)
 
       # Both the client id and secret should be provided or neither should be provided.
-      if @client_id.nil? && @client_secret.nil?
-        @client_id = DEFAULT_CLIENT_ID
-        @client_secret = DEFAULT_CLIENT_SECRET
-      elsif @client_id.nil? || client_secret.nil?
-        raise ArgumentError.new("Only one of 'client_id' or 'client_secret' were specified, but both parameters should be specified together.")
-      end
+      raise ArgumentError.new("Only one of 'client_id' or 'client_secret' were specified, but both parameters should be specified together.") if (@client_id.nil? && !@client_secret.nil?) || (!@client_id.nil? && @client_secret.nil?)
     end
   end
 end

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -23,7 +23,7 @@ end
 module IBMCloudSdkCore
   # Class for interacting with the API
   class BaseService
-    attr_accessor :display_name
+    attr_accessor :display_name, :service_url, :disable_ssl_verification
     attr_reader :conn, :authenticator
     def initialize(vars)
       defaults = {
@@ -32,15 +32,16 @@ module IBMCloudSdkCore
         display_name: nil
       }
       vars = defaults.merge(vars)
-      @url = vars[:url]
+      @service_url = vars[:service_url]
       @authenticator = vars[:authenticator]
       @disable_ssl_verification = vars[:disable_ssl_verification]
       @display_name = vars[:display_name]
       @service_name = @display_name.tr(" ", "_").downcase unless @display_name.nil?
+      @authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: @service_name) if @authenticator.nil?
 
-      if @service_name && !@url
+      if @service_name && !@service_url
         config = get_service_properties(@service_name)
-        @url = config[:url] unless config.nil?
+        @service_url = config[:url] unless config.nil?
       end
 
       @temp_headers = {}
@@ -74,13 +75,17 @@ module IBMCloudSdkCore
 
       conn = @conn
 
+      @authenticator.authenticate(@temp_headers)
       args[:headers] = args[:headers].merge(@temp_headers) unless @temp_headers.nil?
       @temp_headers = nil unless @temp_headers.nil?
 
+      raise ArgumentError.new("service_url must be provided") if @service_url.nil?
+      raise ArgumentError.new('The service_url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your username') if check_bad_first_or_last_char(@service_url)
+
       if args.key?(:form)
         response = conn.follow.request(
           args[:method],
-          HTTP::URI.parse(@url + args[:url]),
+          HTTP::URI.parse(@service_url + args[:url]),
           headers: conn.default_options.headers.merge(HTTP::Headers.coerce(args[:headers])),
           params: args[:params],
           form: args[:form]
@@ -88,7 +93,7 @@ module IBMCloudSdkCore
       else
         response = conn.follow.request(
           args[:method],
-          HTTP::URI.parse(@url + args[:url]),
+          HTTP::URI.parse(@service_url + args[:url]),
           headers: conn.default_options.headers.merge(HTTP::Headers.coerce(args[:headers])),
           body: args[:json],
           params: args[:params]

data/lib/ibm_cloud_sdk_core/token_managers/iam_token_manager.rb

@@ -16,7 +16,7 @@ module IBMCloudSdkCore
     REQUEST_TOKEN_RESPONSE_TYPE = "cloud_iam"
     TOKEN_NAME = "access_token"
 
-    attr_accessor :token_info, :token_name
+    attr_accessor :token_info, :token_name, :client_id, :client_secret
     def initialize(
       apikey: nil,
       url: nil,

data/lib/ibm_cloud_sdk_core/token_managers/jwt_token_manager.rb

@@ -35,10 +35,6 @@ module IBMCloudSdkCore
       end
     end
 
-    def ssl_verification(disable_ssl_verification)
-      @disable_ssl_verification = disable_ssl_verification
-    end
-
     private
 
     # Check if currently stored token is expired.
@@ -65,10 +61,10 @@ module IBMCloudSdkCore
     end
 
     def request(method:, url:, headers: nil, params: nil, data: nil, username: nil, password: nil)
-      if @disable_ssl_verification
-        ssl_context = OpenSSL::SSL::SSLContext.new
-        ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        response = HTTP.basic_auth(user: username, pass: password).request(
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if @disable_ssl_verification
+      if username.nil? && password.nil?
+        response = HTTP.request(
           method,
           url,
           body: data,
@@ -82,7 +78,8 @@ module IBMCloudSdkCore
           url,
           body: data,
           headers: headers,
-          params: params
+          params: params,
+          ssl_context: ssl_context
         )
       end
       return JSON.parse(response.body.to_s) if (200..299).cover?(response.code)

data/lib/ibm_cloud_sdk_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMCloudSdkCore
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

data/test/unit/test_base_service.rb

@@ -21,10 +21,10 @@ class BaseServiceTest < Minitest::Test
   end
 
   def test_wrong_apikey
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
     assert_raises do
-      IBMCloudSdkCore::IamAuthenticator.new(
-        apikey: "{apikey"
-      )
+      IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "wrong")
     end
   end
 
@@ -37,6 +37,23 @@ class BaseServiceTest < Minitest::Test
     end
   end
 
+  def test_iam_client_id_only
+    assert_raises ArgumentError do
+      IBMCloudSdkCore::IamAuthenticator.new(apikey: "apikey", client_id: "Salah")
+    end
+  end
+
+  def test_no_auth_authenticator
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "red_sox")
+    service = IBMCloudSdkCore::BaseService.new(
+      display_name: "Assistant",
+      authenticator: authenticator
+    )
+    refute_nil(service)
+  end
+
   def test_correct_creds_and_headers
     authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
@@ -56,21 +73,11 @@ class BaseServiceTest < Minitest::Test
     refute_nil(service)
   end
 
-  def test_set_credentials_from_path_in_env
-    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
-    ENV["IBM_CREDENTIALS_FILE"] = file_path
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Visual Recognition")
-    assert_equal(service.instance_variable_get(:@url), "https://gateway.ronaldo.com")
-    refute_nil(service)
-    ENV.delete("IBM_CREDENTIALS_FILE")
-  end
-
   def test_set_credentials_from_path_in_env_nlu
     file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
     ENV["IBM_CREDENTIALS_FILE"] = file_path
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Natural Language Understanding")
-    assert_equal(service.instance_variable_get(:@url), "https://gateway.messi.com")
-    refute_nil(service)
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "natural_language_understanding")
+    assert_equal(authenticator.authentication_type, "bearerToken")
     ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
@@ -81,7 +88,6 @@ class BaseServiceTest < Minitest::Test
     service = IBMCloudSdkCore::BaseService.new(display_name: "Leo Messi", url: "some.url", authenticator: authenticator)
     assert_equal(authenticator.authentication_type, "bearerToken")
     refute_nil(service)
-    ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
   def test_vcap_services
@@ -100,18 +106,18 @@ class BaseServiceTest < Minitest::Test
           "Host" => "we.the.best"
         }
       ).to_return(status: 200, body: "", headers: {})
-    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "Salah")
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, url: "https://we.the.best")
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
+    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, service_url: "https://we.the.best")
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal("", service_response.result)
   end
 
   def test_dummy_request_form_data
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(bearer_token: "token")
     service = IBMCloudSdkCore::BaseService.new(
       display_name: "Assistant",
-      apikey: "apikey",
-      iam_access_token: "token",
-      url: "https://gateway.watsonplatform.net/"
+      authenticator: authenticator,
+      service_url: "https://gateway.watsonplatform.net/"
     )
     form_data = {}
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
@@ -143,9 +149,9 @@ class BaseServiceTest < Minitest::Test
           "Host" => "we.the.best"
         }
       ).to_return(status: 500, body: response.to_json, headers: {})
-    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "Salah")
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, url: "https://we.the.best")
-    assert_raises do
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
+    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, service_url: "https://we.the.best")
+    assert_raises IBMCloudSdkCore::ApiException do
       service.request(method: "GET", url: "/music", headers: {})
     end
   end
@@ -172,66 +178,9 @@ class BaseServiceTest < Minitest::Test
     service = IBMCloudSdkCore::BaseService.new(
       display_name: "Assistant",
       authenticator: authenticator,
-      url: "https://we.the.best"
+      service_url: "https://we.the.best"
     )
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal(response, service_response.result)
   end
-
-  def test_for_cp4d_authenticator
-    token_layout = {
-      "username": "dummy",
-      "role": "Admin",
-      "permissions": %w[administrator manage_catalog],
-      "sub": "admin",
-      "iss": "sss",
-      "aud": "sss",
-      "uid": "sss",
-      "iat": Time.now.to_i + 3600,
-      "exp": Time.now.to_i
-    }
-    token = JWT.encode token_layout, "secret", "HS256"
-    response = {
-      "accessToken" => token,
-      "token_type" => "Bearer",
-      "expires_in" => 3600,
-      "expiration" => 1_524_167_011,
-      "refresh_token" => "jy4gl91BQ"
-    }
-    stub_request(:get, "https://hello.world/v1/preauth/validateAuth")
-      .with(
-        headers: {
-          "Authorization" => "Basic aGVsbG86d29ybGQ=",
-          "Connection" => "close",
-          "Host" => "hello.world"
-        }
-      )
-      .to_return(status: 200, body: response.to_json, headers: {})
-    authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
-      username: "hello",
-      password: "world",
-      url: "https://hello.world"
-    )
-    refute_nil(authenticator)
-  end
-
-  # def test_CP4D_disable_ssl
-  #   authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
-  #     username: "username",
-  #     password: "password"
-  #   )
-  #   IBMCloudSdkCore::BaseService.new(
-  #     display_name: "Assistant",
-  #     url: "http://the.com",
-  #     authenticator: authenticator
-  #   )
-  #   stub_request(:get, "http://the.com/music")
-  #     .with(
-  #       headers: {
-  #         "Authorization" => "Basic Og==",
-  #         "Host" => "the.com"
-  #       }
-  #     ).to_return(status: 200, body: {}.to_json, headers: {})
-  #   assert_equal(authenticator.instance_variable_get(:@access_token), "token")
-  # end
 end

data/test/unit/test_configure_http_proxy.rb

@@ -9,11 +9,14 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the configure_http_client customizations, such as proxies and timeouts
 class HTTPConfigTest < Minitest::Test
   def test_proxy_address_port
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -26,11 +29,14 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_proxy_username_password
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -47,11 +53,14 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_proxy_headers
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -68,11 +77,14 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_proxy_username_password_headers
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       proxy: {
         address: "bogus_address.com",
@@ -93,11 +105,14 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_timeout_per_operation
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       timeout: {
         per_operation: {
@@ -120,11 +135,14 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_timeout_global
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(
       timeout: {
         global: 20
@@ -141,11 +159,14 @@ class HTTPConfigTest < Minitest::Test
   end
 
   def test_disable_ssl_verification
-    service = IBMCloudSdkCore::BaseService.new(
-      version: "2018-03-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
     service.configure_http_client(disable_ssl_verification: true)
     refute_nil(service.conn.default_options.ssl_context)
   end

data/test/unit/test_cp4d_authenticator.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require("json")
+require("jwt")
+require_relative("./../test_helper.rb")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/basic_authenticator")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory")
+require("webmock/minitest")
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+# Unit tests for the base service
+class Cp4dAuthenticatorTest < Minitest::Test
+  def test_cp4d_authenticator
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "accessToken" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:get, "https://icp.com/v1/preauth/validateAuth")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Connection" => "close",
+          "Host" => "icp.com",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
+      username: "username",
+      password: "password",
+      url: "https://icp.com",
+      disable_ssl_verification: true
+    )
+    refute_nil(authenticator)
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+  end
+
+  def test_cp4d_authenticator_authenticate
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "accessToken" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:get, "https://icp.com/v1/preauth/validateAuth")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Connection" => "close",
+          "Host" => "icp.com",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
+      username: "username",
+      password: "password",
+      url: "https://icp.com",
+      disable_ssl_verification: true
+    )
+    refute_nil(authenticator)
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+    headers = {}
+    authenticated_headers = { "Authorization" => "Bearer " + token }
+    authenticator.authenticate(headers)
+    assert_equal(headers, authenticated_headers)
+  end
+end

data/test/unit/test_iam_authenticator.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require("json")
+require("jwt")
+require_relative("./../test_helper.rb")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/basic_authenticator")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory")
+require("webmock/minitest")
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+# Unit tests for the base service
+class IamAuthenticatorTest < Minitest::Test
+  def test_iam_authenticator
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "access_token" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
+      .with(
+        body: {
+          "apikey" => "apikey",
+          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
+          "response_type" => "cloud_iam"
+        },
+        headers: {
+          "Connection" => "close",
+          "Host" => "iam.cloud.ibm.com",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      apikey: "apikey"
+    )
+    refute_nil(authenticator)
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+  end
+
+  def test_iam_authenticator_client_id_client_secret
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "access_token" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
+      .with(
+        body: {
+          "apikey" => "apikey",
+          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
+          "response_type" => "cloud_iam"
+        },
+        headers: {
+          "Connection" => "close",
+          "Authorization" => "Basic Yng6Yng=",
+          "Host" => "iam.cloud.ibm.com",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      apikey: "apikey",
+      client_id: "bx",
+      client_secret: "bx"
+    )
+    refute_nil(authenticator)
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+  end
+
+  def test_cp4d_authenticator_authenticate
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "access_token" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
+      .with(
+        body: {
+          "apikey" => "apikey",
+          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
+          "response_type" => "cloud_iam"
+        },
+        headers: {
+          "Connection" => "close",
+          "Host" => "iam.cloud.ibm.com",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+      apikey: "apikey"
+    )
+    refute_nil(authenticator)
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+    headers = {}
+    authenticated_headers = { "Authorization" => "Bearer " + token }
+    authenticator.authenticate(headers)
+    assert_equal(headers, authenticated_headers)
+  end
+end

data/test/unit/test_iam_token_manager.rb

@@ -60,7 +60,6 @@ class IAMTokenManagerTest < Minitest::Test
         body: { "apikey" => "apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Og==",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }

data/test/unit/test_jwt_token_manager.rb

@@ -25,7 +25,6 @@ class JWTTokenManagerTest < Minitest::Test
     stub_request(:get, "https://the.sixth.one")
       .with(
         headers: {
-          "Authorization" => "Basic Og==",
           "Host" => "the.sixth.one"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
@@ -46,7 +45,6 @@ class JWTTokenManagerTest < Minitest::Test
     stub_request(:get, "https://the.sixth.one/")
       .with(
         headers: {
-          "Authorization" => "Basic Og==",
           "Host" => "the.sixth.one"
         }
       ).to_return(status: 500, body: response.to_json, headers: {})
@@ -89,4 +87,55 @@ class JWTTokenManagerTest < Minitest::Test
     token_response = token_manager.send(:token)
     assert_equal(access_token, token_response)
   end
+
+  def test_cp4d_disable_ssl
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "accessToken" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:get, "https://icp.com/v1/preauth/validateAuth")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Connection" => "close",
+          "Host" => "icp.com",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
+      username: "username",
+      password: "password",
+      url: "https://icp.com",
+      disable_ssl_verification: true
+    )
+    IBMCloudSdkCore::BaseService.new(
+      display_name: "Assistant",
+      service_url: "http://the.com",
+      authenticator: authenticator
+    )
+    stub_request(:get, "http://the.com/music")
+      .with(
+        headers: {
+          "Authorization" => "Basic Og==",
+          "Host" => "the.com"
+        }
+      ).to_return(status: 200, body: {}.to_json, headers: {})
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -247,9 +247,11 @@ files:
 - test/test_helper.rb
 - test/unit/test_base_service.rb
 - test/unit/test_configure_http_proxy.rb
+- test/unit/test_cp4d_authenticator.rb
+- test/unit/test_cp4d_token_manager.rb
 - test/unit/test_detailed_response.rb
+- test/unit/test_iam_authenticator.rb
 - test/unit/test_iam_token_manager.rb
-- test/unit/test_icp4d_token_manager.rb
 - test/unit/test_jwt_token_manager.rb
 homepage: https://www.github.com/IBM
 licenses: