ibm_cloud_sdk_core 0.3.3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 108f15377b95818aea27fab08b01f262b75612b8d3c5f88a0550599b03d339ee
-  data.tar.gz: 4a41816b4102adb84696cd640c137f9b5b793c646255f5b47c35ee9737bf6df6
+  metadata.gz: 83ac24e7cd38e3b1bfa169bf354347c35f10f36ebd99c68aac6153d12a5a45c0
+  data.tar.gz: af948abbdfa2ba7081e12c6f49ad401ec95bd1323478ffd6fd7ea21d48fd9205
 SHA512:
-  metadata.gz: 2fe5a66306d17e5dccf8696a785c34a2372bae8bc10d9e55999497226a8a1b898c68aa2fae910f7a88a6e55f4e3dcdbbc944b9a9ae6ed23d1f85b72fc0bb55b9
-  data.tar.gz: df65ed052783a7024274de70fd2a939a3e03b0346283eab6dd96a500a9f1d793cce54a19d780813771bd715037e2c8328e386f3f40c414b6d6b35d59ddf72368
+  metadata.gz: da1b2b737e578f293a15595382da13fa7d961e382b76ea919de5d6ae1c2472c585b25ecf3153c6c5a26f6f46b1095fb2c555be323450858e195b902a43e9df88
+  data.tar.gz: 6d3d192c519dcd95b011ded3dc56a81965fe628ef18c3ac1a6036cf3a65e070e2c2f5b8ae73aa9992be84da5cf87eaae944b808571be182437a074b963408a5e

