From f800c9d760ab3271532c42a507fbaf2bf190fc4b Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Mon, 17 Mar 2025 19:18:19 +0100
Subject: [PATCH] fix(base-driver): Exclude proxied headers from the server
 response (#21120)

---
 packages/base-driver/lib/jsonwp-proxy/proxy.js            | 7 +------
 packages/base-driver/test/unit/jsonwp-proxy/proxy.spec.js | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/base-driver/lib/jsonwp-proxy/proxy.js b/packages/base-driver/lib/jsonwp-proxy/proxy.js
index 292f86345..9d45bf9a4 100644
--- a/packages/base-driver/lib/jsonwp-proxy/proxy.js
+++ b/packages/base-driver/lib/jsonwp-proxy/proxy.js
@@ -428,18 +428,13 @@ export class JWProxy {
         /** @type {import('@appium/types').HTTPMethod} */ (req.method),
         req.body
       );
-      for (const [name, value] of _.toPairs(response.headers)) {
-        if (!_.isNil(value)) {
-          res.setHeader(name, _.isBoolean(value) ? String(value) : value);
-        }
-      }
       statusCode = response.statusCode;
     } catch (err) {
       [statusCode, resBodyObj] = getResponseForW3CError(
         isErrorType(err, errors.ProxyRequestError) ? err.getActualError() : err
       );
     }
-    res.set('content-type', 'application/json; charset=utf-8');
+    res.setHeader('content-type', 'application/json; charset=utf-8');
     if (!_.isPlainObject(resBodyObj)) {
       const error = new errors.UnknownError(
         `The downstream server response with the status code ${statusCode} is not a valid JSON object: ` +
diff --git a/packages/base-driver/test/unit/jsonwp-proxy/proxy.spec.js b/packages/base-driver/test/unit/jsonwp-proxy/proxy.spec.js
index a4a123660..268291c16 100644
--- a/packages/base-driver/test/unit/jsonwp-proxy/proxy.spec.js
+++ b/packages/base-driver/test/unit/jsonwp-proxy/proxy.spec.js
@@ -7,9 +7,6 @@ function buildReqRes(url, method, body) {
   let req = {originalUrl: url, method, body};
   let res = {};
   res.headers = {};
-  res.set = (k, v) => {
-    res[k] = v;
-  };
   res.setHeader = (k, v) => {
     res.headers[k] = v;
   };