Bump oauth2-client to v1.4.0

-  Adopt tests to not check authorization header

Author: johha

requirements.txt

@@ -1,6 +1,6 @@
 aiohttp>=3.8.0
 protobuf>=3.20.0, < 5.0.0dev
-oauth2-client==1.2.1
+oauth2-client==1.4.0
 websocket-client~=1.3.1
 PyYAML==6.0
 requests>=2.5.0

test/test_client.py

@@ -60,8 +60,15 @@ def test_grant_password_request_with_token_format_opaque(self):
             self.assertEqual("Bearer access-token", session.headers.get("Authorization"))
             requests.post.assert_called_with(
                 requests.post.return_value.url,
-                data=dict(grant_type="password", username="somebody", scope="", password="p@s$w0rd", token_format="opaque"),
-                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
+                data=dict(
+                    grant_type="password",
+                    username="somebody",
+                    scope="",
+                    password="p@s$w0rd",
+                    token_format="opaque",
+                    client_id="cf",
+                ),
+                headers=dict(Accept="application/json"),
                 proxies=dict(http="", https=""),
                 verify=True,
             )
@@ -84,8 +91,10 @@ def test_refresh_request_with_token_format_opaque(self):
             self.assertEqual("Bearer access-token", session.headers.get("Authorization"))
             requests.post.assert_called_with(
                 requests.post.return_value.url,
-                data=dict(grant_type="refresh_token", scope="", refresh_token="refresh-token", token_format="opaque"),
-                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
+                data=dict(
+                    grant_type="refresh_token", scope="", refresh_token="refresh-token", token_format="opaque", client_id="cf"
+                ),
+                headers=dict(Accept="application/json"),
                 proxies=dict(http="", https=""),
                 verify=True,
             )
@@ -112,8 +121,8 @@ def test_refresh_request_with_token_from_cf_config(self):
             self.assertEqual("Bearer access-token", session.headers.get("Authorization"))
             requests.post.assert_called_with(
                 requests.post.return_value.url,
-                data=dict(grant_type="refresh_token", scope="", refresh_token="refresh-token"),
-                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
+                data=dict(grant_type="refresh_token", scope="", refresh_token="refresh-token", client_id="cf"),
+                headers=dict(Accept="application/json"),
                 proxies=proxy,
                 verify=True,
             )
@@ -144,8 +153,9 @@ def test_grant_password_request_with_login_hint(self):
                     scope="",
                     password="p@s$w0rd",
                     login_hint="%7B%22origin%22%3A%22uaa%22%7D",
+                    client_id="cf",
                 ),
-                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
+                headers=dict(Accept="application/json"),
                 proxies=dict(http="", https=""),
                 verify=True,
             )