fix: split token manager url path

IBM · Mar 5, 2021 · 18d64b5 · 18d64b5
1 parent 818f097
commit 18d64b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ibm_cloud_sdk_core/iam_token_manager.py b/ibm_cloud_sdk_core/iam_token_manager.py
@@ -79,11 +79,11 @@ def __init__(self,
                  proxies: Optional[Dict[str, str]] = None,
                  scope: Optional[str] = None) -> None:
         self.apikey = apikey
+        if not url:
+            url = self.DEFAULT_IAM_URL
+        if url.endswith(self.OPERATION_PATH):
+            url = url[:-len(self.OPERATION_PATH)]
         self.url = url
-        if url == "":
-            self.url = self.DEFAULT_IAM_URL
-        elif url.endswith(self.OPERATION_PATH):
-            self.url = url[:-len(self.OPERATION_PATH)]
         self.client_id = client_id
         self.client_secret = client_secret
         self.headers = headers
@@ -125,7 +125,7 @@ def request_token(self) -> dict:
 
         response = self._request(
             method='POST',
-            url=self.url + self.OPERATION_PATH,
+            url=(self.url + self.OPERATION_PATH) if self.url else self.url,
             headers=headers,
             data=data,
             auth_tuple=auth_tuple,

diff --git a/test/test_iam_authenticator.py b/test/test_iam_authenticator.py
@@ -11,7 +11,7 @@
 def test_iam_authenticator():
     authenticator = IAMAuthenticator(apikey='my_apikey')
     assert authenticator is not None
-    assert authenticator.token_manager.url == 'https://iam.cloud.ibm.com/identity/token'
+    assert authenticator.token_manager.url == 'https://iam.cloud.ibm.com'
     assert authenticator.token_manager.client_id is None
     assert authenticator.token_manager.client_secret is None
     assert authenticator.token_manager.disable_ssl_verification is False