Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Check for user with matching Microsoft UUID first

Browse source
This commit is contained in:
Maxim De Clercq 2023-04-19 22:38:30 +02:00
parent 1ffcdc3ec1
commit ba29ecbc73
No known key found for this signature in database
GPG key ID: D35643779C52BA70
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/auth/microsoft.py
View file

@ -39,18 +39,27 @@ def authorized() -> typing.Any:
client.set_token(resp.data) client.set_token(resp.data)
resp = client.users.get_me() resp = client.users.get_me()
username = resp.data['userPrincipalName']
microsoft_uuid = resp.data['id'] microsoft_uuid = resp.data['id']
username = resp.data['userPrincipalName']
# Fail if fields are not populated
if not microsoft_uuid or not username:
flash("You're not allowed to enter, please contact a system administrator")
return redirect(url_for("general_bp.home"))
# Find existing user by Microsoft UUID (userPrincipalName can change)
user = User.query.filter_by(microsoft_uuid=microsoft_uuid).first()
if user:
return login_and_redirect_user(user)
# Find existing user by username (pre-existing account)
user = User.query.filter_by(username=username).first() user = User.query.filter_by(username=username).first()
if username and user: if user:
return login_and_redirect_user(user)
elif username:
user = create_user(username, microsoft_uuid)
return login_and_redirect_user(user) return login_and_redirect_user(user)
flash("You're not allowed to enter, please contact a system administrator") # No user found, create a new one
return redirect(url_for("general_bp.home")) user = create_user(username, microsoft_uuid=microsoft_uuid)
return login_and_redirect_user(user)
def login_and_redirect_user(user) -> Response: def login_and_redirect_user(user) -> Response:
@ -59,7 +68,7 @@ def login_and_redirect_user(user) -> Response:
return redirect(url_for("general_bp.home")) return redirect(url_for("general_bp.home"))
def create_user(username, microsoft_uuid) -> User: def create_user(username, *, microsoft_uuid) -> User:
"""Create a temporary user if it is needed""" """Create a temporary user if it is needed"""
user = User() user = User()
user.configure(username, False, 1, microsoft_uuid=microsoft_uuid) user.configure(username, False, 1, microsoft_uuid=microsoft_uuid)