changes PRs-review

DevExpress · Dec 6, 2023 · 1f5a5fd · 1f5a5fd
1 parent e8b3bee
commit 1f5a5fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/native-automation/request-pipeline/index.ts b/src/native-automation/request-pipeline/index.ts
@@ -12,7 +12,7 @@ import CertificateErrorEvent = Protocol.Security.CertificateErrorEvent;
 import HeaderEntry = Protocol.Fetch.HeaderEntry;
 import NativeAutomationRequestHookEventProvider from '../request-hooks/event-provider';
 import ResourceInjector, { ResourceInjectorOptions } from '../resource-injector';
-import { convertToHeaderEntries, getHeader } from '../utils/headers';
+import { convertToHeaderEntries, getHeaderValue } from '../utils/headers';
 
 import {
     createRequestPausedEventForResponse,
@@ -154,7 +154,7 @@ export default class NativeAutomationRequestPipeline extends NativeAutomationApi
             await this._resourceInjector.processNonProxiedContent(fulfillInfo, this._client, sessionId);
         else {
             const userScripts = await this._getUserScripts(event);
-            const contentType = getHeader(event.responseHeaders, 'content-type');
+            const contentType = getHeaderValue(event.responseHeaders, 'content-type');
 
             await this._resourceInjector.processHTMLPageContent(fulfillInfo, {
                 isIframe:       false,
@@ -199,7 +199,7 @@ export default class NativeAutomationRequestPipeline extends NativeAutomationApi
             return;
         }
 
-        const contentType = getHeader(event.responseHeaders, 'content-type');
+        const contentType = getHeaderValue(event.responseHeaders, 'content-type');
         const resourceInfo = await this._resourceInjector.getDocumentResourceInfo(event, this._client, contentType as string);
 
         if (resourceInfo.error) {

diff --git a/src/native-automation/utils/headers.ts b/src/native-automation/utils/headers.ts
@@ -25,7 +25,7 @@ export function convertToOutgoingHttpHeaders (headers: HeaderEntry[] | undefined
     }, {});
 }
 
-export function getHeader (headers: HeaderEntry[] | undefined, headerName: string): string {
-    return headers?.find(header => header.name === headerName)?.value || '';
+export function getHeaderValue (headers: HeaderEntry[] | undefined, headerName: string): string | null {
+    return headers?.find(header => header.name.toLowerCase() === headerName)?.value || null;
 }
 
diff --git a/src/native-automation/utils/string.ts b/src/native-automation/utils/string.ts
@@ -3,7 +3,7 @@ import GetResponseBodyResponse = Protocol.Network.GetResponseBodyResponse;
 import HeaderEntry = Protocol.Fetch.HeaderEntry;
 import { decodeBufferToString, encodeStringToBuffer } from 'testcafe-hammerhead';
 
-export function getResponseAsString (response: GetResponseBodyResponse, contentType = ''): string {
+export function getResponseAsString (response: GetResponseBodyResponse, contentType = 'charset=utf-8'): string {
     const bufferBody = getResponseAsBuffer(response);
 
     return decodeBufferToString(bufferBody, contentType);
@@ -15,7 +15,7 @@ export function getResponseAsBuffer (response: GetResponseBodyResponse): Buffer
         : Buffer.from(response.body);
 }
 
-export function toBase64String (str: string, contentType = ''): string {
+export function toBase64String (str: string, contentType = 'charset=utf-8'): string {
     const bufferBody = encodeStringToBuffer(str, contentType);
 
     return bufferBody.toString('base64');