'fix(fetch_with_meta) :: return json bodies under the documented key

Author: 81reap

CHANGELOG.md

@@ -13,6 +13,7 @@
  - `column` charts now display vertical bars instead of nothing at all.
  - `stacked` is now ignored on chart types that cannot stack, instead of displaying an empty chart.
  - Screen readers now announce the title of the modal component instead of an unnamed dialog.
+ - `sqlpage.fetch_with_meta` now returns JSON response bodies under the documented `body` key.
 
 ## v0.45
 

src/webserver/database/sqlpage_functions/functions/fetch_with_meta.rs

@@ -61,7 +61,7 @@ pub(super) async fn fetch_with_meta(
                             decode_response(body_bytes, http_request.response_encoding.as_deref())?;
                         if is_json {
                             obj.serialize_entry(
-                                "json_body",
+                                "body",
                                 &serde_json::value::RawValue::from_string(body_str)?,
                             )?;
                         } else {

tests/common/mod.rs

@@ -149,12 +149,21 @@ pub fn start_echo_server(shutdown: oneshot::Receiver<()>) -> (JoinHandle<()>, u1
     let listener = std::net::TcpListener::bind("localhost:0").unwrap();
     let port = listener.local_addr().unwrap().port();
     let server = HttpServer::new(|| {
-        App::new().default_service(fn_service(|mut req: ServiceRequest| async move {
-            let meta = format_request_line_and_headers(&req);
-            let body = format_body(&mut req).await;
-            let resp = build_echo_response(body, meta);
-            Ok(req.into_response(resp))
-        }))
+        App::new()
+            .route(
+                "/json",
+                web::to(|body: web::Bytes| async move {
+                    HttpResponse::Ok()
+                        .insert_header((header::CONTENT_TYPE, "application/json"))
+                        .body(body)
+                }),
+            )
+            .default_service(fn_service(|mut req: ServiceRequest| async move {
+                let meta = format_request_line_and_headers(&req);
+                let body = format_body(&mut req).await;
+                let resp = build_echo_response(body, meta);
+                Ok(req.into_response(resp))
+            }))
     })
     .workers(1)
     .listen(listener)

tests/sql_test_files/data/fetch_with_meta_json_body.sql

@@ -0,0 +1,5 @@
+set url = 'http://localhost:' || $echo_port || '/json';
+set fetch_req = '{"method":"POST","url":"' || $url || '","body":{"hello":"world"}}';
+set res = sqlpage.fetch_with_meta($fetch_req);
+
+select '"body":{"hello":"world"}' as expected_contains, $res as actual;