Changed login function, so that loading a session from file is possible

fbchat/client.py

@@ -58,7 +58,7 @@ class Client(object):
 
     """
 
-    def __init__(self, email, password, debug=True, user_agent=None , max_retries=5):
+    def __init__(self, email, password, debug=True, user_agent=None , max_retries=5, do_login=True):
         """A client for the Facebook Chat (Messenger).
 
         :param email: Facebook `email` or `id` or `phone number`
@@ -69,11 +69,9 @@ class Client(object):
 
         """
 
-        if not (email and password):
+        if do_login and not (email and password):
             raise Exception("id and password or config is needed")
 
-        self.email = email
-        self.password = password
         self.debug = debug
         self._session = requests.session()
         self.req_counter = 1
@@ -119,20 +117,8 @@ class Client(object):
         log.addHandler(handler)
         log.setLevel(logging.DEBUG)
         
-        # Logging in
+        if do_login:
-        log.info("Logging in...")
+            self.login(email, password, max_retries)
-
-        for i in range(1,max_retries+1):
-            if not self.login():
-                log.warning("Attempt #{} failed{}".format(i,{True:', retrying'}.get(i<5,'')))
-                time.sleep(1)
-                continue
-            else:
-                log.info("Login successful")
-                break
-        else:
-            raise Exception("login failed. Check id/password")
-
 
         self.threads = []
 
@@ -189,50 +175,8 @@ class Client(object):
         payload=self._generatePayload(None)
         return self._session.post(url, data=payload, timeout=timeout, files=files)
 
-    def saveSession(self, sessionfile):
+    def _post_login(self):
-        """Dumps the session cookies to (sessionfile).
+        self.payloadDefault = {}
-        WILL OVERWRITE ANY EXISTING FILE
-        
-        :param sessionfile: location of saved session file
-        """
-        
-        log.info('Saving session')
-        with open(sessionfile, 'w') as f:
-            # Grab cookies from current session, and save them as JSON
-            f.write(json.dumps(self._session.cookies.get_dict(), ensure_ascii=False))
-
-    def loadSession(self, sessionfile):
-        """Loads session cookies from (sessionfile)
-        
-        :param sessionfile: location of saved session file
-        """
-        
-        log.info('Loading session')
-        with open(sessionfile, 'r') as f:
-            try:
-                j = json.load(f)
-                if not j or 'c_user' not in j:
-                    return False
-                # Load cookies into current session
-                self._session.cookies = requests.cookies.merge_cookies(self._session.cookies, j)
-                return True
-            except Exception as e:
-                raise Exception('Invalid json in {}, or bad merging of cookies'.format(sessionfile))
-
-
-    def login(self):
-        if not (self.email and self.password):
-            raise Exception("id and password or config is needed")
-
-        soup = bs(self._get(MobileURL).text, "lxml")
-        data = dict((elem['name'], elem['value']) for elem in soup.findAll("input") if elem.has_attr('value') and elem.has_attr('name'))
-        data['email'] = self.email
-        data['pass'] = self.password
-        data['login'] = 'Log In'
-
-        r = self._cleanPost(LoginURL, data)
-
-        if 'home' in r.url:
         self.client_id = hex(int(random()*2147483648))[2:]
         self.start_time = now()
         self.uid = int(self._session.cookies['c_user'])
@@ -241,6 +185,8 @@ class Client(object):
 
         r = self._get(BaseURL)
         soup = bs(r.text, "lxml")
+        log.debug(r.text)
+        log.debug(r.url)
         self.fb_dtsg = soup.find("input", {'name':'fb_dtsg'})['value']
         self.fb_h = soup.find("input", {'name':'h'})['value']
         self._setttstamp()
@@ -267,10 +213,73 @@ class Client(object):
         self.tmp_prev = now()
         self.last_sync = now()
 
+    def _login(self):
+        if not (self.email and self.password):
+            raise Exception("id and password or config is needed")
+
+        soup = bs(self._get(MobileURL).text, "lxml")
+        data = dict((elem['name'], elem['value']) for elem in soup.findAll("input") if elem.has_attr('value') and elem.has_attr('name'))
+        data['email'] = self.email
+        data['pass'] = self.password
+        data['login'] = 'Log In'
+
+        r = self._cleanPost(LoginURL, data)
+
+        if 'home' in r.url:
+            self._post_login()
             return True
         else:
             return False
 
+    def saveSession(self, sessionfile):
+        """Dumps the session cookies to (sessionfile).
+        WILL OVERWRITE ANY EXISTING FILE
+        
+        :param sessionfile: location of saved session file
+        """
+        
+        log.info('Saving session')
+        with open(sessionfile, 'w') as f:
+            # Grab cookies from current session, and save them as JSON
+            f.write(json.dumps(self._session.cookies.get_dict(), ensure_ascii=False))
+
+    def loadSession(self, sessionfile):
+        """Loads session cookies from (sessionfile)
+        
+        :param sessionfile: location of saved session file
+        """
+        
+        log.info('Loading session')
+        with open(sessionfile, 'r') as f:
+            try:
+                j = json.load(f)
+                if not j or 'c_user' not in j:
+                    return False
+                # Load cookies into current session
+                self._session.cookies = requests.cookies.merge_cookies(self._session.cookies, j)
+                self._post_login()
+                return True
+            except Exception as e:
+                raise Exception('Invalid json in {}, or bad merging of cookies'.format(sessionfile))
+
+    def login(self, email, password, max_retries=5):
+        # Logging in
+        log.info("Logging in...")
+        
+        self.email = email
+        self.password = password
+
+        for i in range(1,max_retries+1):
+            if not self._login():
+                log.warning("Attempt #{} failed{}".format(i,{True:', retrying'}.get(i<5,'')))
+                time.sleep(1)
+                continue
+            else:
+                log.info("Login successful")
+                break
+        else:
+            raise Exception("login failed. Check id/password")
+
     def logout(self, timeout=30):
         data = {}
         data['ref'] = "mb"