data/lib/ibm_cloud_sdk_core/authenticators/authenticator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require("json")
+
+module IBMCloudSdkCore
+  # Authenticator
+  class Authenticator
+    AUTH_TYPE_BASIC = "basic"
+    AUTH_TYPE_BEARER_TOKEN = "bearerToken"
+    AUTH_TYPE_CP4D = "cp4d"
+    AUTH_TYPE_IAM = "iam"
+    AUTH_TYPE_NO_AUTH = "noAuth"
+
+    def authenticate
+      # Adds the Authorization header, if possible
+    end
+
+    def validate
+      # Checks if all the inputs needed are present
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/authenticators/basic_authenticator.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./authenticator.rb")
+require_relative("../utils.rb")
+
+module IBMCloudSdkCore
+  # Basic Authenticator
+  class BasicAuthenticator < Authenticator
+    attr_accessor :username, :password
+    def initialize(vars)
+      defaults = {
+        username: nil,
+        password: nil
+      }
+      vars = defaults.merge(vars)
+      @username = vars[:username]
+      @password = vars[:password]
+      @authentication_type = AUTH_TYPE_BASIC
+      validate
+    end
+
+    # Adds the Authorization header, if possible
+    def authenticate(req)
+      req.basic_auth(user: @username, pass: @password)
+    end
+
+    # Checks if all the inputs needed are present
+    def validate
+      raise ArgumentError.new("The username and password shouldn\'t be None.") if @username.nil? || @password.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)
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/authenticators/bearer_token_authenticator.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./authenticator.rb")
+require_relative("../utils.rb")
+
+module IBMCloudSdkCore
+  # Basic Authenticator
+  class BearerTokenAuthenticator < Authenticator
+    attr_accessor :authentication_type
+    def initialize(vars)
+      defaults = {
+        bearer_token: nil
+      }
+      vars = defaults.merge(vars)
+      @bearer_token = vars[:bearer_token]
+      @authentication_type = AUTH_TYPE_BEARER_TOKEN
+      validate
+    end
+
+    # Adds the Authorization header, if possible
+    def authenticate(connector)
+      connector.default_options.headers.add("Authorization", "Bearer #{@bearer_token}")
+    end
+
+    # Checks if all the inputs needed are present
+    def validate
+      raise ArgumentError.new("The bearer token shouldn\'t be None.") if @bearer_token.nil?
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./authenticator.rb")
+require_relative("./basic_authenticator.rb")
+require_relative("./bearer_token_authenticator.rb")
+require_relative("./cp4d_authenticator.rb")
+require_relative("./iam_authenticator.rb")
+require_relative("./no_auth_authenticator.rb")
+require_relative("../utils.rb")
+
+module IBMCloudSdkCore
+  # Authenticator
+  class ConfigBasedAuthenticatorFactory < Authenticator
+    # Checks the credentials file and VCAP_SERVICES environment variable
+    # :param service_name: The service name
+    # :return: the authenticator
+    def get_authenticator(service_name:)
+      config = get_service_properties(service_name)
+      return construct_authenticator(config) unless config.nil? || config.empty?
+    end
+
+    def construct_authenticator(config)
+      if config[:auth_type].nil?
+        auth_type = "iam"
+      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
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./authenticator.rb")
+require_relative("../token_managers/cp4d_token_manager.rb")
+require_relative("../utils.rb")
+
+module IBMCloudSdkCore
+  # Basic Authenticator
+  class CloudPakForDataAuthenticator < Authenticator
+    attr_accessor :authentication_type
+    def initialize(vars)
+      defaults = {
+        username: nil,
+        password: nil,
+        url: nil,
+        disable_ssl_verification: false
+      }
+      vars = defaults.merge(vars)
+      @username = vars[:username]
+      @password = vars[:password]
+      @url = vars[:url]
+      @disable_ssl_verification = vars[:disable_ssl_verification]
+      @authentication_type = AUTH_TYPE_CP4D
+
+      validate
+      @token_manager = CP4DTokenManager.new(
+        username: @username,
+        password: @password,
+        url: @url,
+        disable_ssl_verification: @disable_ssl_verification
+      )
+    end
+
+    # Adds the Authorization header, if possible
+    def authenticate(connector)
+      connector.default_options.headers.add("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 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)
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./authenticator.rb")
+require_relative("../token_managers/iam_token_manager.rb")
+require_relative("../utils.rb")
+
+module IBMCloudSdkCore
+  # Basic Authenticator
+  class IamAuthenticator < Authenticator
+    DEFAULT_CLIENT_ID = "bx"
+    DEFAULT_CLIENT_SECRET = "bx"
+
+    attr_accessor :authentication_type
+    def initialize(vars)
+      defaults = {
+        url: nil,
+        client_id: nil,
+        client_secret: nil,
+        disable_ssl_verification: nil
+      }
+      vars = defaults.merge(vars)
+      @apikey = vars[:apikey]
+      @url = vars[:url]
+      @client_id = vars[:client_id]
+      @client_secret = vars[:client_secret]
+      @disable_ssl_verification = vars[:disable_ssl_verification]
+      @authentication_type = AUTH_TYPE_IAM
+      validate
+      @token_manager = iam_token_manager(
+        apikey: @apikey,
+        url: @url,
+        client_id: @client_id,
+        client_secret: @client_secret,
+        disable_ssl_verification: @disable_ssl_verification
+      )
+    end
+
+    def authenticate(connector)
+      connector.default_options.headers.add("Authorization", "Bearer #{@token_manager.access_token}")
+    end
+
+    def validate
+      # Adds the Authorization header, if possible
+      raise ArgumentError.new("The apikey shouldn\'t be None.") if @apikey.nil?
+      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 !iam_client_id.nil? && !iam_client_secret.nil?
+        @iam_client_id = iam_client_id
+        @iam_client_secret = iam_client_secret
+      elsif iam_client_id.nil? && iam_client_secret.nil?
+        @iam_client_id = DEFAULT_CLIENT_ID
+        @iam_client_secret = DEFAULT_CLIENT_SECRET
+      else
+        raise ArgumentError.new("Only one of 'iam_client_id' or 'iam_client_secret' were specified, but both parameters should be specified together.")
+      end
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/authenticators/no_auth_authenticator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require("json")
+require_relative("./authenticator.rb")
+
+module IBMCloudSdkCore
+  # Authenticator
+  class NoAuthAuthenticator < Authenticator
+    def initialize
+      @authentication_type = AUTH_TYPE_NO_AUTH
+    end
+
+    def authenticate
+      nil
+    end
+
+    def validate
+      nil
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -4,13 +4,12 @@ require("http")
 require("rbconfig")
 require("stringio")
 require("json")
+require_relative("./version.rb")
 require_relative("./detailed_response.rb")
 require_relative("./api_exception.rb")
-require_relative("./iam_token_manager.rb")
-require_relative("./icp4d_token_manager.rb")
-require_relative("./version.rb")
+require_relative("./utils.rb")
+require_relative("./authenticators/authenticator")
 
-DEFAULT_CREDENTIALS_FILE_NAME = "ibm-credentials.env"
 NORMALIZER = lambda do |uri| # Custom URI normalizer when using HTTP Client
   HTTP::URI.parse uri
 end
@@ -18,143 +17,37 @@ end
 module IBMCloudSdkCore
   # Class for interacting with the API
   class BaseService
-    attr_accessor :password, :url, :username, :display_name
-    attr_reader :conn, :token_manager
+    attr_accessor :display_name
+    attr_reader :conn, :authenticator
     def initialize(vars)
       defaults = {
-        vcap_services_name: nil,
-        use_vcap_services: true,
-        authentication_type: nil,
-        username: nil,
-        password: nil,
-        icp4d_access_token: nil,
-        icp4d_url: nil,
-        iam_apikey: nil,
-        iam_access_token: nil,
-        iam_url: nil,
-        iam_client_id: nil,
-        iam_client_secret: nil,
+        authenticator: nil,
+        disable_ssl_verification: false,
         display_name: nil
       }
       vars = defaults.merge(vars)
       @url = vars[:url]
-      @username = vars[:username]
-      @password = vars[:password]
-      @icp_prefix = vars[:password]&.start_with?("icp-") || vars[:iam_apikey]&.start_with?("icp-") ? true : false
-      @icp4d_access_token = vars[:icp4d_access_token]
-      @icp4d_url = vars[:icp4d_url]
-      @iam_url = vars[:iam_url]
-      @iam_apikey = vars[:iam_apikey]
-      @iam_access_token = vars[:iam_access_token]
-      @token_manager = nil
-      @authentication_type = vars[:authentication_type].downcase unless vars[:authentication_type].nil?
-      @temp_headers = nil
-      @disable_ssl_verification = false
+      @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?
 
-      if vars[:use_vcap_services] && !@username && !@iam_apikey
-        @vcap_service_credentials = load_from_vcap_services(service_name: vars[:vcap_services_name])
-        if !@vcap_service_credentials.nil? && @vcap_service_credentials.instance_of?(Hash)
-          @url = @vcap_service_credentials["url"]
-          @username = @vcap_service_credentials["username"] if @vcap_service_credentials.key?("username")
-          @password = @vcap_service_credentials["password"] if @vcap_service_credentials.key?("password")
-          @iam_apikey = @vcap_service_credentials["iam_apikey"] if @vcap_service_credentials.key?("iam_apikey")
-          @iam_access_token = @vcap_service_credentials["iam_access_token"] if @vcap_service_credentials.key?("iam_access_token")
-          @icp4d_access_token = @vcap_service_credentials["icp4d_access_token"] if @vcap_service_credentials.key?("icp4d_access_token")
-          @icp4d_url = @vcap_service_credentials["icp4d_url"] if @vcap_service_credentials.key?("icp4d_url")
-          @iam_url = @vcap_service_credentials["iam_url"] if @vcap_service_credentials.key?("iam_url")
-          @icp_prefix = @password&.start_with?("icp-") || @iam_apikey&.start_with?("icp-") ? true : false
-        end
-      end
-
-      if @display_name && !@username && !@iam_apikey
-        service_name = @display_name.tr(" ", "_").downcase
-        load_from_credential_file(service_name)
-        @icp_prefix = @password&.start_with?("icp-") || @iam_apikey&.start_with?("icp-") ? true : false
-      end
-
-      if @authentication_type == "iam" || ((!@iam_access_token.nil? || !@iam_apikey.nil?) && !@icp_prefix)
-        iam_token_manager(iam_apikey: @iam_apikey, iam_access_token: @iam_access_token,
-                          iam_url: @iam_url, iam_client_id: @iam_client_id,
-                          iam_client_secret: @iam_client_secret)
-      elsif !@iam_apikey.nil? && @icp_prefix
-        @username = "apikey"
-        @password = vars[:iam_apikey]
-      elsif @authentication_type == "icp4d" || !@icp4d_access_token.nil?
-        icp4d_token_manager(icp4d_access_token: @icp4d_access_token, icp4d_url: @icp4d_url,
-                            username: @username, password: @password)
-      elsif !@username.nil? && !@password.nil?
-        if @username == "apikey" && !@icp_prefix
-          iam_apikey(iam_apikey: @password)
-        else
-          @username = @username
-          @password = @password
-        end
+      if @service_name && !@url
+        config = get_service_properties(@service_name)
+        @url = config[:url] unless config.nil?
       end
 
-      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)
-      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(@iam_apikey)
-      raise ArgumentError.new('The iam access token  shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your iam access token') if check_bad_first_or_last_char(@iam_access_token)
-      raise ArgumentError.new('The icp4d access token  shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your icp4d access token') if check_bad_first_or_last_char(@icp4d_access_token)
-      raise ArgumentError.new('The icp4d url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your icp4d url') if check_bad_first_or_last_char(@icp4d_url)
-
       @conn = HTTP::Client.new(
         headers: {}
       ).use normalize_uri: { normalizer: NORMALIZER }
     end
 
