fix: add additional fields to APIError struct for Jamf Pro JSON error responses

Author: neilmartin83

response/error.go

@@ -17,14 +17,24 @@ import (
 
 // APIError represents an api error response.
 type APIError struct {
-	StatusCode  int      `json:"status_code"`       // HTTP status code
-	Method      string   `json:"method"`            // HTTP method used for the request
-	URL         string   `json:"url"`               // The URL of the HTTP request
+	StatusCode  int      `json:"status_code"` // HTTP status code
+	Method      string   `json:"method"`      // HTTP method used for the request
+	URL         string   `json:"url"`         // The URL of the HTTP request
+	HTTPStatus  int      `json:"httpStatus,omitempty"`
+	Errors      []Errors `json:"errors,omitempty"`
 	Message     string   `json:"message"`           // Summary of the error
 	Details     []string `json:"details,omitempty"` // Detailed error messages, if any
 	RawResponse string   `json:"raw_response"`      // Raw response body for debugging
 }
 
+// Errors represents individual error details within an API error response.
+type Errors struct {
+	Code        string  `json:"code,omitempty"`
+	Field       string  `json:"field,omitempty"`
+	Description string  `json:"description,omitempty"`
+	ID          *string `json:"id,omitempty"`
+}
+
 // Error returns a string representation of the APIError, making it compatible with the error interface.
 func (e *APIError) Error() string {
 	data, err := json.Marshal(e)
@@ -74,15 +84,14 @@ func HandleAPIErrorResponse(resp *http.Response, sugar *zap.SugaredLogger) *APIE
 
 // parseJSONResponse attempts to parse the JSON error response and update the APIError structure.
 func parseJSONResponse(bodyBytes []byte, apiError *APIError) {
-	apiError.RawResponse = string(bodyBytes)
-
 	if err := json.Unmarshal(bodyBytes, apiError); err != nil {
+		apiError.RawResponse = string(bodyBytes)
 	} else {
 		if apiError.Message == "" {
 			apiError.Message = "An unknown error occurred"
 		}
-	}
 
+	}
 }
 
 // parseXMLResponse dynamically parses XML error responses and accumulates potential error messages.