From 11360a889ed3bc326c70e116ebfc03753821d0ef Mon Sep 17 00:00:00 2001
From: Nelson Dane <47427072+NelsonDane@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:56:08 -0400
Subject: [PATCH] fix custom filepaths

---
 fennel_invest_api/fennel.py | 32 +++++++++++++++++++-------------
 setup.py                    |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/fennel_invest_api/fennel.py b/fennel_invest_api/fennel.py
index f29efdd..7513f6a 100644
--- a/fennel_invest_api/fennel.py
+++ b/fennel_invest_api/fennel.py
@@ -33,16 +33,14 @@ def __init__(self, filename="fennel_credentials.pkl", path=None) -> None:
             self.path = path
         self._load_credentials()
 
-    def _verify_filepath(self):
+    def _load_credentials(self):
+        filename = self.filename
         if self.path is not None:
-            self.filename = os.path.join(self.path, self.filename)
-            if not os.path.exists(self.filename):
+            filename = os.path.join(self.path, filename)
+            if not os.path.exists(self.path):
                 os.makedirs(self.path)
-
-    def _load_credentials(self):
-        self._verify_filepath()
-        if os.path.exists(self.filename):
-            with open(self.filename, "rb") as f:
+        if os.path.exists(filename):
+            with open(filename, "rb") as f:
                 credentials = pickle.load(f)
             self.Bearer = credentials.get("Bearer")
             self.Refresh = credentials.get("Refresh")
@@ -50,8 +48,12 @@ def _load_credentials(self):
             self.client_id = credentials.get("client_id", self.client_id)
 
     def _save_credentials(self):
-        self._verify_filepath()
-        with open(self.filename, "wb") as f:
+        filename = self.filename
+        if self.path is not None:
+            filename = os.path.join(self.path, filename)
+            if not os.path.exists(self.path):
+                os.makedirs(self.path)
+        with open(filename, "wb") as f:
             pickle.dump(
                 {
                     "Bearer": self.Bearer,
@@ -63,9 +65,13 @@ def _save_credentials(self):
             )
 
     def _clear_credentials(self):
-        self._verify_filepath()
-        if os.path.exists(self.filename):
-            os.remove(self.filename)
+        filename = self.filename
+        if self.path is not None:
+            filename = os.path.join(self.path, filename)
+            if not os.path.exists(self.path):
+                os.makedirs(self.path)
+        if os.path.exists(filename):
+            os.remove(filename)
         self.Bearer = None
         self.Refresh = None
         self.ID_Token = None
diff --git a/setup.py b/setup.py
index 4c55783..8e5c8f9 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="fennel_invest_api",
-    version="1.0.0",
+    version="1.0.1",
     description="Unofficial Fennel.com Invest API written in Python Requests",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",