-    # Initiates the credentials based on the credential file
-    def load_from_credential_file(service_name, separator = "=")
-      credential_file_path = ENV["IBM_CREDENTIALS_FILE"]
-
-      # Home directory
-      if credential_file_path.nil?
-        file_path = ENV["HOME"] + "/" + DEFAULT_CREDENTIALS_FILE_NAME
-        credential_file_path = file_path if File.exist?(file_path)
-      end
-
-      # Top-level directory of the project
-      if credential_file_path.nil?
-        file_path = File.join(File.dirname(__FILE__), "/../../" + DEFAULT_CREDENTIALS_FILE_NAME)
-        credential_file_path = file_path if File.exist?(file_path)
-      end
-
-      return if credential_file_path.nil?
-
-      file_contents = File.open(credential_file_path, "r")
-      file_contents.each_line do |line|
-        key_val = line.strip.split(separator)
-        set_credential_based_on_type(service_name, key_val[0].downcase, key_val[1]) if key_val.length == 2
-      end
-    end
-
-    def load_from_vcap_services(service_name:)
-      vcap_services = ENV["VCAP_SERVICES"]
-      unless vcap_services.nil?
-        services = JSON.parse(vcap_services)
-        return services[service_name][0]["credentials"] if services.key?(service_name)
-      end
-      nil
-    end
-
     def add_default_headers(headers: {})
       raise TypeError unless headers.instance_of?(Hash)
 
       headers.each_pair { |k, v| @conn.default_options.headers.add(k, v) }
     end
 
-    def iam_access_token(iam_access_token:)
-      @token_manager = IAMTokenManager.new(iam_access_token: iam_access_token) if @token_manager.nil?
-      @iam_access_token = iam_access_token
-    end
-
-    def iam_apikey(iam_apikey:)
-      @token_manager = IAMTokenManager.new(iam_apikey: iam_apikey) if @token_manager.nil?
-      @iam_apikey = iam_apikey
-    end
-
     # @return [DetailedResponse]
     def request(args)
       defaults = { method: nil, url: nil, accept_json: false, headers: nil, params: nil, json: {}, data: nil }
@@ -172,20 +65,7 @@ module IBMCloudSdkCore
       args.delete_if { |_, v| v.nil? }
       args[:headers].delete("Content-Type") if args.key?(:form) || args[:json].nil?
 
-      if @username == "apikey" && !@icp_prefix
-        iam_apikey(iam_apikey: @password)
-        @username = nil
-      end
-
       conn = @conn
-      if !@iam_apikey.nil? && @icp_prefix
-        conn = @conn.basic_auth(user: "apikey", pass: @iam_apikey)
-      elsif !@token_manager.nil?
-        access_token = @token_manager.token
-        args[:headers]["Authorization"] = "Bearer #{access_token}"
-      elsif !@username.nil? && !@password.nil?
-        conn = @conn.basic_auth(user: @username, pass: @password)
-      end
 
       args[:headers] = args[:headers].merge(@temp_headers) unless @temp_headers.nil?
       @temp_headers = nil unless @temp_headers.nil?
