fix credential refreshing

fennel_invest_api/fennel.py

@@ -75,11 +75,9 @@ def _clear_credentials(self):
         self.ID_Token = None
 
     def login(self, email, wait_for_code=True, code=None):
-        # If creds exist, then see if they are valid
-        if self.Bearer is not None:
-            if self._verify_login():
-                return True
-            self._clear_credentials()
+        # If creds exist, check if they are valid/try to refresh
+        if self.Bearer is not None and self._verify_login():
+            return True
         if code is None:
             url = self.endpoints.retrieve_bearer_url()
             payload = {
@@ -113,7 +111,6 @@ def login(self, email, wait_for_code=True, code=None):
         self.Refresh = response["refresh_token"]
         self.ID_Token = response["id_token"]
         self.refresh_token()
-        self._save_credentials()
         self.get_account_ids()
         return True
 
@@ -133,6 +130,7 @@ def refresh_token(self):
         self.Bearer = response["access_token"]
         self.Refresh = response["refresh_token"]
         self.ID_Token = response["id_token"]
+        self._save_credentials()
         return response
 
     def _verify_login(self):
@@ -142,10 +140,13 @@ def _verify_login(self):
             return True
         except Exception:
             try:
+                # Try to refresh token
                 self.refresh_token()
                 self.get_account_ids()
                 return True
             except Exception:
+                # Unable to refresh, clear credentials
+                self._clear_credentials()
                 return False
 
     @check_login

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="fennel_invest_api",
-    version="1.0.5",
+    version="1.0.6",
     description="Unofficial Fennel.com Invest API written in Python Requests",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",