ibm_cloud_sdk_core 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ac24e7cd38e3b1bfa169bf354347c35f10f36ebd99c68aac6153d12a5a45c0
-  data.tar.gz: af948abbdfa2ba7081e12c6f49ad401ec95bd1323478ffd6fd7ea21d48fd9205
+  metadata.gz: 24cf43bb93090b3c2cdb627369b7645ca17eadc7262f16fbb18b40e76f1285b2
+  data.tar.gz: 2d8be9a330480c90327a5b52d6d2121476aaaf85ecb5ef3e3574945b4ceb75f1
 SHA512:
-  metadata.gz: da1b2b737e578f293a15595382da13fa7d961e382b76ea919de5d6ae1c2472c585b25ecf3153c6c5a26f6f46b1095fb2c555be323450858e195b902a43e9df88
-  data.tar.gz: 6d3d192c519dcd95b011ded3dc56a81965fe628ef18c3ac1a6036cf3a65e070e2c2f5b8ae73aa9992be84da5cf87eaae944b808571be182437a074b963408a5e
+  metadata.gz: 1294cd526ded8bccfd89556c9450e7111fcff4ae31162a9f4ea5004d6c718ca360a0b6a09a6f83bc1b3910993f8593d76add495736d361b1c876115df5f35ac9
+  data.tar.gz: de99be13ca0a0ce0e0a4d73852bb7c2f25171717bc654e51d7dca70a834f26c1c05a8cac4bf98b2f14f908e0467ad9cd06e8c3799da8e4dbad0c6457e3752189

data/lib/ibm_cloud_sdk_core/authenticators/basic_authenticator.rb

@@ -7,7 +7,7 @@ require_relative("../utils.rb")
 module IBMCloudSdkCore
   # Basic Authenticator
   class BasicAuthenticator < Authenticator
