fix(server): proxy body utf8 error

gc-victor · Nov 10, 2023 · 3ae47a1 · 3ae47a1
1 parent 3c208ad
commit 3ae47a1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 24 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.0"
+version = "0.3.1-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.0")]
+#[command(version = "0.3.1-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.0"
+version = "0.3.1-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
@@ -43,24 +43,6 @@ pub async fn proxy(req: &mut Request<Body>) -> Result<Response<Body>, HttpError>
             })
         }
     };
-    let status = response.status();
-    let headers = response.headers().clone();
-    let body = match hyper::body::to_bytes(response.into_body()).await {
-        Ok(body) => body,
-        Err(e) => {
-            return Err(HttpError {
-                code: hyper::StatusCode::BAD_GATEWAY,
-                message: e.to_string(),
-                body: None,
-            })
-        }
-    };
-    let body = String::from_utf8(body.to_vec()).unwrap();
-
-    let mut resp = Response::new(Body::from(body));
-
-    *resp.status_mut() = status;
-    *resp.headers_mut() = headers;
 
-    Ok(resp)
+    Ok(response)
 }