fix: respect protocol from browser for manual setup (#3675)

alexander-akait · web-flow · commit cdcabb240f9a · 2021-08-18T19:42:14.000+03:00
diff --git a/client-src/utils/createSocketURL.js b/client-src/utils/createSocketURL.js
@@ -21,7 +21,7 @@ function createSocketURL(parsedURL) {
     hostname = self.location.hostname;
   }
 
-  let socketURLProtocol = parsedURL.protocol || "ws:";
+  let socketURLProtocol = parsedURL.protocol || self.location.protocol;
 
   // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
   if (
diff --git a/test/client/utils/createSocketURL.test.js b/test/client/utils/createSocketURL.test.js
@@ -55,7 +55,7 @@ describe("'createSocketURL' function ", () => {
 
     ["?hostname=%3A%3A", "http://example.com:8080", "ws://example.com:8080/ws"],
     ["?hostname=%3A%3A1", "http://example.com:8080", "ws://[::1]:8080/ws"],
-    ["?hostname=%3A%3A1", "https://example.com:8080", "ws://[::1]:8080/ws"],
+    ["?hostname=%3A%3A1", "https://example.com:8080", "wss://[::1]:8080/ws"],
     [
       "?hostname=%3A%3A",
       "https://example.com:8080",

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function createSocketURL(parsedURL) {`
`21`	`21`	`hostname = self.location.hostname;`
`22`	`22`	`}`
`23`	`23`
`24`		`- let socketURLProtocol = parsedURL.protocol \|\| "ws:";`
	`24`	`+ let socketURLProtocol = parsedURL.protocol \|\| self.location.protocol;`
`25`	`25`
`26`	`26`	`// When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.`
`27`	`27`	`if (`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ describe("'createSocketURL' function ", () => {`
`55`	`55`
`56`	`56`	`["?hostname=%3A%3A", "http://example.com:8080", "ws://example.com:8080/ws"],`
`57`	`57`	`["?hostname=%3A%3A1", "http://example.com:8080", "ws://[::1]:8080/ws"],`
`58`		`- ["?hostname=%3A%3A1", "https://example.com:8080", "ws://[::1]:8080/ws"],`
	`58`	`+ ["?hostname=%3A%3A1", "https://example.com:8080", "wss://[::1]:8080/ws"],`
`59`	`59`	`[`
`60`	`60`	`"?hostname=%3A%3A",`
`61`	`61`	`"https://example.com:8080",`