Eliminate legacy singular OIDC "default_client" references

Author: soxofaan

openeo/rest/connection.py

@@ -378,8 +378,8 @@ def _get_oidc_provider_and_client_info(
             if client_id:
                 _log.info("Using client_id {c!r} from config (provider {p!r})".format(c=client_id, p=provider_id))
         if client_id is None and default_client_grant_check:
-            # Try "default_client" from backend's provider info.
-            _log.debug("No client_id given: checking default client in backend's provider info")
+            # Try "default_clients" from backend's provider info.
+            _log.debug("No client_id given: checking default clients in backend's provider info")
             client_id = provider.get_default_client_id(grant_check=default_client_grant_check)
             if client_id:
                 _log.info("Using default client_id {c!r} from OIDC provider {p!r} info.".format(

tests/rest/auth/test_oidc.py

@@ -142,11 +142,11 @@ def test_provider_info_default_client_none(requests_mock):
 
 def test_provider_info_default_client_available_list(requests_mock):
     requests_mock.get("https://authit.test/.well-known/openid-configuration", json={})
-    default_client = {
+    default_clients = [{
         "id": "jak4l0v3-45lsdfe3d",
         "grant_types": ["urn:ietf:params:oauth:grant-type:device_code+pkce", "refresh_token"]
-    }
-    info = OidcProviderInfo(issuer="https://authit.test", default_clients=[default_client])
+    }]
+    info = OidcProviderInfo(issuer="https://authit.test", default_clients=default_clients)
 
     # Alias for compactness
     g = DefaultOidcClientGrant
@@ -162,11 +162,11 @@ def test_provider_info_default_client_available_list(requests_mock):
 
 def test_provider_info_default_client_available_lambda(requests_mock):
     requests_mock.get("https://authit.test/.well-known/openid-configuration", json={})
-    default_client = {
+    default_clients = [{
         "id": "jak4l0v3-45lsdfe3d",
         "grant_types": ["urn:ietf:params:oauth:grant-type:device_code+pkce", "refresh_token"]
-    }
-    info = OidcProviderInfo(issuer="https://authit.test", default_clients=[default_client])
+    }]
+    info = OidcProviderInfo(issuer="https://authit.test", default_clients=default_clients)
 
     # Alias for compactness
     g = DefaultOidcClientGrant
@@ -191,11 +191,11 @@ def test_provider_info_default_client_available_lambda(requests_mock):
 
 def test_provider_info_default_client_invalid_grants(requests_mock, caplog):
     requests_mock.get("https://authit.test/.well-known/openid-configuration", json={})
-    default_client = {
+    default_clients = [{
         "id": "jak4l0v3-45lsdfe3d",
         "grant_types": ["refresh_token", "nope dis invalid"]
-    }
-    info = OidcProviderInfo(issuer="https://authit.test", default_clients=[default_client])
+    }]
+    info = OidcProviderInfo(issuer="https://authit.test", default_clients=default_clients)
 
     # Alias for compactness
     g = DefaultOidcClientGrant

tests/rest/test_connection.py

@@ -1107,7 +1107,7 @@ def test_authenticate_oidc_device_flow_pkce_multiple_provider_one_config_no_give
 
 def test_authenticate_oidc_device_flow_pkce_multiple_provider_one_config_no_given_default_client(requests_mock, auth_config):
     """
-    OIDC device flow + default_client + PKCE with multiple OIDC providers, one in config and none specified to use.
+    OIDC device flow + default_clients + PKCE with multiple OIDC providers, one in config and none specified to use.
     """
     requests_mock.get(API_URL, json={"api_version": "1.0.0"})
     default_client_id = "dadefaultklient"