From 02d26008f61bfad5ae13a0bf776d79c2568dc020 Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Thu, 17 Aug 2023 17:31:36 +0200
Subject: [PATCH] fix(tracker): new fix for setSessionTokenHeader

---
 tracker/tracker/CHANGELOG.md                  |  4 ++--
 tracker/tracker/package.json                  |  2 +-
 .../src/main/modules/Network/fetchProxy.ts    | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tracker/tracker/CHANGELOG.md b/tracker/tracker/CHANGELOG.md
index 1a84cc1da..514a96daa 100644
--- a/tracker/tracker/CHANGELOG.md
+++ b/tracker/tracker/CHANGELOG.md
@@ -1,6 +1,6 @@
-# 9.0.2
+# 9.0.2 & 9.0.3 & 9.0.4
 
-- fix "setSessionTokenHeader" method
+- fixes for "setSessionTokenHeader" method
 
 # 9.0.1
 
diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json
index 4da35b8d4..cd06e6cfc 100644
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker",
   "description": "The OpenReplay tracker main package",
-  "version": "9.0.2",
+  "version": "9.0.4",
   "keywords": [
     "logging",
     "replay"
diff --git a/tracker/tracker/src/main/modules/Network/fetchProxy.ts b/tracker/tracker/src/main/modules/Network/fetchProxy.ts
index 5583efb90..4ebeccc7c 100644
--- a/tracker/tracker/src/main/modules/Network/fetchProxy.ts
+++ b/tracker/tracker/src/main/modules/Network/fetchProxy.ts
@@ -144,12 +144,19 @@ export class FetchProxyHandler<T extends typeof fetch> implements ProxyHandler<T
     this.beforeFetch(item, input as RequestInfo, init)
 
     this.setSessionTokenHeader((name, value) => {
-      argsList[1] = {
-        ...argsList[1],
-        headers: {
-          ...argsList[1]?.headers,
-          [name]: value,
-        },
+      if (argsList[1] === undefined && argsList[0] instanceof Request) {
+        return argsList[0].headers.append(name, value)
+      } else {
+        if (argsList[1].headers === undefined) {
+          argsList[1].headers = {}
+        }
+        if (argsList[1].headers instanceof Headers) {
+          argsList[1].headers.append(name, value)
+        } else if (Array.isArray(argsList[1].headers)) {
+          argsList[1].headers.push([name, value])
+        } else {
+          argsList[1].headers[name] = value
+        }
       }
     })
     return (<ReturnType<T>>target.apply(window, argsList))