From b8442c4c5c360a1331f64cd18580f7ef25676157 Mon Sep 17 00:00:00 2001 From: Erik Weber Date: Thu, 30 Apr 2020 12:14:32 +0200 Subject: [PATCH 1/2] Azure oauth: remove preferredName from query --- powerdnsadmin/routes/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py index 8c13dae..d95fd5a 100644 --- a/powerdnsadmin/routes/index.py +++ b/powerdnsadmin/routes/index.py @@ -201,7 +201,7 @@ def login(): return redirect(url_for('index.index')) if 'azure_token' in session: - azure_info = azure.get('me?$select=displayName,givenName,id,mail,surname,userPrincipalName,preferredName').text + azure_info = azure.get('me?$select=displayName,givenName,id,mail,surname,userPrincipalName').text current_app.logger.info('Azure login returned: '+azure_info) me = json.loads(azure_info) From b03cbdea65429ef581d8abbe4cbd28901dff65eb Mon Sep 17 00:00:00 2001 From: Erik Weber Date: Thu, 30 Apr 2020 12:15:19 +0200 Subject: [PATCH 2/2] Azure oauth: Graph api calls it mail, not email --- powerdnsadmin/routes/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py index d95fd5a..4df19e8 100644 --- a/powerdnsadmin/routes/index.py +++ b/powerdnsadmin/routes/index.py @@ -218,8 +218,8 @@ def login(): azure_username = me["userPrincipalName"] azure_givenname = me["givenName"] azure_familyname = me["surname"] - if "email" in me: - azure_email = me["email"] + if "mail" in me: + azure_email = me["mail"] else: azure_email = "" if not azure_email: