update

.gitea/workflows/build.yaml

@@ -25,6 +25,7 @@ jobs:
         run: |
           kubectl rollout restart deployment/cart-backoffice-x86 -n cart
           kubectl rollout restart deployment/cart-actor-x86 -n cart
+          kubectl rollout restart deployment/checkout-actor-x86 -n cart
 
   BuildAndDeployArm64:
     runs-on: arm64

cmd/checkout/pool-server.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"log"
 	"net/http"
 	"os"
@@ -227,7 +226,7 @@ func (s *CheckoutPoolServer) StartCheckoutHandler(w http.ResponseWriter, r *http
 	}
 
 	// Set checkout cookie
-	w.Header().Set("Set-Cookie", fmt.Sprintf("checkout_id=%s; Path=/; HttpOnly; SameSite=Lax", checkoutId.String()))
+	setCheckoutCookie(w, result.Result.Id, r.TLS != nil)
 
 	if err := s.WriteResult(w, result.Result); err != nil {
 		logger.Error("failed to write result", "error", err)
@@ -365,7 +364,7 @@ func (s *CheckoutPoolServer) Serve(mux *http.ServeMux) {
 			handlerFunc(w, r)
 		}))
 	}
-	handleFunc("/payment/adyen/session", CheckoutIdHandler(s.AdyenSessionHandler))
+	handleFunc("/payment/adyen/session", CookieCheckoutIdHandler(s.AdyenSessionHandler))
 	handleFunc("/payment/adyen/push", s.AdyenHookHandler)
 	handleFunc("/payment/adyen/return", s.AdyenReturnHandler)
 	//handleFunc("/payment/adyen/cancel", s.AdyenCancelHandler)
@@ -383,17 +382,17 @@ func (s *CheckoutPoolServer) Serve(mux *http.ServeMux) {
 	orderHandler.DefineQueue()
 
 	handleFunc("POST /api/checkout/start/{cartid}", s.StartCheckoutHandler)
-	handleFunc("GET /api/checkout", CheckoutIdHandler(s.ProxyHandler(s.GetCheckoutHandler)))
+	handleFunc("GET /api/checkout", CookieCheckoutIdHandler(s.ProxyHandler(s.GetCheckoutHandler)))
-	handleFunc("POST /api/checkout/delivery", CheckoutIdHandler(s.ProxyHandler(s.SetDeliveryHandler)))
+	handleFunc("POST /api/checkout/delivery", CookieCheckoutIdHandler(s.ProxyHandler(s.SetDeliveryHandler)))
-	handleFunc("DELETE /api/checkout/delivery", CheckoutIdHandler(s.ProxyHandler(s.RemoveDeliveryHandler)))
+	handleFunc("DELETE /api/checkout/delivery", CookieCheckoutIdHandler(s.ProxyHandler(s.RemoveDeliveryHandler)))
-	handleFunc("POST /api/checkout/pickup-point", CheckoutIdHandler(s.ProxyHandler(s.SetPickupPointHandler)))
+	handleFunc("POST /api/checkout/pickup-point", CookieCheckoutIdHandler(s.ProxyHandler(s.SetPickupPointHandler)))
-	handleFunc("POST /api/checkout/initialize", CheckoutIdHandler(s.ProxyHandler(s.InitializeCheckoutHandler)))
+	handleFunc("POST /api/checkout/initialize", CookieCheckoutIdHandler(s.ProxyHandler(s.InitializeCheckoutHandler)))
-	handleFunc("POST /api/checkout/inventory-reserved", CheckoutIdHandler(s.ProxyHandler(s.InventoryReservedHandler)))
+	handleFunc("POST /api/checkout/inventory-reserved", CookieCheckoutIdHandler(s.ProxyHandler(s.InventoryReservedHandler)))
-	handleFunc("POST /api/checkout/order-created", CheckoutIdHandler(s.ProxyHandler(s.OrderCreatedHandler)))
+	handleFunc("POST /api/checkout/order-created", CookieCheckoutIdHandler(s.ProxyHandler(s.OrderCreatedHandler)))
-	handleFunc("POST /api/checkout/confirmation-viewed", CheckoutIdHandler(s.ProxyHandler(s.ConfirmationViewedHandler)))
+	handleFunc("POST /api/checkout/confirmation-viewed", CookieCheckoutIdHandler(s.ProxyHandler(s.ConfirmationViewedHandler)))
 
-	handleFunc("GET /payment/klarna/session", CheckoutIdHandler(s.ProxyHandler(s.KlarnaSessionHandler)))
+	handleFunc("GET /payment/klarna/session", CookieCheckoutIdHandler(s.ProxyHandler(s.KlarnaSessionHandler)))
-	handleFunc("GET /payment/klarna/checkout", CheckoutIdHandler(s.ProxyHandler(s.KlarnaHtmlCheckoutHandler)))
+	handleFunc("GET /payment/klarna/checkout", CookieCheckoutIdHandler(s.ProxyHandler(s.KlarnaHtmlCheckoutHandler)))
 
 	handleFunc("GET /payment/klarna/confirmation/{order_id}", s.KlarnaConfirmationHandler)
 

cmd/checkout/utils.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 	"strings"
+	"time"
 
 	"git.k6n.net/go-cart-actor/pkg/cart"
 	"git.k6n.net/go-cart-actor/pkg/checkout"
@@ -64,29 +65,45 @@ func (a *CheckoutPoolServer) reserveInventory(ctx context.Context, grain *checko
 	return nil
 }
 
-func CheckoutIdHandler(fn func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error) func(w http.ResponseWriter, r *http.Request) {
+const checkoutCookieName = "checkoutid"
+
+func setCheckoutCookie(w http.ResponseWriter, checkoutId checkout.CheckoutId, tls bool) {
+	http.SetCookie(w, &http.Cookie{
+		Name:     checkoutCookieName,
+		Value:    checkoutId.String(),
+		Secure:   tls,
+		HttpOnly: true,
+		Path:     "/",
+		Expires:  time.Now().AddDate(0, 0, 14),
+		SameSite: http.SameSiteLaxMode,
+	})
+}
+
+func CookieCheckoutIdHandler(fn func(w http.ResponseWriter, r *http.Request, checkoutId checkout.CheckoutId) error) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+
 		var id checkout.CheckoutId
-		raw := r.PathValue("id")
+		cookie, err := r.Cookie(checkoutCookieName)
-		if raw == "" {
+		if err != nil || cookie.Value == "" {
-			id = checkout.CheckoutId(cart.MustNewCartId())
+			w.WriteHeader(http.StatusNotAcceptable)
-			w.Header().Set("Set-Checkout-Id", id.String())
+			return
 		} else {
-			if parsedId, ok := cart.ParseCartId(raw); !ok {
+			parsed, ok := cart.ParseCartId(cookie.Value)
-				w.WriteHeader(http.StatusBadRequest)
+			if !ok {
-				w.Write([]byte("checkout id is invalid"))
+				w.WriteHeader(http.StatusNotAcceptable)
 				return
 			} else {
-				id = checkout.CheckoutId(parsedId)
+				id = parsed
 			}
 		}
 
-		err := fn(w, r, id)
+		err = fn(w, r, id)
 		if err != nil {
 			log.Printf("Server error, not remote error: %v\n", err)
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(err.Error()))
 		}
+
 	}
 }