@@ -253,42 +133,6 @@ module IBMCloudSdkCore
 
     private
 
-    def set_credential_based_on_type(service_name, key, value)
-      return unless key.include?(service_name)
-
-      @iam_apikey = value if key.include?("iam_apikey") || key.include?("apikey")
-      @iam_url = value if key.include?("iam_url")
-      @url = value if key.include?("url")
-      @username = value if key.include?("username")
-      @password = value if key.include?("password")
-    end
-
-    def check_bad_first_or_last_char(str)
-      return str.start_with?("{", "\"") || str.end_with?("}", "\"") unless str.nil?
-    end
-
-    def iam_token_manager(iam_apikey: nil, iam_access_token: nil, iam_url: nil,
-                          iam_client_id: nil, iam_client_secret: nil)
-      @iam_apikey = iam_apikey
-      @iam_access_token = iam_access_token
-      @iam_url = iam_url
-      @iam_client_id = iam_client_id
-      @iam_client_secret = iam_client_secret
-      @token_manager =
-        IAMTokenManager.new(iam_apikey: iam_apikey, iam_access_token: iam_access_token,
-                            iam_url: iam_url, iam_client_id: iam_client_id, iam_client_secret: iam_client_secret)
-    end
-
-    def icp4d_token_manager(icp4d_access_token: nil, icp4d_url: nil, username: nil, password: nil)
-      if !@token_manager.nil?
-        @token_manager.access_token(icp4d_access_token)
-      else
-        raise ArgumentError.new("The icp4d_url is mandatory for ICP4D.") if icp4d_url.nil? && icp4d_access_token.nil?
-
-        @token_manager = ICP4DTokenManager.new(url: icp4d_url, access_token: icp4d_access_token, username: username, password: password)
-      end
-    end
-
     def add_timeout(timeout)
       if timeout.key?(:per_operation)
         raise TypeError("per_operation in timeout must be a Hash") unless timeout[:per_operation].instance_of?(Hash)

data/lib/ibm_cloud_sdk_core/{icp4d_token_manager.rb → token_managers/cp4d_token_manager.rb}

@@ -3,20 +3,21 @@
 require("http")
 require("json")
 require("rbconfig")
-require_relative("./version.rb")
+require_relative("./../version.rb")
 require_relative("./jwt_token_manager")
 
 module IBMCloudSdkCore
-  # Class to manage ICP4D Token Authentication
-  class ICP4DTokenManager < JWTTokenManager
+  # Class to manage CP4D Token Authentication
+  class CP4DTokenManager < JWTTokenManager
     TOKEN_NAME = "accessToken"
-    def initialize(url: nil, username: nil, password: nil, access_token: nil)
-      raise ArgumentError.new("The url is mandatory for ICP4D.") if url.nil? && access_token.nil?
+    def initialize(url: nil, username: nil, password: nil, disable_ssl_verification: nil)
+      raise ArgumentError.new("The url is mandatory for CP4D.") if url.nil?
 
       url += "/v1/preauth/validateAuth"
       @username = username
       @password = password
