Merge pull request #7 from infodavide/dev

Fixes and package update
infodavide · Mar 31, 2024 · 656971e · 656971e
2 parents 9c4d3be + 0ebacd3
commit 656971e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/enedis_data_connect/enedis_client.py b/enedis_data_connect/enedis_client.py
@@ -216,9 +216,12 @@ def get_data(self, url: str, headers: dict[str, str] = None, params: dict[str, s
                     resp = http_session.send(prepared_req)
                     self._log_response(resp)
                     if resp.status_code == 401:
-                        self._logger.warning("Token expired, trying to re-authenticate...")
-                        self._token_data = None
-                        self.connect()
+                        if auto_connect:
+                            self._logger.warning("Token expired, trying to re-authenticate...")
+                            self._token_data = None
+                            self.connect()
+                        else:
+                            raise InvalidAccess
                     elif resp.status_code == 200:
                         return json.loads(resp.text)
                     else:
@@ -265,9 +268,12 @@ def post_data_with_result(self, url: str, headers: dict[str, str] = None, params
                     resp = http_session.send(prepared_req)
                     self._log_response(resp)
                     if resp.status_code == 401:
-                        self._logger.warning("Token expired, trying to re-authenticate...")
-                        self._token_data = None
-                        self.connect()
+                        if auto_connect:
+                            self._logger.warning("Token expired, trying to re-authenticate...")
+                            self._token_data = None
+                            self.connect()
+                        else:
+                            raise InvalidAccess
                     elif resp.status_code == 200:
                         return json.loads(resp.text)
                     else:
@@ -313,9 +319,12 @@ def post_data_without_result(self, url: str, headers: dict[str, str], params: di
                     resp = http_session.send(prepared_req)
                     self._log_response(resp)
                     if resp.status_code == 401:
-                        self._logger.warning("Token expired, trying to re-authenticate...")
-                        self._token_data = None
-                        self.connect()
+                        if auto_connect:
+                            self._logger.warning("Token expired, trying to re-authenticate...")
+                            self._token_data = None
+                            self.connect()
+                        else:
+                            raise InvalidAccess
                     elif resp.status_code == 200:
                         return
                     else:

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
     version='1.0.0',
     description='Enedis data connect client',
     long_description=readme_content,
-    author='David Rolland',
+    author='David R', 
     author_email='contact@infodavid.org',
     url='https://github.com/infodavide/enedis_data_connect',
     license=license_content,