From c7673f5c0ce0635b798c240c3aac569a30a54f2e Mon Sep 17 00:00:00 2001
From: Matt <deindesign.pl@gmail.com>
Date: Wed, 4 Sep 2024 02:41:19 +0200
Subject: [PATCH] fix: Return non-flattened response in case of errors, if
 requested

---
 src/request-handler.ts       | 10 +++++-----
 test/request-handler.spec.ts |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/request-handler.ts b/src/request-handler.ts
index 5b42d99..0e62412 100644
--- a/src/request-handler.ts
+++ b/src/request-handler.ts
@@ -654,16 +654,16 @@ export class RequestHandler {
 
     let data = response?.data;
 
-    // Return flattened response immediately
-    if (flattenResponse) {
-      return this.flattenData(data);
-    }
-
     // Set the default response if the provided data is an empty object
     if (data && typeof data === 'object' && Object.keys(data).length === 0) {
       data = defaultResponse;
     }
 
+    // Return flattened response immediately
+    if (flattenResponse) {
+      return this.flattenData(data);
+    }
+
     const isCustomFetcher = this.isCustomFetcher();
 
     if (isCustomFetcher) {
diff --git a/test/request-handler.spec.ts b/test/request-handler.spec.ts
index 465c3e0..af5bc98 100644
--- a/test/request-handler.spec.ts
+++ b/test/request-handler.spec.ts
@@ -1273,7 +1273,7 @@ describe('Request Handler', () => {
 
       (requestHandler.requestInstance as any).request = jest
         .fn()
-        .mockResolvedValue({});
+        .mockResolvedValue({ data: null });
 
       expect(
         await requestHandler.request(apiUrl, null, { method: 'head' }),