-      super(url: url, user_access_token: access_token, token_name: TOKEN_NAME)
+      @disable_ssl_verification = disable_ssl_verification
+      super(url: url, token_name: TOKEN_NAME)
     end
 
     def request_token

data/lib/ibm_cloud_sdk_core/token_managers/iam_token_manager.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require("http")
+require("json")
+require("rbconfig")
+require_relative("./../version.rb")
+require_relative("./jwt_token_manager")
+
+module IBMCloudSdkCore
+  # Class to manage IAM Token Authentication
+  class IAMTokenManager < JWTTokenManager
+    DEFAULT_IAM_URL = "https://iam.cloud.ibm.com/identity/token"
+    CONTENT_TYPE = "application/x-www-form-urlencoded"
+    ACCEPT = "application/json"
+    REQUEST_TOKEN_GRANT_TYPE = "urn:ibm:params:oauth:grant-type:apikey"
+    REQUEST_TOKEN_RESPONSE_TYPE = "cloud_iam"
+    TOKEN_NAME = "access_token"
+
+    attr_accessor :token_info, :user_access_token
+    def initialize(
+      apikey: nil,
+      url: nil,
+      client_id: nil,
+      client_secret: nil,
+      disable_ssl_verification: nil
+    )
+      @apikey = apikey
+      @url = url.nil? ? DEFAULT_IAM_URL : url
+      @client_id = client_id
+      @client_secret = client_secret
+      @disable_ssl_verification = disable_ssl_verification
+      super(url: url, token_name: TOKEN_NAME)
+    end
+
+    private
+
+    # Request an IAM token using an API key
+    def request_token
+      headers = {
+        "Content-Type" => CONTENT_TYPE,
+        "Accept" => ACCEPT
+      }
+      data = {
+        "grant_type" => REQUEST_TOKEN_GRANT_TYPE,
+        "apikey" => @apikey,
+        "response_type" => REQUEST_TOKEN_RESPONSE_TYPE
+      }
+      # @headers.add
+      response = request(
+        method: "POST",
+        url: @url,
+        headers: headers,
+        data: HTTP::URI.form_encode(data),
+        username: @client_id,
+        password: @client_secret
+      )
+      response
+    end
+  end
+end

data/lib/ibm_cloud_sdk_core/{jwt_token_manager.rb → token_managers/jwt_token_manager.rb}

@@ -4,7 +4,7 @@ require("http")
 require("json")
 require("jwt")
 require("rbconfig")
-require_relative("./version.rb")
+require_relative("./../version.rb")
 
 module IBMCloudSdkCore
   # Class to manage JWT Token Authentication
@@ -19,7 +19,6 @@ module IBMCloudSdkCore
 
       @url = vars[:url]
       @token_info = vars[:token_info]
-      @user_access_token = vars[:access_token]
       @token_name = vars[:token_name]
       @time_to_live = nil
       @expire_time = nil
@@ -27,9 +26,7 @@ module IBMCloudSdkCore
     end
 
     def token
-      if !@user_access_token.nil?
-        @user_access_token
-      elsif @token_info.nil? || token_expired?
+      if @token_info.nil? || token_expired?
         token_info = request_token
         save_token_info(token_info: token_info)
         @token_info[@token_name]
@@ -38,8 +35,8 @@ module IBMCloudSdkCore
       end
     end
 
-    def access_token(access_token)
-      @user_access_token = access_token
+    def access_token
+      @token_info[@token_name]
     end
 
     def ssl_verification(disable_ssl_verification)
@@ -94,7 +91,7 @@ module IBMCloudSdkCore
       end
       return JSON.parse(response.body.to_s) if (200..299).cover?(response.code)
 
-      require_relative("./api_exception.rb")
+      require_relative("./../api_exception.rb")
       raise ApiException.new(response: response)
     end
   end