Merge pull request #711 from terbolous/azure_oauth

Azure oauth fixes
PowerDNS-Admin · May 1, 2020 · 978c0b6 · 978c0b6
2 parents 5bd8990 + b03cbde
commit 978c0b6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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)
 
@@ -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: