feat(iamTokenManager): keep internal methods private and expose method to get token

Author: mamoonraja

lib/ibm_watson/iam_token_manager.rb

@@ -54,7 +54,7 @@ def request(method:, url:, headers: nil, params: nil, data: nil)
   #   2. If this class is managing tokens and does not yet have one, make a request for one
   #   3. If this class is managing tokens and the token has expired refresh it. In case the refresh token is expired, get a new one
   # If this class is managing tokens and has a valid token stored, send it
-  def _token
+  def token
     return @user_access_token unless @user_access_token.nil? || (@user_access_token.respond_to?(:empty?) && @user_access_token.empty?)
     if @token_info.all? { |_k, v| v.nil? }
       token_info = _request_token
@@ -73,6 +73,8 @@ def _token
     end
   end
 
+  private
+
   # Request an IAM token using an API key
   def _request_token
     headers = {
@@ -114,17 +116,6 @@ def _refresh_token
     response
   end
 
-  # Set a self-managed IAM access token.
-  # The access token should be valid and not yet expired.
-  def _access_token(iam_access_token:)
-    @user_access_token = iam_access_token
-  end
-
-  # Set the IAM api key
-  def _iam_apikey(iam_apikey:)
-    @iam_apikey = iam_apikey
-  end
-
   # Check if currently stored token is expired.
   # Using a buffer to prevent the edge case of the
   # token expiring before the request could be made.

test/unit/test_iam_token_manager.rb

@@ -33,7 +33,7 @@ def test_request_token
           "Host" => "iam.bluemix.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager._request_token
+    token_response = token_manager.send(:_request_token)
     assert_equal(response, token_response)
   end
 
@@ -61,7 +61,7 @@ def test_refresh_token
           "Host" => "iam.bluemix.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager._refresh_token
+    token_response = token_manager.send(:_refresh_token)
     assert_equal(response, token_response)
   end
 
@@ -79,9 +79,9 @@ def test_is_token_expired
       "refresh_token" => "jy4gl91BQ"
     }
 
-    refute(token_manager._is_token_expired?)
+    refute(token_manager.send(:_is_token_expired?))
     token_manager.token_info["expiration"] = Time.now.to_i - 3600
-    assert(token_manager._is_token_expired?)
+    assert(token_manager.send(:_is_token_expired?))
   end
 
   def test_is_refresh_token_expired
@@ -98,9 +98,9 @@ def test_is_refresh_token_expired
       "refresh_token" => "jy4gl91BQ"
     }
 
-    refute(token_manager._is_refresh_token_expired?)
+    refute(token_manager.send(:_is_refresh_token_expired?))
     token_manager.token_info["expiration"] = Time.now.to_i - (8 * 24 * 3600)
-    assert(token_manager._is_token_expired?)
+    assert(token_manager.send(:_is_token_expired?))
   end
 
   def test_get_token
@@ -111,7 +111,7 @@ def test_get_token
     )
     token_manager.user_access_token = "user_access_token"
 
-    token = token_manager._token
+    token = token_manager.token
     assert_equal(token_manager.user_access_token, token)
 
     response = {
@@ -132,11 +132,11 @@ def test_get_token
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
     token_manager.user_access_token = ""
-    token = token_manager._token
+    token = token_manager.token
     assert_equal("hellohello", token)
 
     token_manager.token_info["expiration"] = Time.now.to_i - (20 * 24 * 3600)
-    token = token_manager._token
+    token = token_manager.token
     assert_equal("hellohello", token)
 
     stub_request(:post, "https://iam.bluemix.net/identity/token")
@@ -149,7 +149,7 @@ def test_get_token
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
     token_manager.token_info["expiration"] = Time.now.to_i - 4000
-    token = token_manager._token
+    token = token_manager.token
     assert_equal("hellohello", token)
 
     token_manager.token_info = {
@@ -159,7 +159,7 @@ def test_get_token
       "expiration" => Time.now.to_i + 3600,
       "refresh_token" => "jy4gl91BQ"
     }
-    token = token_manager._token
+    token = token_manager.token
     assert_equal("dummy", token)
   end