This is an automated email from the ASF dual-hosted git repository.
beto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new d5c0506faa fix: OAuth2 in async DBs (#29461)
d5c0506faa is described below
commit d5c0506faa3df97601e2003eb3f7bd24a0d41d82
Author: Beto Dealmeida <[email protected]>
AuthorDate: Tue Jul 2 21:12:07 2024 -0400
fix: OAuth2 in async DBs (#29461)
---
superset/sql_lab.py | 35 ++++++++++++++++++-----------------
tests/unit_tests/sql_lab_test.py | 4 ++--
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
index 9712ab47ab..f20bff35c3 100644
--- a/superset/sql_lab.py
+++ b/superset/sql_lab.py
@@ -26,6 +26,7 @@ from typing import Any, cast, Optional, Union
import backoff
import msgpack
from celery.exceptions import SoftTimeLimitExceeded
+from flask import current_app
from flask_babel import gettext as __
from superset import (
@@ -128,7 +129,6 @@ def handle_query_error(
def get_query_backoff_handler(details: dict[Any, Any]) -> None:
- print(details)
query_id = details["kwargs"]["query_id"]
logger.error(
"Query with id `%s` could not be retrieved", str(query_id),
exc_info=True
@@ -175,22 +175,23 @@ def get_sql_results( # pylint: disable=too-many-arguments
log_params: Optional[dict[str, Any]] = None,
) -> Optional[dict[str, Any]]:
"""Executes the sql query returns the results."""
- with override_user(security_manager.find_user(username)):
- try:
- return execute_sql_statements(
- query_id,
- rendered_query,
- return_results,
- store_results,
- start_time=start_time,
- expand_data=expand_data,
- log_params=log_params,
- )
- except Exception as ex: # pylint: disable=broad-except
- logger.debug("Query %d: %s", query_id, ex)
- stats_logger.incr("error_sqllab_unhandled")
- query = get_query(query_id)
- return handle_query_error(ex, query)
+ with current_app.test_request_context():
+ with override_user(security_manager.find_user(username)):
+ try:
+ return execute_sql_statements(
+ query_id,
+ rendered_query,
+ return_results,
+ store_results,
+ start_time=start_time,
+ expand_data=expand_data,
+ log_params=log_params,
+ )
+ except Exception as ex: # pylint: disable=broad-except
+ logger.debug("Query %d: %s", query_id, ex)
+ stats_logger.incr("error_sqllab_unhandled")
+ query = get_query(query_id)
+ return handle_query_error(ex, query)
def execute_sql_statement( # pylint: disable=too-many-statements
diff --git a/tests/unit_tests/sql_lab_test.py b/tests/unit_tests/sql_lab_test.py
index 6ac055df13..9ffc9b3811 100644
--- a/tests/unit_tests/sql_lab_test.py
+++ b/tests/unit_tests/sql_lab_test.py
@@ -273,9 +273,9 @@ def test_get_sql_results_oauth2(mocker: MockerFixture, app)
-> None:
"error_type": SupersetErrorType.OAUTH2_REDIRECT,
"level": ErrorLevel.WARNING,
"extra": {
- "url":
"https://abcd1234.snowflakecomputing.com/oauth/authorize?scope=refresh_token+session%3Arole%3ASYSADMIN&access_type=offline&include_granted_scopes=false&response_type=code&state=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9%252EeyJleHAiOjE2MTcyMzU1MDAsImRhdGFiYXNlX2lkIjoxLCJ1c2VyX2lkIjo0MiwiZGVmYXVsdF9yZWRpcmVjdF91cmkiOiJodHRwOi8vZXhhbXBsZS5jb20vYXBpL3YxL2RhdGFiYXNlL29hdXRoMi8iLCJ0YWJfaWQiOiJmYjExZjUyOC02ZWJhLTRhOGEtODM3ZS02YjBkMzllZTkxODcifQ%252Ec_m_35xwwSrLgCXwV4aKO192
[...]
+ "url":
"https://abcd1234.snowflakecomputing.com/oauth/authorize?scope=refresh_token+session%3Arole%3ASYSADMIN&access_type=offline&include_granted_scopes=false&response_type=code&state=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9%252EeyJleHAiOjE2MTcyMzU1MDAsImRhdGFiYXNlX2lkIjoxLCJ1c2VyX2lkIjo0MiwiZGVmYXVsdF9yZWRpcmVjdF91cmkiOiJodHRwOi8vbG9jYWxob3N0L2FwaS92MS9kYXRhYmFzZS9vYXV0aDIvIiwidGFiX2lkIjoiZmIxMWY1MjgtNmViYS00YThhLTgzN2UtNmIwZDM5ZWU5MTg3In0%252E7nLkei6-V8sVk_Pgm8cFhk0tnKR
[...]
"tab_id": "fb11f528-6eba-4a8a-837e-6b0d39ee9187",
- "redirect_uri":
"http://example.com/api/v1/database/oauth2/";,
+ "redirect_uri": "http://localhost/api/v1/database/oauth2/";,
},
}
],
