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

Remove email/password client variables

Browse Source
This commit is contained in:
Mads Marquart
2019-03-30 18:39:56 +01:00
parent 6ab298f6e8
commit a079797fca
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fbchat/_client.py
View File

@@ -99,9 +99,6 @@ class Client(object):
or not self.isLoggedIn() or not self.isLoggedIn()
): ):
self.login(email, password, max_tries) self.login(email, password, max_tries)
else:
self.email = email
self.password = password
""" """
INTERNAL REQUEST METHODS INTERNAL REQUEST METHODS
@@ -338,18 +335,15 @@ class Client(object):
self.payloadDefault["ttstamp"] = ttstamp self.payloadDefault["ttstamp"] = ttstamp
self.payloadDefault["fb_dtsg"] = fb_dtsg self.payloadDefault["fb_dtsg"] = fb_dtsg
def _login(self): def _login(self, email, password):
if not (self.email and self.password):
raise FBchatUserError("Email and password not found.")
soup = bs(self._get(self.req_url.MOBILE).text, "html.parser") soup = bs(self._get(self.req_url.MOBILE).text, "html.parser")
data = dict( data = dict(
(elem["name"], elem["value"]) (elem["name"], elem["value"])
for elem in soup.findAll("input") for elem in soup.findAll("input")
if elem.has_attr("value") and elem.has_attr("name") if elem.has_attr("value") and elem.has_attr("name")
) )
data["email"] = self.email data["email"] = email
data["pass"] = self.password data["pass"] = password
data["login"] = "Log In" data["login"] = "Log In"
r = self._cleanPost(self.req_url.LOGIN, data) r = self._cleanPost(self.req_url.LOGIN, data)
@@ -489,11 +483,8 @@ class Client(object):
if not (email and password): if not (email and password):
raise FBchatUserError("Email and password not set") raise FBchatUserError("Email and password not set")
self.email = email
self.password = password
for i in range(1, max_tries + 1): for i in range(1, max_tries + 1):
login_successful, login_url = self._login() login_successful, login_url = self._login(email, password)
if not login_successful: if not login_successful:
log.warning( log.warning(
"Attempt #{} failed{}".format( "Attempt #{} failed{}".format(