ibm_watson 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39527e09ad94eb91baf66ef1539c84bb1189e3f716fe9a331d87b8d3718be34d
-  data.tar.gz: dc8dea01d68683c4b4274b42c7d87e79818423ba9b6cfd643e4734de22136e61
+  metadata.gz: 868d3ceaf3c16cb68e7cdbc3054175208e98bc69d365611ef2f75190bcc277e7
+  data.tar.gz: ce849cfda5a4f67e84b3228fba74b81f16291a9252a9af4803a9284889b1116f
 SHA512:
-  metadata.gz: cff3d3cc8cc96b4be31731ccd030d36f2e4ca519a4952ae53d9f4195a78982e262c443d190fabbca5c515bf4cd2bf225ce4f77c7459fae923e021ddb3aaa1a5f
-  data.tar.gz: e2ca88a6ec674b1b853146cbb01521a61bad2cde784db37172387413ba0722e30df0e3b6690839e06351feba9d14cb4c19ee7b257fbea7ff5b6609c8aea0af6b
+  metadata.gz: 45b17fbfa01f07b1717a751a5df6fcc188aa80d131e98e1bd25647bdeaf5f7519bc05092d63840c71a8386bc3a318dd72e789e920a137ab59e98a93134464035
+  data.tar.gz: b20a075d858ba826389826fa177949686823c6f4329388f7d6a73f45118739105b9de3ebc416735b7f91fb581eb33b5a8c7f5827cdd0fd03dbbec55f93eb1bfd

data/README.md

@@ -341,6 +341,37 @@ thr.join # Wait for the thread to finish before ending the program or running ot
 
 Note: `recognize_with_websocket` has been **deprecated** in favor of **`recognize_using_websocket`**
 
+## IBM Cloud Pak for Data(ICP4D)
+If your service instance is of ICP4D, below are two ways of initializing the assistant service.
+
+#### 1) Supplying the `username`, `password`, `icp4d_url` and `authentication_type`
+
+The SDK will manage the token for the user
+
+```ruby
+  assistant = IBMWatson::AssistantV1.new(
+    version: "<version>",
+    username: "<username>",
+    password: "<password>",
+    url: "<service url>",
+    icp4d_url: "<authentication url>",
+    authentication_type: "icp4d"
+  )
+  assistant.configure_http_client(disable_ssl_verification: true) # MAKE SURE SSL VERIFICATION IS DISABLED
+```
+
+#### 2) Supplying the access token
+
+```ruby
+  assistant = IBMWatson::AssistantV1.new(
+    version: "<version>",
+    url: "<service url>",
+    icp4d_token: "<your managed access token>",
+    authentication_type: "icp4d"
+  )
+  assistant.configure_http_client(disable_ssl_verification: true) # MAKE SURE SSL VERIFICATION IS DISABLED
+```
+
 ## Ruby version
 
 Tested on:

data/lib/ibm_watson/assistant_v1.rb

@@ -69,6 +69,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -81,6 +89,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "conversation"
       super

data/lib/ibm_watson/assistant_v2.rb

@@ -69,6 +69,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -81,6 +89,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "conversation"
       super

data/lib/ibm_watson/compare_comply_v1.rb

@@ -58,6 +58,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -68,6 +76,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "compare-comply"
       super

data/lib/ibm_watson/discovery_v1.rb

@@ -71,6 +71,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -83,6 +91,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "discovery"
       super

data/lib/ibm_watson/language_translator_v3.rb

@@ -71,6 +71,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -83,6 +91,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "language_translator"
       super

data/lib/ibm_watson/natural_language_classifier_v1.rb

@@ -60,6 +60,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -71,6 +79,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "natural_language_classifier"
       super

data/lib/ibm_watson/natural_language_understanding_v1.rb

@@ -75,6 +75,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -87,6 +95,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "natural-language-understanding"
       super

data/lib/ibm_watson/personality_insights_v3.rb

@@ -86,6 +86,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -98,6 +106,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "personality_insights"
       super

data/lib/ibm_watson/speech_to_text_v1.rb

@@ -79,6 +79,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -90,6 +98,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "speech_to_text"
       super

data/lib/ibm_watson/text_to_speech_v1.rb

@@ -73,6 +73,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -84,6 +92,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "text_to_speech"
       super

data/lib/ibm_watson/tone_analyzer_v3.rb

@@ -77,6 +77,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -89,6 +97,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "tone_analyzer"
       super

data/lib/ibm_watson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMWatson
-  VERSION = "0.17.0"
+  VERSION = "0.18.0"
 end

data/lib/ibm_watson/visual_recognition_v3.rb

