From 4d25f11862feb0acec2d5868b7d7d8c363e0f6d3 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Thu, 12 Oct 2023 20:05:05 -0300
Subject: [PATCH] fix: Some HTTP requests sent by apps don't have their data
 parsed into JSON (#30560)

---
 .changeset/stale-masks-learn.md      |  5 +++++
 packages/server-fetch/src/parsers.ts | 30 +++++++++-------------------
 2 files changed, 14 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/stale-masks-learn.md

diff --git a/.changeset/stale-masks-learn.md b/.changeset/stale-masks-learn.md
new file mode 100644
index 0000000000000..1523b02b0c951
--- /dev/null
+++ b/.changeset/stale-masks-learn.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/server-fetch': patch
+---
+
+Fixed an issue where the payload of an HTTP request made by an app wouldn't be correctly encoded in some cases
diff --git a/packages/server-fetch/src/parsers.ts b/packages/server-fetch/src/parsers.ts
index 598ecbbd0e8e4..ad0a44e96cfb8 100644
--- a/packages/server-fetch/src/parsers.ts
+++ b/packages/server-fetch/src/parsers.ts
@@ -1,32 +1,20 @@
 import type { ExtendedFetchOptions, FetchOptions, OriginalFetchOptions } from './types';
 
-function isPostOrPutOrDeleteWithBody(options?: ExtendedFetchOptions): boolean {
-	// No method === 'get'
-	if (!options?.method) {
-		return false;
-	}
-	const { method, body } = options;
-	const lowerMethod = method?.toLowerCase();
-	return ['post', 'put', 'delete'].includes(lowerMethod) && body != null;
-}
-
 const jsonParser = (options: ExtendedFetchOptions) => {
 	if (!options) {
 		return {};
 	}
 
-	if (isPostOrPutOrDeleteWithBody(options)) {
-		try {
-			if (options && typeof options.body === 'object' && !Buffer.isBuffer(options.body)) {
-				options.body = JSON.stringify(options.body);
-				options.headers = {
-					'Content-Type': 'application/json',
-					...options.headers,
-				};
-			}
-		} catch (e) {
-			// Body is not JSON, do nothing
+	try {
+		if (typeof options.body === 'object' && !Buffer.isBuffer(options.body)) {
+			options.body = JSON.stringify(options.body);
+			options.headers = {
+				...options.headers,
+				'Content-Type': 'application/json', // force content type to be json
+			};
 		}
+	} catch (e) {
+		// Body is not JSON, do nothing
 	}
 
 	return options as FetchOptions;