Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

match username instead of id when login via MastoAPI

Browse source
This commit is contained in:
Your Name 2024-05-15 00:19:11 -04:00 • committed by Henri Dickson
parent 0757545e7e
commit 10abf92458
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mastodon/auth.py
View file

@ -16,16 +16,16 @@ class OAuth2Backend(ModelBackend):
site = kwargs.get("site", None) site = kwargs.get("site", None)
if token is None or site is None: if token is None or site is None:
return return
mastodon_id = None mastodon_username = None
if username is None: if username is None:
code, user_data = verify_account(site, token) code, user_data = verify_account(site, token)
if code == 200 and user_data: if code == 200 and user_data:
mastodon_id = user_data["id"] mastodon_username = user_data.get("username")
if not mastodon_id: if not mastodon_username:
return None return None
try: try:
user = UserModel._default_manager.get( user = UserModel._default_manager.get(
mastodon_id__iexact=mastodon_id, mastodon_site__iexact=site mastodon_username__iexact=mastodon_username, mastodon_site__iexact=site
) )
return user if self.user_can_authenticate(user) else None return user if self.user_can_authenticate(user) else None
except UserModel.DoesNotExist: except UserModel.DoesNotExist: