Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TeDomum
Admin DNS
Commits
978c0b6c
Unverified
Commit
978c0b6c
authored
May 01, 2020
by
Khanh Ngo
Committed by
GitHub
May 01, 2020
Browse files
Merge pull request #711 from terbolous/azure_oauth
Azure oauth fixes
parents
5bd8990a
b03cbdea
Changes
1
Hide whitespace changes
Inline
Side-by-side
powerdnsadmin/routes/index.py
View file @
978c0b6c
...
...
@@ -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
"
e
mail"
in
me
:
azure_email
=
me
[
"
e
mail"
]
if
"mail"
in
me
:
azure_email
=
me
[
"mail"
]
else
:
azure_email
=
""
if
not
azure_email
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment