issue #254 Clear cache when authenticate

Author: ElienVandermaesenVITO

openeo/rest/connection.py

@@ -402,6 +402,7 @@ def authenticate_basic(self, username: Optional[str] = None, password: Optional[
             if username is None:
                 raise OpenEoClientException("No username/password given or found.")
 
+        self._capabilities_cache.clear()
         resp = self.get(
             '/credentials/basic',
             # /credentials/basic is the only endpoint that expects a Basic HTTP auth
@@ -470,6 +471,7 @@ def _get_oidc_provider(
                     f"No OIDC provider given. Using first provider {provider_id!r} as advertised by backend."
                 )
 
+        self._capabilities_cache.clear()
         provider_info = OidcProviderInfo.from_dict(provider) if parse_info else None
 
         return provider_id, provider_info

openeo/util.py

@@ -476,6 +476,9 @@ def get(self, key: Union[str, tuple], load: Callable[[], Any]):
             self._cache[key] = load()
         return self._cache[key]
 
+    def clear(self):
+        self._cache = {}
+
 
 def str_truncate(text: str, width: int = 64, ellipsis: str = "...") -> str:
     """Shorten a string (with an ellipsis) if it is longer than certain length."""

tests/rest/test_connection.py

@@ -513,6 +513,39 @@ def test_capabilities_caching(requests_mock):
     assert con.capabilities().api_version() == "1.0.0"
     assert m.call_count == 1
 
+def test_capabilities_caching_after_authenticate_basic(requests_mock):
+    user, pwd = "john262", "J0hndo3"
+    requests_mock.get(API_URL, json={"api_version": "1.0.0", "endpoints": BASIC_ENDPOINTS})
+    requests_mock.get(API_URL + 'credentials/basic', text=_credentials_basic_handler(user, pwd))
+
+    with mock.patch('openeo.rest.connection.AuthConfig') as AuthConfig:
+        conn = Connection(API_URL)
+        conn._capabilities_cache._cache={"test":"test1"}
+        assert conn._capabilities_cache._cache != {}
+        AuthConfig.return_value.get_basic_auth.return_value = (user, pwd)
+        conn.authenticate_basic(user, pwd)
+        assert conn._capabilities_cache._cache == {}
+
+
+def test_capabilities_caching_after_authenticate_oidc(requests_mock):
+    requests_mock.get(API_URL, json={"api_version": "1.0.0"})
+    client_id = "myclient"
+    requests_mock.get(API_URL + 'credentials/oidc', json={
+        "providers": [{"id": "fauth", "issuer": "https://fauth.test", "title": "Foo Auth", "scopes": ["openid", "im"]}]
+    })
+    oidc_mock = OidcMock(
+        requests_mock=requests_mock,
+        expected_grant_type="authorization_code",
+        expected_client_id=client_id,
+        expected_fields={"scope": "im openid"},
+        oidc_issuer="https://fauth.test",
+        scopes_supported=["openid", "im"],
+    )
+    conn = Connection(API_URL)
+    conn._capabilities_cache._cache = {"test": "test1"}
+    conn.authenticate_oidc_authorization_code(client_id=client_id, webbrowser_open=oidc_mock.webbrowser_open)
+    assert conn._capabilities_cache._cache == {}
+
 
 def test_file_formats(requests_mock):
     requests_mock.get("https://oeo.test/", json={"api_version": "1.0.0"})