[async] Applied #2509 to async code

Author: sfc-gh-fpawlowski

src/snowflake/connector/aio/_connection.py

@@ -374,6 +374,7 @@ async def __open_connection(self):
                     ),
                     scope=self._oauth_scope,
                     connection=self,
+                    credentials_in_body=self._oauth_credentials_in_body,
                 )
             elif self._authenticator == PROGRAMMATIC_ACCESS_TOKEN:
                 self.auth_class = AuthByPAT(self._token)

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

@@ -27,6 +27,7 @@ def __init__(
         token_request_url: str,
         scope: str,
         connection: SnowflakeConnection | None = None,
+        credentials_in_body: bool = False,
         **kwargs,
     ) -> None:
         """Initializes an instance with OAuth client credentials parameters."""
@@ -41,6 +42,7 @@ def __init__(
             token_request_url=token_request_url,
             scope=scope,
             connection=connection,
+            credentials_in_body=credentials_in_body,
             **kwargs,
         )
 

test/unit/aio/test_auth_oauth_credentials_async.py

@@ -28,10 +28,15 @@ async def test_auth_oauth_credentials_oauth_type():
 
 
 @pytest.mark.parametrize(
-    "authenticator", ["OAUTH_CLIENT_CREDENTIALS", "oauth_client_credentials"]
+    "authenticator, oauth_credentials_in_body",
+    [
+        ("OAUTH_CLIENT_CREDENTIALS", True),
+        ("oauth_client_credentials", False),
+        ("Oauth_Client_Credentials", None),
+    ],
 )
 async def test_oauth_client_credentials_authenticator_is_case_insensitive(
-    monkeypatch, authenticator
+    monkeypatch, authenticator, oauth_credentials_in_body
 ):
     """Test that OAuth client credentials authenticator is case insensitive."""
     import snowflake.connector.aio
@@ -55,35 +60,62 @@ async def mock_post_request(self, url, headers, json_body, **kwargs):
     )
 
     # Mock the OAuth client credentials token request to avoid making HTTP requests
-    # Note: We need to mock _request_tokens which is called by the sync prepare() method
-    def mock_request_tokens(self, **kwargs):
-        # Simulate successful token retrieval
-        # Return a tuple directly (not a coroutine) since it's called from sync code
+    def mock_get_request_token_response(self, connection, fields):
+        # Return fields to verify they are set correctly in tests
         return (
-            "mock_access_token",
-            None,  # Client credentials doesn't use refresh tokens
+            str(fields),
+            None,
         )
 
     monkeypatch.setattr(
         AuthByOauthCredentials,
-        "_request_tokens",
-        mock_request_tokens,
+        "_get_request_token_response",
+        mock_get_request_token_response,
     )
 
+    oauth_credentials_in_body_arg = (
+        {"oauth_credentials_in_body": oauth_credentials_in_body}
+        if oauth_credentials_in_body is not None
+        else {}
+    )
     # Create connection with OAuth client credentials authenticator
     conn = snowflake.connector.aio.SnowflakeConnection(
         user="testuser",
         account="testaccount",
         authenticator=authenticator,
         oauth_client_id="test_client_id",
         oauth_client_secret="test_client_secret",
+        **oauth_credentials_in_body_arg,
     )
 
     await conn.connect()
 
     # Verify that the auth_class is an instance of AuthByOauthCredentials
     assert isinstance(conn.auth_class, AuthByOauthCredentials)
 
+    # Verify that the credentials_in_body attribute is set correctly
+    expected_credentials_in_body = (
+        oauth_credentials_in_body if oauth_credentials_in_body is not None else False
+    )
+    assert conn.auth_class._credentials_in_body is expected_credentials_in_body
+
+    str_fields, _ = conn.auth_class._request_tokens(
+        conn=conn,
+        authenticator=authenticator,
+        account="<unused-acount>",
+        user="<unused-user>",
+        service_name=None,
+    )
+    credential_fields = (
+        ", 'client_id': 'test_client_id', 'client_secret': 'test_client_secret'"
+        if expected_credentials_in_body
+        else ""
+    )
+    assert (
+        str_fields
+        == "{'grant_type': 'client_credentials', 'scope': ''" + credential_fields + "}"
+    )
+
     await conn.close()