From e076023cff220289171acfd6c09b298a7e1f53e9 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Fri, 26 Jul 2024 19:41:19 +0200
Subject: [PATCH] fix(federation): :bug: Make sure headers aren't overriden
 accidentally

---
 federation/requester/index.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/federation/requester/index.ts b/federation/requester/index.ts
index b759e8b..f109f2b 100644
--- a/federation/requester/index.ts
+++ b/federation/requester/index.ts
@@ -170,19 +170,19 @@ export class FederationRequester {
         extra?: RequestInit,
     ): Promise<Request> {
         const headers = new Headers({
+            Accept: "application/json",
             "User-Agent": DEFAULT_UA,
+            ...extra?.headers,
         });
 
-        if (body) {
+        if (
+            body &&
+            !(body instanceof FormData) &&
+            !headers.has("Content-Type")
+        ) {
             headers.set("Content-Type", "application/json; charset=utf-8");
         }
 
-        for (const [key, value] of Object.entries(extra?.headers || {})) {
-            headers.set(key, value);
-        }
-
-        headers.set("Accept", "application/json");
-
         const request = new Request(url, {
             method,
             headers,