ibm_cloud_sdk_core 0.3.3 → 1.0.0.rc1

data/test/unit/test_icp4d_token_manager.rb

@@ -5,8 +5,8 @@ require("webmock/minitest")
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
-# Unit tests for the ICP4D Token Manager
-class ICP4DTokenManagerTest < Minitest::Test
+# Unit tests for the CP4D Token Manager
+class CP4DTokenManagerTest < Minitest::Test
   def test_request_token
     response = {
       "access_token" => "oAeisG8yqPY7sFR_x66Z15",
@@ -16,7 +16,7 @@ class ICP4DTokenManagerTest < Minitest::Test
       "refresh_token" => "jy4gl91BQ"
     }
 
-    token_manager = IBMCloudSdkCore::ICP4DTokenManager.new(
+    token_manager = IBMCloudSdkCore::CP4DTokenManager.new(
       url: "https://the.sixth.one",
       username: "you",
       password: "me"
@@ -30,12 +30,10 @@ class ICP4DTokenManagerTest < Minitest::Test
       ).to_return(status: 200, body: response.to_json, headers: {})
     token_response = token_manager.send(:request_token)
     assert_equal(response, token_response)
-    token_manager.access_token("token")
-    assert_equal(token_manager.instance_variable_get(:@user_access_token), "token")
   end
 
   def test_request_token_fails
-    token_manager = IBMCloudSdkCore::ICP4DTokenManager.new(
+    token_manager = IBMCloudSdkCore::CP4DTokenManager.new(
       url: "https://the.sixth.one",
       username: "you",
       password: "me"

data/test/unit/test_jwt_token_manager.rb

@@ -18,7 +18,7 @@ class JWTTokenManagerTest < Minitest::Test
     }
 
     token_manager = IBMCloudSdkCore::JWTTokenManager.new(
-      icp4d_url: "https://the.sixth.one",
+      CP4D_url: "https://the.sixth.one",
       username: "you",
       password: "me"
     )
@@ -31,13 +31,11 @@ class JWTTokenManagerTest < Minitest::Test
       ).to_return(status: 200, body: response.to_json, headers: {})
     token_response = token_manager.send(:request, method: "get", url: "https://the.sixth.one")
     assert_equal(response, token_response)
-    token_manager.access_token("token")
-    assert_equal(token_manager.instance_variable_get(:@user_access_token), "token")
   end
 
   def test_request_token_fails
     token_manager = IBMCloudSdkCore::JWTTokenManager.new(
-      icp4d_url: "https://the.sixth.one",
+      url: "https://the.sixth.one",
       username: "you",
       password: "me"
     )
@@ -59,17 +57,6 @@ class JWTTokenManagerTest < Minitest::Test
     end
   end
 
-  def test_request_token_exists
-    token_manager = IBMCloudSdkCore::JWTTokenManager.new(
-      icp4d_url: "https://the.sixth.one",
-      username: "you",
-      password: "me",
-      access_token: "token"
-    )
-    token_response = token_manager.send(:token)
-    assert_equal("token", token_response)
-  end
-
   def test_request_token_not_expired
     access_token_layout = {
       "username" => "dummy",
@@ -93,7 +80,7 @@ class JWTTokenManagerTest < Minitest::Test
     }
 
     token_manager = IBMCloudSdkCore::JWTTokenManager.new(
-      icp4d_url: "https://the.sixth.one",
+      CP4D_url: "https://the.sixth.one",
       username: "you",
       password: "me",
       token_name: "accessToken"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -229,11 +229,19 @@ files:
 - README.md
 - lib/ibm_cloud_sdk_core.rb
 - lib/ibm_cloud_sdk_core/api_exception.rb
+- lib/ibm_cloud_sdk_core/authenticators/authenticator.rb
+- lib/ibm_cloud_sdk_core/authenticators/basic_authenticator.rb
+- lib/ibm_cloud_sdk_core/authenticators/bearer_token_authenticator.rb
+- lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory.rb
+- lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb
+- lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb
+- lib/ibm_cloud_sdk_core/authenticators/no_auth_authenticator.rb
 - lib/ibm_cloud_sdk_core/base_service.rb
 - lib/ibm_cloud_sdk_core/detailed_response.rb
-- lib/ibm_cloud_sdk_core/iam_token_manager.rb
-- lib/ibm_cloud_sdk_core/icp4d_token_manager.rb
-- lib/ibm_cloud_sdk_core/jwt_token_manager.rb
+- lib/ibm_cloud_sdk_core/token_managers/cp4d_token_manager.rb
+- lib/ibm_cloud_sdk_core/token_managers/iam_token_manager.rb
+- lib/ibm_cloud_sdk_core/token_managers/jwt_token_manager.rb
+- lib/ibm_cloud_sdk_core/utils.rb
 - lib/ibm_cloud_sdk_core/version.rb
 - rakefile
 - test/test_helper.rb
@@ -261,12 +269,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Official IBM Cloud SDK core library

data/lib/ibm_cloud_sdk_core/iam_token_manager.rb

@@ -1,66 +0,0 @@
-# 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"
-    DEFAULT_AUTHORIZATION = "Basic Yng6Yng="
-    DEFAULT_CLIENT_ID = "bx"
-    DEFAULT_CLIENT_SECRET = "bx"
-    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(iam_apikey: nil, iam_access_token: nil, iam_url: nil,
-                   iam_client_id: nil, iam_client_secret: nil)
-      @iam_apikey = iam_apikey
-      @user_access_token = iam_access_token
-      @iam_url = iam_url.nil? ? DEFAULT_IAM_URL : iam_url
-      super(url: iam_url, access_token: iam_access_token, token_name: TOKEN_NAME)
-
-      # 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
-
-    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" => @iam_apikey,
-        "response_type" => REQUEST_TOKEN_RESPONSE_TYPE
-      }
-      response = request(
-        method: "POST",
-        url: @iam_url,
-        headers: headers,
-        data: HTTP::URI.form_encode(data),
-        username: @iam_client_id,
-        password: @iam_client_secret
-      )
-      response
-    end
-  end
-end