Fix error handling issues (#95)

* Fix error handling issues

* Revert version bump

* Add test for missing error and error_description

* Format file

* Fix tests for error parameters

Author: blairworkos

tests/utils/test_requests.py

@@ -74,12 +74,30 @@ def test_bad_request_exceptions_include_expected_request_data(
 
         try:
             request_helper.request("bad_place")
-        except ServerException as ex:
-            assert ex.request_id == request_id
-            assert ex.error == error
-            assert ex.error_description == error_description
+        except BadRequestException as ex:
+            assert (
+                str(ex)
+                == "(message=No message, request_id=request-123, error=example_error, error_description=Example error description)"
+            )
+        except Exception as ex:
+            assert ex.__class__ == BadRequestException
+
+    def test_bad_request_exceptions_exclude_expected_request_data(
+        self, mock_request_method
+    ):
+        request_helper = RequestHelper()
+
+        request_id = "request-123"
+
+        mock_request_method(
+            "get", {"foo": "bar"}, 400, headers={"X-Request-ID": request_id},
+        )
+
+        try:
+            request_helper.request("bad_place")
+        except BadRequestException as ex:
+            assert str(ex) == "(message=No message, request_id=request-123)"
         except Exception as ex:
-            # This'll fail for sure here but... just using the nice error that'd come up
             assert ex.__class__ == BadRequestException
 
     def test_request_bad_body_raises_expected_exception_with_request_data(

workos/exceptions.py

@@ -7,12 +7,11 @@ class BaseRequestException(Exception):
     def __init__(self, response, message=None, error=None, error_description=None):
         super(BaseRequestException, self).__init__(message)
 
+        self.message = message
         self.error = error
+        self.error_description = error_description
         self.extract_and_set_response_related_data(response)
 
-        if message is not None:
-            self.message = message
-
     def extract_and_set_response_related_data(self, response):
         self.response = response