Merge pull request #192 from cloudfoundry-community/fixes/crashed-login

Use new version of oauth client

Author: antechrestos

requirements.txt

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

test/test_client.py

@@ -60,15 +60,8 @@ 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",
-                    client_id="cf",
-                ),
-                headers=dict(Accept="application/json"),
+                data=dict(grant_type="password", username="somebody", scope="", password="p@s$w0rd", token_format="opaque"),
+                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
                 proxies=dict(http="", https=""),
                 verify=True,
             )
@@ -91,10 +84,8 @@ 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", client_id="cf"
-                ),
-                headers=dict(Accept="application/json"),
+                data=dict(grant_type="refresh_token", scope="", refresh_token="refresh-token", token_format="opaque"),
+                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
                 proxies=dict(http="", https=""),
                 verify=True,
             )
@@ -121,8 +112,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", client_id="cf"),
-                headers=dict(Accept="application/json"),
+                data=dict(grant_type="refresh_token", scope="", refresh_token="refresh-token"),
+                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
                 proxies=proxy,
                 verify=True,
             )
@@ -153,9 +144,8 @@ 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"),
+                headers=dict(Accept="application/json", Authorization="Basic Y2Y6"),
                 proxies=dict(http="", https=""),
                 verify=True,
             )