fix(server): proxy query string

gc-victor · Nov 10, 2023 · 228ac87 · 228ac87
1 parent 140265e
commit 228ac87
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "query"
-version = "0.3.1"
+version = "0.3.2-prerelease"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
@@ -17,7 +17,7 @@ use tracing_subscriber::FmtSubscriber;
 
 #[derive(Parser)]
 #[command(name = "Query")]
-#[command(version = "0.3.1")]
+#[command(version = "0.3.2-prerelease")]
 #[command(about = "The CLI to manage your Query Server instance", long_about = None)]
 struct Cli {
     #[command(subcommand)]

diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "query-server"
-version = "0.3.1"
+version = "0.3.2-prerelease"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

diff --git a/crates/server/src/controllers/proxy.rs b/crates/server/src/controllers/proxy.rs
@@ -8,7 +8,12 @@ use super::utils::http_error::HttpError;
 #[instrument(err(Debug), skip(req))]
 pub async fn proxy(req: &mut Request<Body>) -> Result<Response<Body>, HttpError> {
     let path = req.uri().path().to_string();
-    let target_url = format!("http://localhost:{}{}", Env::proxy_port(), path);
+    let query = match req.uri().query() {
+        Some(query) => format!("?{}", query.to_string()),
+        None => "".to_string(),
+    };
+    let target_url = format!("http://localhost:{}{}{}", Env::proxy_port(), path, query);
+
     let headers = req.headers().clone();
     let body_bytes = match hyper::body::to_bytes(req.body_mut()).await {
         Ok(body_bytes) => body_bytes,