@@ -59,6 +59,14 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
+    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
+    #   fully managed by the application. Responsibility falls on the application to
+    #   refresh the token, either before it expires or reactively upon receiving a 401
+    #   from the service as any requests made with an expired token will fail.
+    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
+    #   URL must be passed in.
+    # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
+    #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -69,6 +77,9 @@ module IBMWatson
       defaults[:iam_url] = nil
       defaults[:iam_client_id] = nil
       defaults[:iam_client_secret] = nil
+      defaults[:icp4d_access_token] = nil
+      defaults[:icp4d_url] = nil
+      defaults[:authetication_type] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "watson_vision_combined"
       super

data/lib/ibm_watson.rb

@@ -7,6 +7,7 @@ module IBMWatson
   ApiException = IBMCloudSdkCore::ApiException
   DetailedResponse = IBMCloudSdkCore::DetailedResponse
   IAMTokenManager = IBMCloudSdkCore::IAMTokenManager
+  ICP4DTokenManager = IBMCloudSdkCore::ICP4DTokenManager
 
   require_relative("./ibm_watson/personality_insights_v3.rb")
   require_relative("./ibm_watson/tone_analyzer_v3.rb")

data/test/unit/test_language_translator_v3.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require("json")
+require("jwt")
 require_relative("./../test_helper.rb")
 require("webmock/minitest")
 
@@ -8,7 +9,32 @@ WebMock.disable_net_connect!(allow_localhost: true)
 
 # Unit tests for the Language Translator V3 Service
 class LanguageTranslatorV3Test < Minitest::Test
+  def token
+    access_token_layout = {
+      "username" => "dummy",
+      "role" => "Admin",
+      "permissions" => %w[administrator manage_catalog],
+      "sub" => "admin",
+      "iss" => "sss",
+      "aud" => "sss",
+      "uid" => "sss",
+      "iat" => 3600,
+      "exp" => Time.now.to_i
+    }
+
+    access_token = JWT.encode(access_token_layout, "secret", "HS256", "kid": "230498151c214b788dd97f22b85410a5")
+    token_response = {
+      "access_token" => access_token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    token_response
+  end
+
   def test_translate_source_target
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -20,13 +46,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -43,7 +63,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: "{\"text\":\"Hola, cómo estás? €\",\"source\":\"es\",\"target\":\"en\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -57,6 +77,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_translate_model_id
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -68,13 +89,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -95,7 +110,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: "{\"text\":\"Messi is the best ever\",\"model_id\":\"en-es-conversational\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -108,6 +123,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_identify
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -119,13 +135,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -153,7 +163,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         body: "祝你有美好的一天",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Content-Type" => "text/plain",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -165,6 +175,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_list_identifiable_languages
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -176,13 +187,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -221,8 +226,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
-          "Host" => "gateway.watsonplatform.net"
+          "Authorization" => "Bearer " + token_response["access_token"]
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.list_identifiable_languages
@@ -230,6 +234,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_create_model
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -241,13 +246,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -270,7 +269,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -300,6 +299,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_delete_model
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -311,13 +311,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -331,7 +325,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -342,6 +336,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_get_model
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -353,13 +348,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -382,7 +371,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -393,6 +382,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_list_models
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -404,13 +394,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -449,7 +433,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -457,7 +441,8 @@ class LanguageTranslatorV3Test < Minitest::Test
     assert_equal(expected, service_response.result)
   end
 
-  def test_lis_documents
+  def test_list_documents
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -469,13 +454,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -487,7 +466,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -496,6 +475,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_translate_document
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -507,13 +487,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -530,6 +504,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_get_document_status
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -541,13 +516,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -559,7 +528,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -568,6 +537,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_get_translated_document
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -579,13 +549,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -597,7 +561,7 @@ class LanguageTranslatorV3Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })
@@ -606,6 +570,7 @@ class LanguageTranslatorV3Test < Minitest::Test
   end
 
   def test_delete_document
+    token_response = token
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
         body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
@@ -617,13 +582,7 @@ class LanguageTranslatorV3Test < Minitest::Test
         }
       ).to_return(
         status: 200,
-        body: {
-          "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-          "token_type" => "Bearer",
-          "expires_in" => 3600,
-          "expiration" => 1_524_167_011,
-          "refresh_token" => "jy4gl91BQ"
-        }.to_json,
+        body: token_response.to_json,
         headers: {}
       )
     service = IBMWatson::LanguageTranslatorV3.new(
@@ -634,7 +593,7 @@ class LanguageTranslatorV3Test < Minitest::Test
     stub_request(:delete, "https://gateway.watsonplatform.net/language-translator/api/v3/documents/id?version=2018-05-01")
       .with(
         headers: {
-          "Authorization" => "Bearer oAeisG8yqPY7sFR_x66Z15",
+          "Authorization" => "Bearer " + token_response["access_token"],
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: expected.to_json, headers: { "Content-Type" => "application/json" })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Max Nussbaum
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement