updated cookie implementation to fix failing tests. There is one brea…

…king change on the Cookie API - Cookie.decodeRequestCookie is returning LIst[String]

zio-http/src/main/scala/zhttp/http/Cookie.scala

@@ -7,7 +7,7 @@ import java.time.Instant
 import java.util.Base64.getEncoder
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
-import scala.util.Try
+import scala.util.{Failure, Success, Try}
 
 final case class Cookie(
   name: String,
@@ -187,7 +187,12 @@ object Cookie {
    * Decodes from Set-Cookie header value inside of Response into a cookie
    */
   def decodeResponseCookie(headerValue: String, secret: Option[String] = None): Option[Cookie] =
-    Try(unsafeDecodeResponseCookie(headerValue, secret)).toOption
+    Try(unsafeDecodeResponseCookie(headerValue, secret)) match {
+      case Failure(exception) =>
+        println(exception)
+        None
+      case Success(value)     => Some(value)
+    }
 
   private[zhttp] def unsafeDecodeResponseCookie(headerValue: String, secret: Option[String] = None): Cookie = {
     var name: String              = null
@@ -267,10 +272,20 @@ object Cookie {
           sameSite = Option(sameSite),
         )
       else
-        null
+        Cookie(
+          "",
+          "",
+          expires = Option(expires),
+          maxAge = maxAge,
+          domain = Option(domain),
+          path = Option(path),
+          isSecure = secure,
+          isHttpOnly = httpOnly,
+          sameSite = Option(sameSite),
+        )
 
     secret match {
-      case Some(s) => {
+      case Some(s) if s.nonEmpty => {
         if (decodedCookie != null) {
           val index     = decodedCookie.content.lastIndexOf('.')
           val signature = decodedCookie.content.slice(index + 1, decodedCookie.content.length)
@@ -281,25 +296,27 @@ object Cookie {
           else null
         } else decodedCookie
       }
-      case None    => decodedCookie
+      case _                     => decodedCookie.copy(secret = secret)
     }
 
   }
 
   /**
    * Decodes from `Cookie` header value inside of Request into a cookie
    */
-  def decodeRequestCookie(headerValue: String): Option[List[Cookie]] = {
-    val cookies: Array[String]  = headerValue.split(';').map(_.trim)
-    val x: List[Option[Cookie]] = cookies.toList.map(a => {
-      val (name, content) = splitNameContent(a)
-      if (name.isEmpty && content.isEmpty) None
-      else Some(Cookie(name, content))
-    })
-
-    if (x.contains(None))
-      None
-    else Some(x.map(_.get))
+  def decodeRequestCookie(headerValue: String): List[Cookie] = {
+    if (headerValue.nonEmpty) {
+      val cookies: Array[String]  = headerValue.split(';').map(_.trim)
+      val x: List[Option[Cookie]] = cookies.toList.map(a => {
+        val (name, content) = splitNameContent(a)
+        if (name.isEmpty && content.isEmpty) Some(Cookie("", ""))
+        else Some(Cookie(name, content))
+      })
+
+      if (x.contains(None))
+        List.empty
+      else x.map(_.get)
+    } else List.empty
   }
 
   @inline
@@ -308,7 +325,7 @@ object Cookie {
     if (i >= 0) {
       (str.substring(0, i).trim, str.substring(i + 1).trim)
     } else {
-      (str.trim, null)
+      (str.trim, "")
     }
   }
 

zio-http/src/main/scala/zhttp/http/headers/HeaderGetters.scala

@@ -163,10 +163,7 @@ trait HeaderGetters[+A] { self =>
 
   final def cookiesDecoded: List[Cookie] =
     headerValues(HeaderNames.cookie).flatMap { header =>
-      Cookie.decodeRequestCookie(header) match {
-        case None       => Nil
-        case Some(list) => list
-      }
+      Cookie.decodeRequestCookie(header)
     }
 
   final def date: Option[CharSequence] =

zio-http/src/test/scala/zhttp/http/CookieSpec.scala

@@ -23,8 +23,7 @@ object CookieSpec extends DefaultRunnableSpec {
             cookieList   <- Gen.listOf(Gen.const(Cookie(name, content)))
             cookieString <- Gen.const(cookieList.map(x => s"${x.name}=${x.content}").mkString(";"))
           } yield (cookieList, cookieString)) { case (cookies, message) =>
-            println(s"c= $cookies, m=$message")
-            assert(Cookie.decodeRequestCookie(message))(isSome(equalTo(cookies)))
+            assert(Cookie.decodeRequestCookie(message))(equalTo(cookies))
           }
         }
       }