Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow/auth/managers/fab/security_manager/override.py
Original file line number Diff line number Diff line change
Expand Up @@ -2149,7 +2149,7 @@ def get_oauth_user_info(self, provider: str, resp: dict[str, Any]) -> dict[str,
log.debug("User info from Azure: %s", me)
# https://learn.microsoft.com/en-us/azure/active-directory/develop/id-token-claims-reference#payload-claims
return {
"email": me["email"],
"email": me["upn"] if "upn" in me else me["email"],
"first_name": me.get("given_name", ""),
"last_name": me.get("family_name", ""),
"username": me["oid"],
Expand Down
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ install_requires =
# `airflow/www/fab_security` with their upstream counterparts. In particular, make sure any breaking changes,
# for example any new methods, are accounted for.
# NOTE! When you change the value here, you also have to update flask-appbuilder[oauth] in setup.py
flask-appbuilder==4.3.9
flask-appbuilder==4.3.10
flask-caching>=1.5.0
flask-login>=0.6.2
flask-session>=0.4.0
Expand Down Expand Up @@ -160,7 +160,9 @@ install_requires =
# We should also remove "licenses/LICENSE-unicodecsv.txt" file when we remove this dependency
unicodecsv>=0.14.1
universal_pathlib>=0.1.4
werkzeug>=2.0
# Werkzug 3 breaks Flask-Login 0.6.2
# we should remove this limitation when FAB supports Flask 2.3
werkzeug>=2.0,<3

[options.packages.find]
include =
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def write_version(filename: str = str(AIRFLOW_SOURCES_ROOT / "airflow" / "git_ve
flask_appbuilder_oauth = [
"authlib>=1.0.0",
# The version here should be upgraded at the same time as flask-appbuilder in setup.cfg
"flask-appbuilder[oauth]==4.3.9",
"flask-appbuilder[oauth]==4.3.10",
]
kerberos = [
"pykerberos>=1.1.13",
Expand Down