54887 update token (#37)

* stop updating the bearer token when added automatically

* refactoring to encapsulate bearer pre-processing

Author: rafaelgarcia094

src/sumo/wrapper/_call_azure_api.py

@@ -72,6 +72,15 @@ def _is_token_expired(self):
         """
         return self.auth.is_token_expired()
 
+    def _process_token(self, bearer):
+        if bearer:
+            return "Bearer " + bearer
+
+        if self._is_token_expired():
+            self._generate_bearer_token()
+
+        return self.bearer
+
     def get_json(self, url, bearer=None):
         """
             Send an request to the url.
@@ -85,14 +94,11 @@ def get_json(self, url, bearer=None):
             Return
                 json:
                     The json respond from the entered URL
-        """   
-        if bearer is not None:
-            self.bearer = "Bearer " + bearer
-        elif self._is_token_expired():
-            self._generate_bearer_token()
+        """
+        bearer = self._process_token(bearer)
 
         headers = {"Content-Type": "application/json",
-                   "Authorization": self.bearer}
+                   "Authorization": bearer}
 
         response = requests.get(url, headers=headers)
 
@@ -115,13 +121,10 @@ def get_image(self, url, bearer=None):
                 image:
                     raw image
         """
-        if bearer is not None:
-            self.bearer = "Bearer " + bearer
-        elif self._is_token_expired():
-            self._generate_bearer_token()
+        bearer = self._process_token(bearer)
 
         headers = {"Content-Type": "html/text",
-                   "Authorization": self.bearer}
+                   "Authorization": bearer}
 
         response = requests.get(url, headers=headers, stream=True)
 
@@ -144,13 +147,10 @@ def get_content(self, url, bearer=None):
                content:
                     The content respond from the entered URL.
         """
-        if bearer is not None:
-            self.bearer = "Bearer " + bearer
-        elif self._is_token_expired():
-            self._generate_bearer_token()
+        bearer = self._process_token(bearer)
 
         headers = {"Content-Type": "application/json",
-                   "Authorization": self.bearer}
+                   "Authorization": bearer}
 
         response = requests.get(url, headers=headers)
 
@@ -172,16 +172,13 @@ def post(self, url, blob=None, json=None, bearer=None):
         Return
             string: The string respond from the entered URL
         """
-        if bearer is not None:
-            self.bearer = "Bearer " + bearer
-        elif self._is_token_expired():
-            self._generate_bearer_token()
+        bearer = self._process_token(bearer)
 
         if blob and json:
             raise ValueError('Both blob and json given to post - can only have one at the time.')
 
         headers = {"Content-Type": "application/json" if json is not None else "application/octet-stream",
-                   "Authorization": self.bearer,
+                   "Authorization": bearer,
                    "Content-Length": str(len(json) if json else len(blob)),
                    }
 
@@ -205,10 +202,7 @@ def put(self, url, blob=None, json=None, bearer=None):
             Return
                 string: The string respond from the entered URL
         """
-        if bearer is not None:
-            self.bearer = "Bearer " + bearer
-        elif self._is_token_expired():
-            self._generate_bearer_token()
+        bearer = self._process_token(bearer)
 
         if blob and json:
             raise ValueError('Both blob and json given to put - can only have one at the time.')
@@ -219,7 +213,7 @@ def put(self, url, blob=None, json=None, bearer=None):
                    }
 
         if url.find("sig=") < 0:
-            headers["Authorization"] = self.bearer
+            headers["Authorization"] = bearer
 
         response = requests.put(url, data=blob, json=json, headers=headers)
 
@@ -239,13 +233,10 @@ def delete_object(self, url, bearer=None):
             Return
                 json: The json respond from the entered URL
         """
-        if bearer is not None:
-            self.bearer = "Bearer " + bearer
-        elif self._is_token_expired():
-            self._generate_bearer_token()
+        bearer = self._process_token(bearer)
 
         headers = {"Content-Type": "application/json",
-                   "Authorization": self.bearer,
+                   "Authorization": bearer,
                    }
 
         response = requests.delete(url, headers=headers)