karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove login retrying

Browse Source 
Unnecessary clutter, easy to implement if required by the user.
This commit is contained in:
Mads Marquart
2019-08-30 18:40:51 +02:00
parent 856c1ffe0e
commit 5aed7b0abc
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fbchat/_client.py
View File

@@ -51,13 +51,12 @@ class Client:
""" """
return self._uid return self._uid
def __init__(self, email, password, max_tries=5, session_cookies=None): def __init__(self, email, password, session_cookies=None):
"""Initialize and log in the client. """Initialize and log in the client.
Args: Args:
email: Facebook ``email``, ``id`` or ``phone number`` email: Facebook ``email``, ``id`` or ``phone number``
password: Facebook account password password: Facebook account password
max_tries (int): Maximum number of times to try logging in
session_cookies (dict): Cookies from a previous session (Will default to login if these are invalid) session_cookies (dict): Cookies from a previous session (Will default to login if these are invalid)
Raises: Raises:
@@ -75,7 +74,7 @@ class Client:
or not self.setSession(session_cookies) or not self.setSession(session_cookies)
or not self.isLoggedIn() or not self.isLoggedIn()
): ):
self.login(email, password, max_tries) self.login(email, password)
""" """
INTERNAL REQUEST METHODS INTERNAL REQUEST METHODS
@@ -154,7 +153,7 @@ class Client:
return False return False
return True return True
def login(self, email, password, max_tries=5): def login(self, email, password):
"""Login the user, using ``email`` and ``password``. """Login the user, using ``email`` and ``password``.
If the user is already logged in, this will do a re-login. If the user is already logged in, this will do a re-login.
@@ -162,33 +161,20 @@ class Client:
Args: Args:
email: Facebook ``email`` or ``id`` or ``phone number`` email: Facebook ``email`` or ``id`` or ``phone number``
password: Facebook account password password: Facebook account password
max_tries (int): Maximum number of times to try logging in
Raises: Raises:
FBchatException: On failed login FBchatException: On failed login
""" """
self.onLoggingIn(email=email) self.onLoggingIn(email=email)
if max_tries < 1:
raise ValueError("Cannot login: max_tries should be at least one")
if not (email and password): if not (email and password):
raise ValueError("Email and password not set") raise ValueError("Email and password not set")
for i in range(1, max_tries + 1): self._state = _state.State.login(
try: email, password, on_2fa_callback=self.on2FACode
self._state = _state.State.login( )
email, password, on_2fa_callback=self.on2FACode self._uid = self._state.user_id
) self.onLoggedIn(email=email)
self._uid = self._state.user_id
except Exception:
if i >= max_tries:
raise
log.exception("Attempt #{} failed, retrying".format(i))
time.sleep(1)
else:
self.onLoggedIn(email=email)
break
def logout(self): def logout(self):
"""Safely log out the client. """Safely log out the client.