roblox/api: handle http errors

vinegarhq · Oct 21, 2023 · 85535dc · 85535dc
1 parent afd9f19
commit 85535dc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/roblox/api/api.go b/roblox/api/api.go
@@ -36,13 +36,14 @@ func Request(method, service, endpoint string, v interface{}) error {
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode >= 400 {
+	if resp.StatusCode != http.StatusOK {
+		// Return the given API error only if the decoder succeeded
 		errsResp := new(errorsResponse)
-		if err := json.NewDecoder(resp.Body).Decode(errsResp); err != nil {
-			return err
+		if err := json.NewDecoder(resp.Body).Decode(errsResp); err == nil {
+			return errsResp
 		}
 
-		return errsResp
+		return fmt.Errorf("%w: %s", ErrBadStatus, resp.Status)
 	}
 
 	if v != nil {