feat: add API error enum variant (#87)

Author: DanielleHuisman

src/admin_portal/operations/generate_portal_link.rs

@@ -108,7 +108,8 @@ impl GeneratePortalLink for AdminPortal<'_> {
             .json(&params)
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<GeneratePortalLinkResponse>()
             .await?;
 

src/core/error.rs

@@ -22,6 +22,10 @@ pub enum WorkOsError<E> {
     /// An unhandled error occurred with the API request.
     #[error("request error")]
     RequestError(#[from] reqwest::Error),
+
+    /// The API responded with an error.
+    #[error("API error")]
+    ApiError(serde_json::Value),
 }
 
 /// A WorkOS SDK result.

src/core/response.rs

@@ -12,10 +12,10 @@ where
 
     /// Handles a generic error from the WorkOS API by converting it into a
     /// [`WorkOsError::RequestError`] response.
-    fn handle_generic_error<E>(self) -> WorkOsResult<Self, E>;
+    async fn handle_generic_error<E>(self) -> WorkOsResult<Self, E>;
 
     /// Handles an unauthorized or generic error from the WorkOS API.
-    fn handle_unauthorized_or_generic_error<E>(self) -> WorkOsResult<Self, E>;
+    async fn handle_unauthorized_or_generic_error<E>(self) -> WorkOsResult<Self, E>;
 }
 
 impl ResponseExt for Response {
@@ -27,14 +27,33 @@ impl ResponseExt for Response {
         }
     }
 
-    fn handle_generic_error<E>(self) -> WorkOsResult<Self, E> {
-        match self.error_for_status() {
-            Ok(response) => Ok(response),
-            Err(err) => Err(WorkOsError::RequestError(err)),
+    async fn handle_generic_error<E>(self) -> WorkOsResult<Self, E> {
+        let status = self.status();
+        if status.is_client_error() || status.is_server_error() {
+            if self
+                .headers()
+                .get("content-type")
+                .and_then(|value| value.to_str().ok())
+                .is_some_and(|value| value.to_lowercase().starts_with("application/json"))
+            {
+                match self.json().await {
+                    Ok(value) => Err(WorkOsError::ApiError(value)),
+                    Err(err) => Err(WorkOsError::RequestError(err)),
+                }
+            } else {
+                match self.error_for_status() {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(WorkOsError::RequestError(err)),
+                }
+            }
+        } else {
+            Ok(self)
         }
     }
 
-    fn handle_unauthorized_or_generic_error<E>(self) -> WorkOsResult<Self, E> {
-        self.handle_unauthorized_error()?.handle_generic_error()
+    async fn handle_unauthorized_or_generic_error<E>(self) -> WorkOsResult<Self, E> {
+        self.handle_unauthorized_error()?
+            .handle_generic_error()
+            .await
     }
 }

src/directory_sync/operations/delete_directory.rs

@@ -70,7 +70,8 @@ impl DeleteDirectory for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?;
+            .handle_unauthorized_or_generic_error()
+            .await?;
 
         Ok(())
     }

src/directory_sync/operations/get_directory.rs

@@ -52,7 +52,8 @@ impl GetDirectory for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<Directory>()
             .await?;
 

src/directory_sync/operations/get_directory_group.rs

@@ -63,7 +63,8 @@ impl GetDirectoryGroup for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<DirectoryGroup>()
             .await?;
 

src/directory_sync/operations/get_directory_user.rs

@@ -63,7 +63,8 @@ impl GetDirectoryUser for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<DirectoryUser>()
             .await?;
 

src/directory_sync/operations/list_directories.rs

@@ -73,7 +73,8 @@ impl ListDirectories for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<PaginatedList<Directory>>()
             .await?;
 

src/directory_sync/operations/list_directory_groups.rs

@@ -81,7 +81,8 @@ impl ListDirectoryGroups for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<PaginatedList<DirectoryGroup>>()
             .await?;
 

src/directory_sync/operations/list_directory_users.rs

@@ -81,7 +81,8 @@ impl ListDirectoryUsers for DirectorySync<'_> {
             .bearer_auth(self.workos.key())
             .send()
             .await?
-            .handle_unauthorized_or_generic_error()?
+            .handle_unauthorized_or_generic_error()
+            .await?
             .json::<PaginatedList<DirectoryUser>>()
             .await?;