Merge pull request #352 from cloudant/update-iam-url

Updated default IAM token URL

Author: ricellis

CHANGES.md

@@ -1,5 +1,6 @@
 # 2.8.0 (Unreleased)
 
+- [FIXED] Updated default IBM Cloud Identity and Access Management token URL.
 - [REMOVED] Removed broken source and target parameters that constantly threw `AttributeError` when creating a replication document.
 
 # 2.7.0 (2017-10-31)

docs/getting_started.rst

@@ -100,7 +100,7 @@ Cloud Platform.
 See `IBM Cloud Identity and Access Management <https://console.bluemix.net/docs/services/Cloudant/guides/iam.html#ibm-cloud-identity-and-access-management>`_
 for more information.
 
-The production IAM token service at *https://iam.bluemix.net/oidc/token* is used
+The production IAM token service at *https://iam.bluemix.net/identity/token* is used
 by default. You can set an ``IAM_TOKEN_URL`` environment variable to override
 this.
 

src/cloudant/_client_session.py

@@ -193,7 +193,7 @@ def __init__(self, api_key, server_url, **kwargs):
 
         self._api_key = api_key
         self._token_url = os.environ.get(
-            'IAM_TOKEN_URL', 'https://iam.bluemix.net/oidc/token')
+            'IAM_TOKEN_URL', 'https://iam.bluemix.net/identity/token')
 
     def login(self):
         """

tests/unit/iam_auth_tests.py

@@ -43,7 +43,7 @@
                      '2PTo4Exa17V-R_73Nq8VPCwpOvZcwKRA2sPTVgTMzU34max8b5kpTzVGJ'
                      '6SXSItTVOUdAygZBng')
 
-MOCK_OIDC_TOKEN_RESPONSE = {
+MOCK_IAM_TOKEN_RESPONSE = {
     'access_token':  MOCK_ACCESS_TOKEN,
     'refresh_token': ('MO61FKNvVRWkSa4vmBZqYv_Jt1kkGMUc-XzTcNnR-GnIhVKXHUWxJVV3'
                       'RddE8Kqh3X_TZRmyK8UySIWKxoJ2t6obUSUalPm90SBpTdoXtaljpNyo'
@@ -100,7 +100,7 @@ def test_iam_set_credentials(self):
     @mock.patch('cloudant._client_session.ClientSession.request')
     def test_iam_get_access_token(self, m_req):
         m_response = mock.MagicMock()
-        m_response.json.return_value = MOCK_OIDC_TOKEN_RESPONSE
+        m_response.json.return_value = MOCK_IAM_TOKEN_RESPONSE
         m_req.return_value = m_response
 
         iam = IAMSession(MOCK_API_KEY, 'http://127.0.0.1:5984')