Updating native WebSocket header logic to match RN (#13366)

slswalker · sawalkerXbox · web-flow · commit 63d919e36e0d · 2024-07-16T16:23:24.000-07:00
* Updating native WebSocket header logic to match RN

* Change files

* Fixing linting error

---------

Co-authored-by: Sam Walker &lt;sawalker@microsoft.com&gt;
diff --git a/change/react-native-windows-57ec7c25-bda3-4d67-92a7-18b67b31fbd0.json b/change/react-native-windows-57ec7c25-bda3-4d67-92a7-18b67b31fbd0.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Updating native WebSocket header logic to match RN",
+  "packageName": "react-native-windows",
+  "email": "sawalker@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Shared/Modules/WebSocketModule.cpp b/vnext/Shared/Modules/WebSocketModule.cpp
@@ -416,9 +416,8 @@ void WebSocketTurboModule::Connect(
   auto &optHeaders = options.headers;
   if (optHeaders.has_value()) {
     auto &headersVal = optHeaders.value();
-    for (const auto &headerVal : headersVal.AsArray()) {
+    for (const auto &entry : headersVal.AsObject()) {
       // Each header JSValueObject should only contain one key-value pair
-      const auto &entry = *headerVal.AsObject().cbegin();
       rcOptions.emplace(winrt::to_hstring(entry.first), entry.second.AsString());
     }
   }
diff --git a/vnext/Shared/Networking/WinRTWebSocketResource.cpp b/vnext/Shared/Networking/WinRTWebSocketResource.cpp
@@ -382,7 +382,10 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
         scheme = L"https";
       }
 
-      auto origin = winrt::hstring{scheme + L"://" + host + L":" + winrt::to_hstring(port)};
+      // Only add a port if a port is defined
+      winrt::hstring originPort = port != 0 ? L":" + winrt::to_hstring(port) : L"";
+      auto origin = winrt::hstring{scheme + L"://" + host + originPort};
+
       m_socket.SetRequestHeader(L"Origin", std::move(origin));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -416,9 +416,8 @@ void WebSocketTurboModule::Connect(`
`416`	`416`	`auto &optHeaders = options.headers;`
`417`	`417`	`if (optHeaders.has_value()) {`
`418`	`418`	`auto &headersVal = optHeaders.value();`
`419`		`- for (const auto &headerVal : headersVal.AsArray()) {`
	`419`	`+ for (const auto &entry : headersVal.AsObject()) {`
`420`	`420`	`// Each header JSValueObject should only contain one key-value pair`
`421`		`- const auto &entry = *headerVal.AsObject().cbegin();`
`422`	`421`	`rcOptions.emplace(winrt::to_hstring(entry.first), entry.second.AsString());`
`423`	`422`	`}`
`424`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,10 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c`
`382`	`382`	`scheme = L"https";`
`383`	`383`	`}`
`384`	`384`
`385`		`- auto origin = winrt::hstring{scheme + L"://" + host + L":" + winrt::to_hstring(port)};`
	`385`	`+ // Only add a port if a port is defined`
	`386`	`+ winrt::hstring originPort = port != 0 ? L":" + winrt::to_hstring(port) : L"";`
	`387`	`+ auto origin = winrt::hstring{scheme + L"://" + host + originPort};`
	`388`	`+`
`386`	`389`	`m_socket.SetRequestHeader(L"Origin", std::move(origin));`
`387`	`390`	`}`
`388`	`391`