From 07e887b8bc3d001906fa528a092ec143caad85a3 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Thu, 28 Mar 2024 05:25:47 -0400
Subject: [PATCH] handle "undefined" strings in multipart requests

---
 .../write_engine_asset/drain_multipart_request.rs    |  2 +-
 .../web_utils/read_multipart_field_bytes.rs          | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_write/write_engine_asset/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_write/write_engine_asset/drain_multipart_request.rs
index 872ed9c64e..0fd340b2ab 100644
--- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_write/write_engine_asset/drain_multipart_request.rs
+++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upsert_write/write_engine_asset/drain_multipart_request.rs
@@ -2,7 +2,7 @@ use actix_multipart::Multipart;
 use actix_web::web::BytesMut;
 use anyhow::anyhow;
 use futures::TryStreamExt;
-use log::warn;
+use log::{info, warn};
 use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_subtype::MediaFileSubtype;
 
diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs
index d9a2325a26..c8d5e758eb 100644
--- a/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs
+++ b/crates/service/web/storyteller_web/src/http_server/web_utils/read_multipart_field_bytes.rs
@@ -3,7 +3,7 @@ use actix_multipart::Field;
 use actix_web::web::BytesMut;
 use anyhow::anyhow;
 use futures::{StreamExt, TryStreamExt};
-use log::warn;
+use log::{info, warn};
 
 const MIN_BYTES : usize = 10;
 //const MAX_BYTES : usize = 1024 * 1024 * 20; // 20 Mb
@@ -46,11 +46,13 @@ pub async fn read_multipart_field_as_text(field: &mut Field) -> anyhow::Result<O
   let bytes = read_multipart_field_bytes(field).await?;
   let value = String::from_utf8(bytes.to_vec())?;
 
-  if value.is_empty() || value == "none" {
-    return Ok(None);
+  match value.as_str() {
+    ""
+      | "none"
+      | "undefined" // Javascript can send the string "undefined" for undefined payload values.
+    => Ok(None),
+    _ => Ok(Some(value)),
   }
-
-  Ok(Some(value))
 }
 
 /// Read a html form boolean (eg. input type=checkbox); assumes default is false.