fix(backend): Access the correct headers to determine the Content-Typ…

…e returned by the Response (#1469)
clerk · Jul 12, 2023 · e303684 · e303684
1 parent 8786bf5
commit e303684
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.changeset/four-monkeys-smell.md b/.changeset/four-monkeys-smell.md
@@ -0,0 +1,5 @@
+---
+'@clerk/backend': patch
+---
+
+Fix the headers checked to determine the Response Content-Type
diff --git a/packages/backend/src/api/request.ts b/packages/backend/src/api/request.ts
@@ -2,7 +2,7 @@ import type { ClerkAPIError, ClerkAPIErrorJSON } from '@clerk/types';
 import deepmerge from 'deepmerge';
 import snakecaseKeys from 'snakecase-keys';
 
-import { API_URL, API_VERSION, USER_AGENT } from '../constants';
+import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
 // DO NOT CHANGE: Runtime needs to be imported as a default export so that we can stub its dependencies with Sinon.js
 // For more information refer to https://sinonjs.org/how-to/stub-dependency/
 import runtime from '../runtime';
@@ -128,7 +128,8 @@ export function buildRequest(options: CreateBackendApiOptions) {
       }
 
       // TODO: Parse JSON or Text response based on a response header
-      const isJSONResponse = headers['Content-Type'] === 'application/json';
+      const isJSONResponse =
+        res?.headers && res.headers?.get(constants.Headers.ContentType) === constants.ContentTypes.Json;
       const data = await (isJSONResponse ? res.json() : res.text());
 
       if (!res.ok) {

diff --git a/packages/backend/src/util/mockFetch.ts b/packages/backend/src/util/mockFetch.ts
@@ -1,11 +1,11 @@
+import { constants } from '../constants';
+
 export function jsonOk(body: unknown, status = 200) {
   // Mock response object that satisfies the window.Response interface
   const mockResponse = {
     ok: true,
     status,
-    headers: {
-      'Content-type': 'application/json',
-    },
+    headers: { get: mockHeadersGet },
     json() {
       return Promise.resolve(body);
     },
@@ -19,9 +19,7 @@ export function jsonNotOk(body: unknown) {
   const mockResponse = {
     ok: false,
     status: 422,
-    headers: {
-      'Content-type': 'application/json',
-    },
+    headers: { get: mockHeadersGet },
     json() {
       return Promise.resolve(body);
     },
@@ -35,13 +33,13 @@ export function jsonError(body: unknown, status = 500) {
   const mockResponse = {
     ok: false,
     status: status,
-    headers: {
-      'Content-type': 'application/json',
-    },
+    headers: { get: mockHeadersGet },
     json() {
       return Promise.resolve(body);
     },
   };
 
   return Promise.resolve(mockResponse);
 }
+
+const mockHeadersGet = (key: string) => (key === constants.Headers.ContentType ? constants.ContentTypes.Json : null);