From c672882c447adfd54344b038f2b7c8ba87f6bc06 Mon Sep 17 00:00:00 2001
From: Jelle De Loecker <jelle@elevenways.be>
Date: Fri, 27 Dec 2024 12:42:50 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20`Conduit#parseRequest()`?=
 =?UTF-8?q?=20forgetting=20GET=20query=20parameters=20when=20overriding=20?=
 =?UTF-8?q?respone=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md         | 4 ++++
 lib/class/conduit.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e5e1dda..adc1ce15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.4.0-alpha.9 (WIP)
+
+* Fix `Conduit#parseRequest()` forgetting GET query parameters when overriding respone url
+
 ## 1.4.0-alpha.8 (2024-11-28)
 
 * Fix `_modelInstance` cache when keys are not strings
diff --git a/lib/class/conduit.js b/lib/class/conduit.js
index 4aa32f5e..3a1bd3ee 100644
--- a/lib/class/conduit.js
+++ b/lib/class/conduit.js
@@ -511,7 +511,7 @@ Conduit.setMethod(function time() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.18
+ * @version  1.4.0
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -541,7 +541,7 @@ Conduit.setMethod(async function parseRequest() {
 	}
 
 	if (this.rewritten_request_route_param) {
-		let params = Object.assign({}, this.route_string_parameters, this.rewritten_request_route_param);
+		let params = Object.assign({...this.url.query}, this.route_string_parameters, this.rewritten_request_route_param);
 		let new_url = this.route.generateUrl(params, this);
 		this.overrideResponseUrl(new_url);
 	}