From 46f293d8f6a4758cad616255a40c230889897cb4 Mon Sep 17 00:00:00 2001
From: Andrapyre <42009361+Andrapyre@users.noreply.github.com>
Date: Thu, 4 Apr 2024 06:38:49 +0200
Subject: [PATCH] adding fix with unit tests

---
 requests/src/requests/Model.scala           |   3 ++
 requests/test/resources/license.zip         | Bin 0 -> 847 bytes
 requests/test/src/requests/ModelTests.scala |  47 ++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 requests/test/resources/license.zip
 create mode 100644 requests/test/src/requests/ModelTests.scala

diff --git a/requests/src/requests/Model.scala b/requests/src/requests/Model.scala
index 797500c..4d7c679 100644
--- a/requests/src/requests/Model.scala
+++ b/requests/src/requests/Model.scala
@@ -132,6 +132,9 @@ object RequestBlob{
       partBytes.foreach {
         case(name, filename, part) =>
           writeBytes(pref + boundary + crlf)
+          part.data.headers.foreach { case (headerName, headerValue) =>
+            writeBytes(s"$headerName: $headerValue$crlf")
+          }
           writeBytes(ContentDisposition)
           out.write(name)
           if (filename.nonEmpty){
diff --git a/requests/test/resources/license.zip b/requests/test/resources/license.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0976494cd146faf5491b561ae84f4f4e610d6f15
GIT binary patch
literal 847
zcmWIWW@Zs#-~htSp*0Z<P!Pw$z`)L+z~JNQ?CKZn8XCgO!0u$jn&u3|AiA`In}Lz#
zD<cB~P%{HVY>;>VYy*LPzr%ZqPI+n6#%P7E3Spnq8`?BcarQHh1DxwP`ZiqF_`lD1
z!rQX$2^aS4JI=Fmt?zr@-)6Qw8#kG5n5eoWnDv>2jiK1?)3qCxn;qCw*K}UqzV;wr
zMEJYB#Cw<0ANt?-e}1a0`_|k-CG*2KtMX&{uQ_M474JBlx#CyCERMcr!v}o<+piWF
z39_(<*0*;{+VJggUXhdkTR0>@+4%6e3raoZ#|u`oHJ{}TxwrdPSO<IW>h<ZD+qDGl
zUo1Oz*k-}h$d5B-*!HUQuCz+4UT`a$GtX?xJE;T%JDzQ7Jsdgl<=5Lx_Dr*`-p0=+
zC4c>)WK*22mBL)XIkCz8UrZOTJ^l4U<bAgb5lwb6%xbo($KSd=dE6|0VD`G?j)cJP
zFTVQTz2SUGf6Ijr5fhi6SzG%2yWg7h<F79$FO^J}YS)&Qte<HW&~~eT-RnEOYp$-#
z*RlK*zx;AI`}f;Dam%v5>n*tA$t3&WQ`uGbliNeDA3SIy*0yI``jo1z#sYi!D=MN(
z3knaP_`d%v>!<asB3YsDc8Do(pV(S8vC|{r7<W&);G2}4VYh`gIDcMqr#Xu8{I?Iz
zX`U>P($~2LHeB+_`xL@;=A@3__Rcf&5<81$9+HoKB;UJWDU(u-gJ+<?4YwB+y^8Ut
zLZ<!hSer6a@R?WUg9*j4rz&O_@%{{ZzDmGjzCw=L=BaLC8wDeGI)t5RtT@QfW$J%<
zV%JCAQ`c1llBT}jS`#;YLs+Jg!A=p4Uj1Oh!iB3Xo)!r^9y0$E*%Qo_Xkzec_LqZs
zy2oUUifSGQt?KDHqNQ!xCiv^h)B88)>bS7PoNfv`6c(k(m@DFbrK72N=8S}l+aKO(
z+;IB1P2m3uPZoc{wF_R>?-qZ<AK=Z-p>X_FOFt6>11Kd2cr!AIFe6eqvK%Ot!@!b8
Z5R1q(AK=Z(22#!lgrPwC3D7bI1^_<aVKo2%

literal 0
HcmV?d00001

diff --git a/requests/test/src/requests/ModelTests.scala b/requests/test/src/requests/ModelTests.scala
new file mode 100644
index 0000000..4a4982d
--- /dev/null
+++ b/requests/test/src/requests/ModelTests.scala
@@ -0,0 +1,47 @@
+package requests
+
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.nio.file.{FileSystems, Path}
+
+import utest._
+
+object ModelTests extends TestSuite{
+  val tests = Tests {
+    test("multipart file uploads should contain application/octet-stream content type") {
+      val path = getClass.getResource("/license.zip").getPath
+      val file = new File(path)
+      val nioPath = FileSystems.getDefault.getPath(path)
+      val fileKey = "fileKey"
+      val fileName = "fileName"
+      
+      val javaFileMultipart = MultiPart(
+        MultiItem(
+          fileKey,
+          file,
+          fileName
+        )
+      )
+
+      val nioPathMultipart = MultiPart(
+        MultiItem(
+          fileKey,
+          nioPath,
+          fileName
+        )
+      )
+      
+      val javaFileOutputStream = new ByteArrayOutputStream()
+      val nioPathOutputStream = new ByteArrayOutputStream()
+      
+      javaFileMultipart.write(javaFileOutputStream)
+      nioPathMultipart.write(nioPathOutputStream)
+      
+      val javaFileString = new String(javaFileOutputStream.toByteArray)
+      val nioPathString = new String(nioPathOutputStream.toByteArray)
+      
+      assert(javaFileString.contains("Content-Type: application/octet-stream"))
+      assert(nioPathString.contains("Content-Type: application/octet-stream"))
+    }
+  }
+}