This is an automated email from the ASF dual-hosted git repository.
vincbeck pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new f3514d34d28 Honor next_url in AwsAuthManager.get_url_login() (#77280)
(#77282)
f3514d34d28 is described below
commit f3514d34d28ce99d976d66ca374b2e3d18eaaea7
Author: Sachin Chandra Yadav <[email protected]>
AuthorDate: Fri Nov 20 01:59:28 2026 +0530
Honor next_url in AwsAuthManager.get_url_login() (#77280) (#77282)
Signed-off-by: Sachin Chandra Yadav <[email protected]>
---
.../providers/amazon/aws/auth_manager/aws_auth_manager.py | 7 +++++--
.../unit/amazon/aws/auth_manager/test_aws_auth_manager.py | 13 ++++++++++---
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/providers/amazon/src/airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py
b/providers/amazon/src/airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py
index b29c2197148..bd20a229fca 100644
---
a/providers/amazon/src/airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py
+++
b/providers/amazon/src/airflow/providers/amazon/aws/auth_manager/aws_auth_manager.py
@@ -21,7 +21,7 @@ from collections import defaultdict
from collections.abc import Sequence
from functools import cached_property
from typing import TYPE_CHECKING, Any, cast
-from urllib.parse import urljoin
+from urllib.parse import urlencode, urljoin
from fastapi import FastAPI
@@ -538,7 +538,10 @@ class AwsAuthManager(BaseAuthManager[AwsAuthManagerUser]):
}
def get_url_login(self, **kwargs) -> str:
- return urljoin(self.apiserver_endpoint,
f"{AUTH_MANAGER_FASTAPI_APP_PREFIX}/login")
+ login_url = urljoin(self.apiserver_endpoint,
f"{AUTH_MANAGER_FASTAPI_APP_PREFIX}/login")
+ if next_url := kwargs.get("next_url"):
+ return f"{login_url}?{urlencode({'next': next_url})}"
+ return login_url
@staticmethod
def get_cli_commands() -> list[CLICommand]:
diff --git
a/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
b/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
index a4e33e31ab4..5f3593a9f43 100644
---
a/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
+++
b/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
@@ -944,9 +944,16 @@ class TestAwsAuthManager:
assert auth_manager.filter_authorized_assets(assets=[],
user=test_user, method="GET") == set()
- def test_get_url_login(self, auth_manager):
- result = auth_manager.get_url_login()
- assert result == f"{AUTH_MANAGER_FASTAPI_APP_PREFIX}/login"
+ @pytest.mark.parametrize(
+ ("kwargs", "expected"),
+ [
+ ({}, f"{AUTH_MANAGER_FASTAPI_APP_PREFIX}/login"),
+ ({"next_url": "/dags/my_dag"},
f"{AUTH_MANAGER_FASTAPI_APP_PREFIX}/login?next=%2Fdags%2Fmy_dag"),
+ ],
+ )
+ def test_get_url_login(self, auth_manager, kwargs, expected):
+ result = auth_manager.get_url_login(**kwargs)
+ assert result == expected
def test_get_cli_commands_return_cli_commands(self, auth_manager):
assert len(auth_manager.get_cli_commands()) > 0