Refactor errorFromResponse (#246)

Make `request` and `url` optional parameters in the `errorFromResponse` method and clean up the implementation. Co-authored-by: lotmek <lotfi.meklati@polymtl.ca>
apollographql · Sep 12, 2023 · c6ac292 · c6ac292
1 parent 59eb969
commit c6ac292
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.changeset/tricky-keys-press.md b/.changeset/tricky-keys-press.md
@@ -0,0 +1,5 @@
+---
+'@apollo/datasource-rest': patch
+---
+
+Make `request` and `url` optional parameters in the `errorFromResponse` method and clean up the implementation.
diff --git a/src/RESTDataSource.ts b/src/RESTDataSource.ts
@@ -356,18 +356,20 @@ export abstract class RESTDataSource {
     response,
     parsedBody,
   }: {
-    url: URL;
-    request: RequestOptions;
+    url?: URL;
+    request?: RequestOptions;
     response: FetcherResponse;
     parsedBody: unknown;
   }) {
+    const codeByStatus = new Map<number, string>([
+      [401, 'UNAUTHENTICATED'],
+      [403, 'FORBIDDEN'],
+    ]);
+    const code = codeByStatus.get(response.status);
+
     return new GraphQLError(`${response.status}: ${response.statusText}`, {
       extensions: {
-        ...(response.status === 401
-          ? { code: 'UNAUTHENTICATED' }
-          : response.status === 403
-          ? { code: 'FORBIDDEN' }
-          : {}),
+        ...(code && { code }),
         response: {
           url: response.url,
           status: response.status,

diff --git a/src/__tests__/RESTDataSource.test.ts b/src/__tests__/RESTDataSource.test.ts
@@ -1638,6 +1638,7 @@ describe('RESTDataSource', () => {
             },
           },
         });
+        await expect(result).rejects.not.toHaveProperty('extensions.code');
       });
 
       it('puts JSON error responses on the error as an object', async () => {