Add GetCookies middleware and SerializeCookies function

Author: ShocOne

cookiejar/cookiejar.go

@@ -12,7 +12,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/cookiejar"
-	"net/url"
 	"strings"
 
 	"github.com/deploymenttheory/go-api-http-client/logger"
@@ -32,6 +31,35 @@ func SetupCookieJar(client *http.Client, enableCookieJar bool, log logger.Logger
 	return nil
 }
 
+// GetCookies is a middleware that extracts cookies from incoming requests and serializes them.
+func GetCookies(next http.Handler, log logger.Logger) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+
+		// Extract cookies from the request
+		cookies := r.Cookies()
+
+		// Serialize the cookies
+		serializedCookies := SerializeCookies(cookies)
+
+		// Log the serialized cookies
+		log.Info("Serialized Cookies", zap.String("Cookies", serializedCookies))
+
+		// Call the next handler in the chain
+		next.ServeHTTP(w, r)
+	})
+}
+
+// SerializeCookies serializes a slice of *http.Cookie into a string format.
+func SerializeCookies(cookies []*http.Cookie) string {
+	var cookieStrings []string
+
+	for _, cookie := range cookies {
+		cookieStrings = append(cookieStrings, cookie.String())
+	}
+
+	return strings.Join(cookieStrings, "; ")
+}
+
 // RedactSensitiveCookies redacts sensitive information from cookies.
 // It takes a slice of *http.Cookie and returns a redacted slice of *http.Cookie.
 func RedactSensitiveCookies(cookies []*http.Cookie) []*http.Cookie {
@@ -74,28 +102,3 @@ func ParseCookieHeader(header string) *http.Cookie {
 	}
 	return nil
 }
-
-// PrintCookies prints the cookies stored in the HTTP client's cookie jar for a given URL.
-func PrintCookies(client *http.Client, urlString string, log logger.Logger) {
-	if client.Jar == nil {
-		log.Error("Cookie jar is not initialized.")
-		return
-	}
-
-	// Correctly use url.Parse for parsing the URL string
-	parsedURL, err := url.Parse(urlString)
-	if err != nil {
-		log.Error("Failed to parse URL for cookie jar", zap.Error(err))
-		return
-	}
-
-	cookies := client.Jar.Cookies(parsedURL)
-	if len(cookies) == 0 {
-		log.Info("No cookies found for URL", zap.String("url", urlString))
-		return
-	}
-
-	for _, cookie := range cookies {
-		log.Info("Cookie", zap.String("Name", cookie.Name), zap.String("Value", cookie.Value))
-	}
-}

httpclient/request.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/deploymenttheory/go-api-http-client/authenticationhandler"
+	"github.com/deploymenttheory/go-api-http-client/cookiejar"
 	"github.com/deploymenttheory/go-api-http-client/headers"
 	"github.com/deploymenttheory/go-api-http-client/httpmethod"
 	"github.com/deploymenttheory/go-api-http-client/logger"
@@ -336,8 +337,11 @@ func (c *Client) executeRequest(method, endpoint string, body, out interface{})
 		return nil, err
 	}
 
-	// Log incoming cookies
-	log.LogCookies("incoming", req, method, endpoint)
+	// Get Cookies
+	cookiejar.GetCookies(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Log outgoing cookies
+		log.LogCookies("incoming", r, method, endpoint)
+	}), c.Logger).ServeHTTP(nil, req)
 
 	// Checks for the presence of a deprecation header in the HTTP response and logs if found.
 	headers.CheckDeprecationHeader(resp, log)