Skip to content

Add upn fallback for single-tenant Microsoft/Azure AD authentication #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lperezmo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add upn fallback for single-tenant Microsoft/Azure AD authentication #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions streamlit_authenticator/models/oauth2/microsoft_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,12 @@ def get_microsoft_user_info(self, auth_code: str) -> Dict[str, str]:
st.rerun()
token_json = self.decode_jwt(token_json['access_token'])
keys = {'email', 'upn', 'family_name', 'given_name'}
return {key: token_json[key] for key in keys if key in token_json}
# user_info_url = 'https://graph.microsoft.com/v1.0/me'
# user_info_headers = {
# "Authorization": f"Bearer {token_json['access_token']}"
# }
# user_info_r = requests.get(user_info_url, headers=user_info_headers, timeout=10)
# if user_info_r.status_code != 200:
# raise LoginError('Failed to retrieve user information')
# return user_info_r.json()
user_info = {key: token_json[key] for key in keys if key in token_json}
# Single-tenant fix: Azure AD work/school tokens often omit 'email'
# but include 'upn' (User Principal Name) which serves the same purpose
if 'email' not in user_info and 'upn' in user_info:
user_info['email'] = user_info['upn']
return user_info
def guest_login(self) -> Union[str, Dict[str, str]]:
"""
Handles the login process and fetches user information or returns the authorization
Expand Down