Renew IAM token on 401 status code or cookie expiry

Author: smithsz

src/cloudant/_common_util.py

@@ -425,18 +425,16 @@ def request(self, method, url, **kwargs):  # pylint: disable=W0221
         Overrides ``requests.Session.request`` to renew the IAM cookie
         and then retry the original request (if required).
         """
+        self.cookies.clear_expired_cookies()
+        if self._auto_renew and 'IAMSession' not in self.cookies.keys():
+            self.login()
+
         resp = super(IAMSession, self).request(method, url, **kwargs)
 
         if not self._auto_renew or url in [self._session_url, self._token_url]:
             return resp
 
-        is_expired = any((
-            resp.status_code == 403 and
-            resp.json().get('error') == 'credentials_expired',
-            resp.status_code == 401
-        ))
-
-        if is_expired:
+        if resp.status_code == 401:
             self.login()
             resp = super(IAMSession, self).request(method, url, **kwargs)
 

tests/unit/iam_auth_tests.py

@@ -234,29 +234,6 @@ def test_iam_renew_cookie_on_401_success(self, m_req, m_login):
         self.assertEqual(m_login.call_count, 2)
         self.assertEqual(m_req.call_count, 3)
 
-
-    @mock.patch('cloudant._common_util.IAMSession.login')
-    @mock.patch('cloudant._common_util.ClientSession.request')
-    def test_iam_renew_cookie_on_403(self, m_req, m_login):
-        # mock 200
-        m_response_ok = mock.MagicMock()
-        type(m_response_ok).status_code = mock.PropertyMock(return_value=200)
-        m_response_ok.json.return_value = {'ok': True}
-        # mock 403
-        m_response_bad = mock.MagicMock()
-        type(m_response_bad).status_code = mock.PropertyMock(return_value=403)
-        m_response_bad.json.return_value = {'error': 'credentials_expired'}
-
-        m_req.side_effect = [m_response_bad, m_response_ok]
-
-        iam = IAMSession('foo', 'http://127.0.0.1:5984', auto_renew=True)
-        iam.login()
-
-        resp = iam.request('GET', 'http://127.0.0.1:5984/mydb1')
-
-        self.assertEqual(m_login.call_count, 2)
-        self.assertTrue(resp.json()['ok'])
-
     @mock.patch('cloudant._common_util.IAMSession.login')
     @mock.patch('cloudant._common_util.ClientSession.request')
     def test_iam_renew_cookie_on_401_failure(self, m_req, m_login):