-    attr_accessor :username, :password
+    attr_accessor :username, :password, :authentication_type
     def initialize(vars)
       defaults = {
         username: nil,
@@ -21,8 +21,10 @@ module IBMCloudSdkCore
     end
 
     # Adds the Authorization header, if possible
-    def authenticate(req)
-      req.basic_auth(user: @username, pass: @password)
+    def authenticate(headers)
+      base64_authentication = Base64.strict_encode64("#{@username}:#{@password}")
+      headers["Authorization"] = "Basic #{base64_authentication}"
+      headers
     end
 
     # Checks if all the inputs needed are present

data/lib/ibm_cloud_sdk_core/authenticators/bearer_token_authenticator.rb

@@ -19,8 +19,9 @@ module IBMCloudSdkCore
     end
 
     # Adds the Authorization header, if possible
-    def authenticate(connector)
-      connector.default_options.headers.add("Authorization", "Bearer #{@bearer_token}")
+    def authenticate(headers)
+      headers["Authorization"] = "Bearer #{@bearer_token}"
+      headers
     end
 
     # Checks if all the inputs needed are present

data/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb

@@ -25,9 +25,9 @@ module IBMCloudSdkCore
 
       validate
       @token_manager = CP4DTokenManager.new(
+        url: @url,
         username: @username,
         password: @password,
-        url: @url,
         disable_ssl_verification: @disable_ssl_verification
       )
     end

data/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb

@@ -26,8 +26,9 @@ module IBMCloudSdkCore
       @client_secret = vars[:client_secret]
       @disable_ssl_verification = vars[:disable_ssl_verification]
       @authentication_type = AUTH_TYPE_IAM
+
       validate
-      @token_manager = iam_token_manager(
+      @token_manager = IAMTokenManager.new(
         apikey: @apikey,
         url: @url,
         client_id: @client_id,
@@ -36,8 +37,9 @@ module IBMCloudSdkCore
       )
     end
 
-    def authenticate(connector)
-      connector.default_options.headers.add("Authorization", "Bearer #{@token_manager.access_token}")
+    def authenticate(headers)
+      headers["Authorization"] = "Bearer #{@token_manager.access_token}"
+      headers
     end
 
     def validate
@@ -46,14 +48,11 @@ 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 !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.")
+      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
     end
   end

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -9,6 +9,12 @@ require_relative("./detailed_response.rb")
 require_relative("./api_exception.rb")
 require_relative("./utils.rb")
 require_relative("./authenticators/authenticator")
+require_relative("./authenticators/basic_authenticator")
+require_relative("./authenticators/bearer_token_authenticator")
+require_relative("./authenticators/config_based_authenticator_factory")
+require_relative("./authenticators/iam_authenticator")
+require_relative("./authenticators/cp4d_authenticator")
+require_relative("./authenticators/no_auth_authenticator")
 
 NORMALIZER = lambda do |uri| # Custom URI normalizer when using HTTP Client
   HTTP::URI.parse uri
@@ -37,6 +43,7 @@ module IBMCloudSdkCore
         @url = config[:url] unless config.nil?
       end
 
+      @temp_headers = {}
       @conn = HTTP::Client.new(
         headers: {}
       ).use normalize_uri: { normalizer: NORMALIZER }

data/lib/ibm_cloud_sdk_core/token_managers/cp4d_token_manager.rb

@@ -18,6 +18,11 @@ module IBMCloudSdkCore
       @password = password
       @disable_ssl_verification = disable_ssl_verification
       super(url: url, token_name: TOKEN_NAME)
+      token
+    end
+
+    def access_token
+      @token_info[TOKEN_NAME]
     end
 
     def request_token

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, :user_access_token
+    attr_accessor :token_info, :token_name
     def initialize(
       apikey: nil,
       url: nil,
@@ -25,11 +25,16 @@ module IBMCloudSdkCore
       disable_ssl_verification: nil
     )
       @apikey = apikey
-      @url = url.nil? ? DEFAULT_IAM_URL : url
+      url = DEFAULT_IAM_URL if url.nil?
       @client_id = client_id
       @client_secret = client_secret
       @disable_ssl_verification = disable_ssl_verification
       super(url: url, token_name: TOKEN_NAME)
+      token
+    end
+
+    def access_token
+      @token_info[TOKEN_NAME]
     end
 
     private

data/lib/ibm_cloud_sdk_core/token_managers/jwt_token_manager.rb

@@ -35,10 +35,6 @@ module IBMCloudSdkCore
       end
     end
 
-    def access_token
-      @token_info[@token_name]
-    end
-
     def ssl_verification(disable_ssl_verification)
       @disable_ssl_verification = disable_ssl_verification
     end

data/lib/ibm_cloud_sdk_core/version.rb

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

data/test/unit/test_base_service.rb

@@ -179,10 +179,38 @@ class BaseServiceTest < Minitest::Test
   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: "hello.world"
+      url: "https://hello.world"
     )
     refute_nil(authenticator)
   end

data/test/unit/test_iam_token_manager.rb

@@ -8,21 +8,26 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the IAM Token Manager
 class IAMTokenManagerTest < Minitest::Test
   def test_request_token
+    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" => "oAeisG8yqPY7sFR_x66Z15",
+      "access_token" => token,
       "token_type" => "Bearer",
       "expires_in" => 3600,
       "expiration" => 1_524_167_011,
       "refresh_token" => "jy4gl91BQ"
     }
 
-    # Use default iam_url, client id/secret
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      apikey: "apikey",
-      url: "https://iam.cloud.ibm.com/identity/token",
-      client_id: "bx",
-      client_secret: "bx"
-    )
     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" },
@@ -33,16 +38,19 @@ class IAMTokenManagerTest < Minitest::Test
           "Host" => "iam.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
+    # Use default iam_url, client id/secret
+    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
+      apikey: "apikey",
+      url: "https://iam.cloud.ibm.com/identity/token",
+      client_id: "bx",
+      client_secret: "bx"
+    )
     token_response = token_manager.send(:request_token)
     assert_equal(response, token_response)
   end
 
   def test_request_token_fails
     iam_url = "https://iam.cloud.ibm.com/identity/token"
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      apikey: "apikey",
-      url: iam_url
-    )
     response = {
       "code" => "500",
       "error" => "Oh no"
@@ -58,17 +66,14 @@ class IAMTokenManagerTest < Minitest::Test
         }
       ).to_return(status: 500, body: response.to_json, headers: {})
     assert_raises do
-      token_manager.send(:request_token)
+      IBMCloudSdkCore::IAMTokenManager.new(
+        apikey: "apikey",
+        url: iam_url
+      )
     end
   end
 
   def test_request_token_fails_catch_exception
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      apikey: "apikey",
-      url: "https://iam.cloud.ibm.com/identity/token",
-      client_id: "bx",
-      client_secret: "bx"
-    )
     response = {
       "code" => "500",
       "error" => "Oh no"
@@ -84,38 +89,18 @@ class IAMTokenManagerTest < Minitest::Test
         }
       ).to_return(status: 401, body: response.to_json, headers: {})
     begin
-      token_manager.send(:request_token)
+      IBMCloudSdkCore::IAMTokenManager.new(
+        apikey: "apikey",
+        url: "https://iam.cloud.ibm.com/identity/token",
+        client_id: "bx",
+        client_secret: "bx"
+      )
     rescue IBMCloudSdkCore::ApiException => e
       assert(e.to_s.instance_of?(String))
     end
   end
 
-  def test_is_token_expired
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      apikey: "apikey",
-      url: "https://url.com",
-      client_id: "bx",
-      client_secret: "bx"
-    )
-
-    assert(token_manager.send(:token_expired?))
-    token_manager.instance_variable_set(:@time_to_live, 3600)
-    token_manager.instance_variable_set(:@expire_time, Time.now.to_i + 6000)
-    refute(token_manager.send(:token_expired?))
-    token_manager.instance_variable_set(:@time_to_live, 3600)
-    token_manager.instance_variable_set(:@expire_time, Time.now.to_i - 3600)
-    assert(token_manager.send(:token_expired?))
-  end
-
   def test_get_token
-    iam_url = "https://iam.cloud.ibm.com/identity/token"
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      apikey: "apikey",
-      url: iam_url,
-      client_id: "bx",
-      client_secret: "bx"
-    )
-
     access_token_layout = {
       "username" => "dummy",
       "role" => "Admin",
@@ -148,8 +133,14 @@ class IAMTokenManagerTest < Minitest::Test
           "Host" => "iam.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
-    token = token_manager.token
-    assert_equal(access_token, token)
+    iam_url = "https://iam.cloud.ibm.com/identity/token"
+    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
+      apikey: "apikey",
+      url: iam_url,
+      client_id: "bx",
+      client_secret: "bx"
+    )
+    assert_equal(token_manager.access_token, access_token)
   end
 
   def test_client_id_only

data/test/unit/test_icp4d_token_manager.rb

@@ -8,19 +8,25 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the CP4D Token Manager
 class CP4DTokenManagerTest < Minitest::Test
   def test_request_token
+    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" => "oAeisG8yqPY7sFR_x66Z15",
+      "accessToken" => token,
       "token_type" => "Bearer",
       "expires_in" => 3600,
       "expiration" => 1_524_167_011,
       "refresh_token" => "jy4gl91BQ"
     }
-
-    token_manager = IBMCloudSdkCore::CP4DTokenManager.new(
-      url: "https://the.sixth.one",
-      username: "you",
-      password: "me"
-    )
     stub_request(:get, "https://the.sixth.one/v1/preauth/validateAuth")
       .with(
         headers: {
@@ -28,16 +34,17 @@ class CP4DTokenManagerTest < Minitest::Test
           "Host" => "the.sixth.one"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager.send(:request_token)
-    assert_equal(response, token_response)
-  end
 
-  def test_request_token_fails
     token_manager = IBMCloudSdkCore::CP4DTokenManager.new(
       url: "https://the.sixth.one",
       username: "you",
       password: "me"
     )
+    token_response = token_manager.send(:request_token)
+    assert_equal(response, token_response)
+  end
+
+  def test_request_token_fails
     response = {
       "code" => "500",
       "error" => "Oh no"
@@ -50,7 +57,11 @@ class CP4DTokenManagerTest < Minitest::Test
         }
       ).to_return(status: 500, body: response.to_json, headers: {})
     begin
-      token_manager.send(:request_token)
+      IBMCloudSdkCore::CP4DTokenManager.new(
+        url: "https://the.sixth.one",
+        username: "you",
+        password: "me"
+      )
     rescue IBMCloudSdkCore::ApiException => e
       assert(e.to_s.instance_of?(String))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby