[async] apply #2417

Author: sfc-gh-pczajka

src/snowflake/connector/aio/_connection.py

@@ -348,12 +348,6 @@ async def __open_connection(self):
                         host=self.host, port=self.port
                     ),
                     scope=self._oauth_scope,
-                    token_cache=(
-                        auth.get_token_cache()
-                        if self._client_store_temporary_credential
-                        else None
-                    ),
-                    refresh_token_enabled=self._oauth_enable_refresh_tokens,
                     connection=self,
                 )
             elif self._authenticator == PROGRAMMATIC_ACCESS_TOKEN:

src/snowflake/connector/aio/auth/_oauth_credentials.py

@@ -8,7 +8,6 @@
 from ...auth.oauth_credentials import (
     AuthByOauthCredentials as AuthByOauthCredentialsSync,
 )
-from ...token_cache import TokenCache
 from ._by_plugin import AuthByPlugin as AuthByPluginAsync
 
 if TYPE_CHECKING:
@@ -27,8 +26,6 @@ def __init__(
         client_secret: str,
         token_request_url: str,
         scope: str,
-        token_cache: TokenCache | None = None,
-        refresh_token_enabled: bool = False,
         connection: SnowflakeConnection | None = None,
         **kwargs,
     ) -> None:
@@ -43,8 +40,6 @@ def __init__(
             client_secret=client_secret,
             token_request_url=token_request_url,
             scope=scope,
-            token_cache=token_cache,
-            refresh_token_enabled=refresh_token_enabled,
             connection=connection,
             **kwargs,
         )

test/unit/aio/test_auth_oauth_credentials_async.py

@@ -21,7 +21,6 @@ async def test_auth_oauth_credentials():
         client_secret="test_client_secret",
         token_request_url="https://example.com/token",
         scope="session:role:test_role",
-        refresh_token_enabled=False,
     )
 
     body = {"data": {}}

test/unit/aio/test_oauth_token_async.py

@@ -577,6 +577,7 @@ async def test_client_creds_successful_flow_async(
     wiremock_client: WiremockClient,
     wiremock_oauth_client_creds_dir,
     wiremock_generic_mappings_dir,
+    temp_cache_async,
 ) -> None:
     wiremock_client.import_mapping(
         wiremock_oauth_client_creds_dir / "successful_flow.json"
@@ -587,6 +588,15 @@ async def test_client_creds_successful_flow_async(
     wiremock_client.add_mapping(
         wiremock_generic_mappings_dir / "snowflake_disconnect_successful.json"
     )
+    user = "testUser"
+    access_token_key = TokenKey(
+        user, wiremock_client.wiremock_host, TokenType.OAUTH_ACCESS_TOKEN
+    )
+    refresh_token_key = TokenKey(
+        user, wiremock_client.wiremock_host, TokenType.OAUTH_REFRESH_TOKEN
+    )
+    temp_cache_async.store(access_token_key, "unused-access-token-123")
+    temp_cache_async.store(refresh_token_key, "unused-refresh-token-123")
     with mock.patch("secrets.token_urlsafe", return_value="abc123"):
         cnx = SnowflakeConnection(
             user="testUser",
@@ -599,10 +609,17 @@ async def test_client_creds_successful_flow_async(
             oauth_token_request_url=f"http://{wiremock_client.wiremock_host}:{wiremock_client.wiremock_http_port}/oauth/token-request",
             host=wiremock_client.wiremock_host,
             port=wiremock_client.wiremock_http_port,
+            oauth_enable_refresh_tokens=True,
+            client_store_temporary_credential=True,
         )
 
         await cnx.connect()
         await cnx.close()
+    # cached tokens are expected not to change since Client Credentials must not use token cache
+    cached_access_token = temp_cache_async.retrieve(access_token_key)
+    cached_refresh_token = temp_cache_async.retrieve(refresh_token_key)
+    assert cached_access_token == "unused-access-token-123"
+    assert cached_refresh_token == "unused-refresh-token-123"
 
 
 @pytest.mark.skipolddriver
@@ -643,57 +660,6 @@ async def test_client_creds_token_request_error_async(
         )
 
 
-@pytest.mark.skipolddriver
-async def test_client_creds_successful_refresh_token_flow_async(
-    wiremock_client: WiremockClient,
-    wiremock_oauth_refresh_token_dir,
-    wiremock_generic_mappings_dir,
-    temp_cache_async,
-) -> None:
-    wiremock_client.import_mapping(
-        wiremock_generic_mappings_dir / "snowflake_login_failed.json"
-    )
-    wiremock_client.add_mapping(
-        wiremock_oauth_refresh_token_dir / "refresh_successful.json"
-    )
-    wiremock_client.add_mapping(
-        wiremock_generic_mappings_dir / "snowflake_login_successful.json"
-    )
-    wiremock_client.add_mapping(
-        wiremock_generic_mappings_dir / "snowflake_disconnect_successful.json"
-    )
-    user = "testUser"
-    access_token_key = TokenKey(
-        user, wiremock_client.wiremock_host, TokenType.OAUTH_ACCESS_TOKEN
-    )
-    refresh_token_key = TokenKey(
-        user, wiremock_client.wiremock_host, TokenType.OAUTH_REFRESH_TOKEN
-    )
-    temp_cache_async.store(access_token_key, "expired-access-token-123")
-    temp_cache_async.store(refresh_token_key, "refresh-token-123")
-    cnx = SnowflakeConnection(
-        user=user,
-        authenticator="OAUTH_CLIENT_CREDENTIALS",
-        oauth_client_id="123",
-        account="testAccount",
-        protocol="http",
-        role="ANALYST",
-        oauth_client_secret="testClientSecret",
-        oauth_token_request_url=f"http://{wiremock_client.wiremock_host}:{wiremock_client.wiremock_http_port}/oauth/token-request",
-        host=wiremock_client.wiremock_host,
-        port=wiremock_client.wiremock_http_port,
-        oauth_enable_refresh_tokens=True,
-        client_store_temporary_credential=True,
-    )
-    await cnx.connect()
-    await cnx.close()
-
-    new_access_token = temp_cache_async.retrieve(access_token_key)
-    new_refresh_token = temp_cache_async.retrieve(refresh_token_key)
-    assert new_access_token == "access-token-123"
-    assert new_refresh_token == "refresh-token-123"
-
-
 @pytest.mark.skipolddriver
 async def test_client_creds_expired_refresh_token_flow_async(
     wiremock_client: WiremockClient,
@@ -744,8 +710,8 @@ async def test_client_creds_expired_refresh_token_flow_async(
     )
     await cnx.connect()
     await cnx.close()
-
-    new_access_token = temp_cache_async.retrieve(access_token_key)
-    new_refresh_token = temp_cache_async.retrieve(refresh_token_key)
-    assert new_access_token == "access-token-123"
-    assert new_refresh_token == "refresh-token-123"
+    # the cache state is expected not to change, since Client Credentials must not use token caching
+    cached_access_token = temp_cache_async.retrieve(access_token_key)
+    cached_refresh_token = temp_cache_async.retrieve(refresh_token_key)
+    assert cached_access_token == "expired-access-token-123"
+    assert cached_refresh_token == "expired-refresh-token-123"