mirror of
https://github.com/LonamiWebs/Telethon.git
synced 2024-11-22 09:26:37 +03:00
Properly handle PhoneCodeExpiredError in sign_in
Should actually fix #3185 now.
This commit is contained in:
parent
10c74f8bab
commit
5b1135734b
|
@ -333,12 +333,9 @@ class AuthMethods:
|
||||||
|
|
||||||
# May raise PhoneCodeEmptyError, PhoneCodeExpiredError,
|
# May raise PhoneCodeEmptyError, PhoneCodeExpiredError,
|
||||||
# PhoneCodeHashEmptyError or PhoneCodeInvalidError.
|
# PhoneCodeHashEmptyError or PhoneCodeInvalidError.
|
||||||
try:
|
request = functions.auth.SignInRequest(
|
||||||
request = functions.auth.SignInRequest(
|
phone, phone_code_hash, str(code)
|
||||||
phone, phone_code_hash, str(code)
|
)
|
||||||
)
|
|
||||||
except errors.PhoneCodeExpiredError:
|
|
||||||
self._phone_code_hash.pop(phone, None)
|
|
||||||
elif password:
|
elif password:
|
||||||
pwd = await self(functions.account.GetPasswordRequest())
|
pwd = await self(functions.account.GetPasswordRequest())
|
||||||
request = functions.auth.CheckPasswordRequest(
|
request = functions.auth.CheckPasswordRequest(
|
||||||
|
@ -355,7 +352,12 @@ class AuthMethods:
|
||||||
'and a password only if an RPCError was raised before.'
|
'and a password only if an RPCError was raised before.'
|
||||||
)
|
)
|
||||||
|
|
||||||
result = await self(request)
|
try:
|
||||||
|
result = await self(request)
|
||||||
|
except errors.PhoneCodeExpiredError:
|
||||||
|
self._phone_code_hash.pop(phone, None)
|
||||||
|
raise
|
||||||
|
|
||||||
if isinstance(result, types.auth.AuthorizationSignUpRequired):
|
if isinstance(result, types.auth.AuthorizationSignUpRequired):
|
||||||
# Emulate pre-layer 104 behaviour
|
# Emulate pre-layer 104 behaviour
|
||||||
self._tos = result.terms_of_service
|
self._tos = result.terms_of_service
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
# Versions should comply with PEP440.
|
# Versions should comply with PEP440.
|
||||||
# This line is parsed in setup.py:
|
# This line is parsed in setup.py:
|
||||||
__version__ = '1.28.0'
|
__version__ = '1.28.1'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user