DOMO-352334: Adding exception-handling to expiration extraction to avoid fatal failures for a somewhat trivial change

Author: samrands

pydomo/Transport.py

@@ -94,19 +94,26 @@ def _renew_access_token(self):
             raise Exception("Error retrieving a Domo API Access Token: " + response.text)
 
     def _extract_expiration(self, access_token):
-        EXPIRATION_DATE_KEY = 'exp'
-
-        token_parts = access_token.split('.')
-        payload_bytes = bytes(token_parts[1], 'utf-8')
-        # Padding required for the base64 library
-        decoded_payload_bytes = base64.urlsafe_b64decode(payload_bytes + b'==')
-        payload_string = decoded_payload_bytes.decode('utf-8')
-        decoded_payload_dict = json.loads(payload_string)
-        if EXPIRATION_DATE_KEY in decoded_payload_dict.keys():
-            expiration_date = decoded_payload_dict[EXPIRATION_DATE_KEY]
-            self.logger.debug('Token expiration: {}'.format(expiration_date))
-            return expiration_date
-        return 0
+        expiration_date = 0
+        try:
+            token_parts = access_token.split('.')
+            payload_bytes = bytes(token_parts[1], 'utf-8')
+
+            # Padding required for the base64 library
+            decoded_payload_bytes = base64.urlsafe_b64decode(payload_bytes + b'==')
+            payload_string = decoded_payload_bytes.decode('utf-8')
+            decoded_payload_dict = json.loads(payload_string)
+
+            if 'exp' in decoded_payload_dict.keys():
+                expiration_date = decoded_payload_dict['exp']
+                self.logger.debug('Token expiration: {}'.format(expiration_date))
+        except Exception as err:
+            # If an Exception is raised, log and continue. expiration_date will
+            # either be 0 or set to the value in the JWT.
+            self.logger.debug('Ran into error parsing token for expiration. '
+                              'Setting expiration date to 0. '
+                              '{}: {}'.format(type(err).__name__, err))
+        return expiration_date
 
     def dump_response(self, response):
         data = dump.dump_all(response)