mirror
/
Mastodon.py
kopia lustrzana https://github.com/halcy/Mastodon.py
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Small fixes to OAuth code

pull/419/head
Lorenz Diener 2025-08-15 14:59:28 +03:00
rodzic cb48c95930
commit 75af8b02c1
1 zmienionych plików z 11 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
mastodon/authentication.py
Wyświetl plik

@ -389,15 +389,22 @@ class Mastodon(Internals):
raise MastodonIllegalArgumentError('Password flow is no longer supported in Mastodon 4.4.0 and later. Please use the code flow instead.') raise MastodonIllegalArgumentError('Password flow is no longer supported in Mastodon 4.4.0 and later. Please use the code flow instead.')
else: else:
raise MastodonIllegalArgumentError('Password flow is not supported by this instance. Please use the code flow instead.') raise MastodonIllegalArgumentError('Password flow is not supported by this instance. Please use the code flow instead.')
# Trying to use code flow?
if code is not None:
if "grant_types_supported" in oauth_info:
if "authorization_code" not in oauth_info["grant_types_supported"]:
# This would be a very weird case, but I guess we can provide a good error here anyways.
raise MastodonIllegalArgumentError('Authorization code flow is not supported by this instance. Please obtain a token in some other way.')
if username is not None and password is not None: if username is not None and password is not None:
params = self.__generate_params(locals(), ['scopes', 'to_file', 'code', 'refresh_token']) params = self.__generate_params(locals(), ['scopes', 'to_file', 'code', 'refresh_token', 'allow_http'])
params['grant_type'] = 'password' params['grant_type'] = 'password'
elif code is not None: elif code is not None:
params = self.__generate_params(locals(), ['scopes', 'to_file', 'username', 'password', 'refresh_token']) params = self.__generate_params(locals(), ['scopes', 'to_file', 'username', 'password', 'refresh_token', 'allow_http'])
params['grant_type'] = 'authorization_code' params['grant_type'] = 'authorization_code'
elif refresh_token is not None: elif refresh_token is not None:
params = self.__generate_params(locals(), ['scopes', 'to_file', 'username', 'password', 'code']) params = self.__generate_params(locals(), ['scopes', 'to_file', 'username', 'password', 'code', 'allow_http'])
params['grant_type'] = 'refresh_token' params['grant_type'] = 'refresh_token'
else: else:
raise MastodonIllegalArgumentError('Invalid arguments given. username and password or code are required.') raise MastodonIllegalArgumentError('Invalid arguments given. username and password or code are required.')