Merge branch 'master' into bowen/#450

goravel · Jul 3, 2024 · 311f5b7 · 311f5b7
2 parents 168c398 + 014b541
commit 311f5b7
Show file tree

Hide file tree

Showing 3 changed files with 259 additions and 606 deletions.
diff --git a/context_response.go b/context_response.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-
 	contractshttp "github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/support/carbon"
 )
 
 type ContextResponse struct {
@@ -19,6 +19,11 @@ func NewContextResponse(instance *gin.Context, origin contractshttp.ResponseOrig
 }
 
 func (r *ContextResponse) Cookie(cookie contractshttp.Cookie) contractshttp.ContextResponse {
+	if cookie.MaxAge == 0 {
+		if !cookie.Expires.IsZero() {
+			cookie.MaxAge = int(cookie.Expires.Sub(carbon.Now().StdTime()).Seconds())
+		}
+	}
 	r.instance.SetCookie(cookie.Name, cookie.Value, cookie.MaxAge, cookie.Path, cookie.Domain, cookie.Secure, cookie.HttpOnly)
 
 	return r