This is an automated email from the ASF dual-hosted git repository. ephraimanierobi pushed a commit to branch v2-8-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 9ea67c8749fe813b97898e1f1b7859c96160e32e Author: Jarek Potiuk <[email protected]> AuthorDate: Thu Nov 30 23:48:27 2023 +0100 Bump FAB to 4.3.10 (#35991) (cherry picked from commit 9bcee9d439ada9104e702e090b20d5d1eeafa035) --- airflow/auth/managers/fab/security_manager/override.py | 2 +- setup.cfg | 6 ++++-- setup.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/airflow/auth/managers/fab/security_manager/override.py b/airflow/auth/managers/fab/security_manager/override.py index 2dc023f1da..3814036bb5 100644 --- a/airflow/auth/managers/fab/security_manager/override.py +++ b/airflow/auth/managers/fab/security_manager/override.py @@ -2149,7 +2149,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2): 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"], diff --git a/setup.cfg b/setup.cfg index 4f7144ca5d..47bcddf04c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -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 = diff --git a/setup.py b/setup.py index bc624e21fa..9d71ea6194 100644 --- a/setup.py +++ b/setup.py @@ -328,7 +328,7 @@ doc_gen = [ 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",
