[Async] apply #2210 to async code

Author: sfc-gh-pczajka

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

@@ -13,12 +13,7 @@
 from typing import TYPE_CHECKING, Any, Callable
 
 from ...auth import Auth as AuthSync
-from ...auth._auth import (
-    AUTHENTICATION_REQUEST_KEY_WHITELIST,
-    ID_TOKEN,
-    MFA_TOKEN,
-    delete_temporary_credential,
-)
+from ...auth._auth import AUTHENTICATION_REQUEST_KEY_WHITELIST
 from ...compat import urlencode
 from ...constants import (
     HTTP_HEADER_ACCEPT,
@@ -43,6 +38,7 @@
     ReauthenticationRequest,
 )
 from ...sqlstate import SQLSTATE_CONNECTION_WAS_NOT_ESTABLISHED
+from ...token_cache import TokenType
 from ._no_auth import AuthNoAuth
 
 if TYPE_CHECKING:
@@ -280,7 +276,9 @@ async def post_request_wrapper(self, url, headers, body) -> None:
                 # clear stored id_token if failed to connect because of id_token
                 # raise an exception for reauth without id_token
                 self._rest.id_token = None
-                delete_temporary_credential(self._rest._host, user, ID_TOKEN)
+                self.delete_temporary_credential(
+                    self._rest._host, user, TokenType.ID_TOKEN
+                )
                 raise ReauthenticationRequest(
                     ProgrammingError(
                         msg=ret["message"],
@@ -301,7 +299,9 @@ async def post_request_wrapper(self, url, headers, body) -> None:
             from . import AuthByUsrPwdMfa
 
             if isinstance(auth_instance, AuthByUsrPwdMfa):
-                delete_temporary_credential(self._rest._host, user, MFA_TOKEN)
+                self.delete_temporary_credential(
+                    self._rest._host, user, TokenType.MFA_TOKEN
+                )
             Error.errorhandler_wrapper(
                 self._rest._connection,
                 None,

test/integ/aio/sso/test_unit_mfa_cache_async.py

@@ -23,21 +23,9 @@
     IS_LINUX = platform.system() == "Linux"
     IS_WINDOWS = platform.system() == "Windows"
 
-try:
-    import keyring  # noqa
-
-    from snowflake.connector.auth._auth import delete_temporary_credential
-except ImportError:
-    delete_temporary_credential = None
-
-MFA_TOKEN = "MFATOKEN"
-
 
 # Although this is an unit test, we put it under test/integ/sso, since it needs keyring package installed
-@pytest.mark.skipif(
-    delete_temporary_credential is None,
-    reason="delete_temporary_credential is not available.",
-)
+@pytest.mark.skipolddriver
 @patch("snowflake.connector.aio._network.SnowflakeRestful._post_request")
 async def test_mfa_cache(mockSnowflakeRestfulPostRequest):
     """Connects with (username, pwd, mfa) mock."""
@@ -134,8 +122,10 @@ def mock_get_password(system, user):
     mockSnowflakeRestfulPostRequest.side_effect = mock_post_request
 
     async def test_body(conn_cfg):
-        delete_temporary_credential(
-            host=conn_cfg["host"], user=conn_cfg["user"], cred_type=MFA_TOKEN
+        from snowflake.connector.token_cache import TokenCache, TokenKey, TokenType
+
+        TokenCache.make().remove(
+            TokenKey(conn_cfg["host"], conn_cfg["user"], TokenType.MFA_TOKEN)
         )
 
         # first connection, no mfa token cache