try

DevExpress · miherlosev · Jun 7, 2023 · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023
commit af616979bc18955402b74f954ab63d80fef36513
diff --git a/src/api/request-hooks/request-logger.ts b/src/api/request-hooks/request-logger.ts
@@ -18,6 +18,7 @@ import {
 } from './interfaces';
 
 import { Dictionary } from '../../configuration/interfaces';
+import lowercaseObjectKeys from '../../utils/lowercase-object-keys';
 
 
 const DEFAULT_OPTIONS: RequestHookLogOptions = {
@@ -93,7 +94,7 @@ class RequestLoggerImplementation extends RequestHook {
         };
 
         if (this._options.logRequestHeaders)
-            loggedReq.request.headers = Object.assign({}, event._requestInfo.headers);
+            loggedReq.request.headers = Object.assign({}, lowercaseObjectKeys(event._requestInfo.headers as Dictionary<string>));
 
         if (this._options.logRequestBody)
             loggedReq.request.body = this._options.stringifyRequestBody ? event._requestInfo.body.toString() : event._requestInfo.body;

diff --git a/src/native-automation/request-hooks/event-factory/request-paused-event-based.ts b/src/native-automation/request-hooks/event-factory/request-paused-event-based.ts
@@ -14,7 +14,7 @@ import RequestPausedEvent = Protocol.Fetch.RequestPausedEvent;
 import Request = Protocol.Network.Request;
 import HeaderEntry = Protocol.Fetch.HeaderEntry;
 import { StatusCodes } from 'http-status-codes';
-import { convertToOutgoingHttpHeaders, lowerCaseHeaderNames } from '../../utils/headers';
+import { convertToOutgoingHttpHeaders } from '../../utils/headers';
 
 
 export default class RequestPausedEventBasedEventFactory extends BaseRequestHookEventFactory {
@@ -83,7 +83,7 @@ export default class RequestPausedEventBasedEventFactory extends BaseRequestHook
             userAgent: RequestInfo.getUserAgent(request.headers),
             url:       request.url,
             method:    request.method.toLowerCase(),
-            headers:   lowerCaseHeaderNames(request.headers),
+            headers:   request.headers,
             body:      RequestPausedEventBasedEventFactory._getRequestData(request),
             isAjax:    RequestPausedEventBasedEventFactory._getIsAjaxRequest(this._event),
         });

diff --git a/src/native-automation/utils/headers.ts b/src/native-automation/utils/headers.ts
@@ -1,6 +1,5 @@
 import Protocol from 'devtools-protocol';
 import HeaderEntry = Protocol.Fetch.HeaderEntry;
-import Headers = Protocol.Network.Headers;
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 
 
@@ -26,13 +25,3 @@ export function convertToOutgoingHttpHeaders (headers: HeaderEntry[] | undefined
     }, {});
 }
 
-export function lowerCaseHeaderNames (headers: Headers): Headers {
-    const result: Headers = {};
-
-    Object.keys(headers).forEach(name => {
-        result[name.toLowerCase()] = headers[name];
-    });
-
-    return result;
-}
-
diff --git a/src/utils/lowercase-object-keys.ts b/src/utils/lowercase-object-keys.ts
@@ -0,0 +1,11 @@
+import { Dictionary } from '../configuration/interfaces';
+
+export default function (headers: Dictionary<string>): Dictionary<string> {
+    const result: Dictionary<string> = {};
+
+    Object.keys(headers).forEach(name => {
+        result[name.toLowerCase()] = headers[name];
+    });
+
+    return result;
+}
diff --git a/test/functional/fixtures/regression/gh-7764/pages/index.html b/test/functional/fixtures/regression/gh-7764/pages/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>gh-7764</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/test/functional/fixtures/regression/gh-7764/test.js b/test/functional/fixtures/regression/gh-7764/test.js
@@ -0,0 +1,7 @@
+describe('[Regression](GH-7764)', function () {
+    it('Request logger should contain actual headers if RequestHook modified them', function () {
+        return runTests('testcafe-fixtures/index.js');
+    });
+});
+
+
diff --git a/test/functional/fixtures/regression/gh-7764/testcafe-fixtures/index.js b/test/functional/fixtures/regression/gh-7764/testcafe-fixtures/index.js
@@ -0,0 +1,29 @@
+import { RequestLogger, RequestHook } from 'testcafe';
+
+fixture`Set a Custom Referer`
+    .page`http://localhost:3000/fixtures/regression/gh-7748/pages/index.html`;
+
+export class MyRequestHook extends RequestHook {
+    constructor (requestFilterRules, responseEventConfigureOpts) {
+        super(requestFilterRules, responseEventConfigureOpts);
+    }
+
+    async onRequest (event) {
+        event.requestOptions.headers['referer'] = 'http://my-modified-referer.com';
+    }
+
+    async onResponse () {
+    }
+}
+
+const hook = new MyRequestHook();
+
+const logger = RequestLogger('http://localhost:3000/fixtures/regression/gh-7748/pages/index.html', {
+    logRequestHeaders: true,
+});
+
+test
+    .requestHooks([hook, logger])
+    ('Request logger should contain actual headers if RequestHook modified themd', async t => {
+        await t.expect(logger.requests[0].request.headers['referer']).eql('http://my-modified-referer.com');
+    });