QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: DB OAuth2 fixes (#37350)

Browse Source
This commit is contained in:
Vitor Avila
2026-01-22 01:51:48 -03:00
committed by GitHub
parent de6ac2a444
commit cc972cad5a
4 changed files with 118 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
tests/unit_tests/models/core_test.py
View File

@@ -660,6 +660,34 @@ def test_get_oauth2_config(app_context: None) -> None:
assert database.get_oauth2_config() is None
database.encrypted_extra = json.dumps(oauth2_client_info)
assert database.get_oauth2_config() == {
"id": "my_client_id",
"secret": "my_client_secret",
"authorization_request_uri": "https://abcd1234.snowflakecomputing.com/oauth/authorize",
"token_request_uri": "https://abcd1234.snowflakecomputing.com/oauth/token-request",
"scope": "refresh_token session:role:USERADMIN",
"redirect_uri": "http://example.com/api/v1/database/oauth2/",
"request_content_type": "data", # Default value from BaseEngineSpec
}
def test_get_oauth2_config_token_request_type_from_db_engine_specs(
mocker: MockerFixture, app_context: None
) -> None:
"""
Test that DB Engine Spec overrides for ``oauth2_token_request_type`` are respected.
"""
database = Database(
database_name="db",
sqlalchemy_uri="postgresql://user:password@host:5432/examples",
)
mocker.patch.object(
database.db_engine_spec,
"oauth2_token_request_type",
"json",
)
database.encrypted_extra = json.dumps(oauth2_client_info)
assert database.get_oauth2_config() == {
"id": "my_client_id",
@@ -672,6 +700,59 @@ def test_get_oauth2_config(app_context: None) -> None:
}
def test_get_oauth2_config_custom_token_request_type_extra(app_context: None) -> None:
"""
Test passing a custom ``token_request_type`` via ``encrypted_extra``
takes precedence.
"""
database = Database(
database_name="db",
sqlalchemy_uri="postgresql://user:password@host:5432/examples",
)
custom_oauth2_client_info = {
"oauth2_client_info": {
**oauth2_client_info["oauth2_client_info"],
"request_content_type": "json",
}
}
database.encrypted_extra = json.dumps(custom_oauth2_client_info)
assert database.get_oauth2_config() == {
"id": "my_client_id",
"secret": "my_client_secret",
"authorization_request_uri": "https://abcd1234.snowflakecomputing.com/oauth/authorize",
"token_request_uri": "https://abcd1234.snowflakecomputing.com/oauth/token-request",
"scope": "refresh_token session:role:USERADMIN",
"redirect_uri": "http://example.com/api/v1/database/oauth2/",
"request_content_type": "json",
}
def test_get_oauth2_config_redirect_uri_from_config(
mocker: MockerFixture,
app_context: None,
) -> None:
"""
Test that ``DATABASE_OAUTH2_REDIRECT_URI`` config takes precedence over
url_for default.
"""
custom_redirect_uri = "https://custom.example.com/oauth/callback"
mocker.patch.dict(
"superset.utils.oauth2.app.config",
{"DATABASE_OAUTH2_REDIRECT_URI": custom_redirect_uri},
)
database = Database(
database_name="db",
sqlalchemy_uri="postgresql://user:password@host:5432/examples",
)
database.encrypted_extra = json.dumps(oauth2_client_info)
config = database.get_oauth2_config()
assert config is not None
assert config["redirect_uri"] == custom_redirect_uri
def test_raw_connection_oauth_engine(mocker: MockerFixture) -> None:
"""
Test that we can start OAuth2 from `raw_connection()` errors.