Fix encoding for localhost scheme-based URLS

Shopify · Jan 22, 2025 · 7583df0 · 7583df0
1 parent d1c7789
commit 7583df0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/TophatModules/Sources/TophatServer/TophatServer.swift b/TophatModules/Sources/TophatServer/TophatServer.swift
@@ -56,7 +56,13 @@ public final class TophatServer {
 
 		let queryItems = request.queryParams.map { URLQueryItem(name: $0, value: $1) }
 
-		guard let url = baseURL?.appending(path: request.path).appending(queryItems: queryItems) else {
+		guard let baseURL = baseURL else {
+			return .internalServerError
+		}
+
+		let encodedURL = baseURL.appending(path: request.path).appending(queryItems: queryItems)
+		guard let decodedString = encodedURL.absoluteString.removingPercentEncoding,
+			  let url = URL(string: decodedString) else {
 			return .internalServerError
 		}