chore: restoring previous cookie jar behaviour

Author: ShocOne

cookiejar/cookiejar.go.bk renamed to cookiejar/cookiejar.go

@@ -45,42 +45,20 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/cookiejar"
-	"net/url"
 	"strings"
 
-	"github.com/deploymenttheory/go-api-http-client/httpclient"
 	"github.com/deploymenttheory/go-api-http-client/logger"
 	"go.uber.org/zap"
 )
 
 // SetupCookieJar initializes the HTTP client with a cookie jar if enabled in the configuration.
-func SetupCookieJar(client *http.Client, clientConfig httpclient.ClientConfig, log logger.Logger) error {
-	if clientConfig.ClientOptions.Cookies.EnableCookieJar {
+func SetupCookieJar(client *http.Client, enableCookieJar bool, log logger.Logger) error {
+	if enableCookieJar {
 		jar, err := cookiejar.New(nil) // nil options use default options
 		if err != nil {
 			log.Error("Failed to create cookie jar", zap.Error(err))
 			return fmt.Errorf("setupCookieJar failed: %w", err) // Wrap and return the error
 		}
-
-		if clientConfig.ClientOptions.Cookies.CustomCookies != nil {
-			var CookieList []*http.Cookie
-			CookieList = make([]*http.Cookie, 0)
-			for k, v := range clientConfig.ClientOptions.Cookies.CustomCookies {
-				newCookie := &http.Cookie{
-					Name:  k,
-					Value: v,
-				}
-				CookieList = append(CookieList, newCookie)
-			}
-
-			cookieUrl, err := url.Parse(fmt.Sprintf("http://%s.jamfcloud.com"))
-			if err != nil {
-				return err
-			}
-
-			jar.SetCookies(cookieUrl, CookieList)
-		}
-
 		client.Jar = jar
 	}
 	return nil

cookiejar/cookiejar_test.go.bk renamed to cookiejar/cookiejar_test.go

@@ -8,10 +8,7 @@ like the baseURL, authentication details, and an embedded standard HTTP client.
 package httpclient
 
 import (
-	"fmt"
 	"net/http"
-	"net/http/cookiejar"
-	"net/url"
 	"time"
 
 	"github.com/deploymenttheory/go-api-http-client/apiintegrations/apihandler"
@@ -159,10 +156,10 @@ func BuildClient(config ClientConfig) (*Client, error) {
 	}
 
 	// Conditionally setup cookie jar
-	if err := SetupCookieJar(httpClient, config, log); err != nil {
-		log.Error("Error setting up cookie jar", zap.Error(err))
-		return nil, err
-	}
+	// if err := SetupCookieJar(httpClient, config, log); err != nil {
+	// 	log.Error("Error setting up cookie jar", zap.Error(err))
+	// 	return nil, err
+	// }
 
 	// Conditionally setup redirect handling
 	if err := redirecthandler.SetupRedirectHandler(httpClient, config.ClientOptions.Redirect.FollowRedirects, config.ClientOptions.Redirect.MaxRedirects, log); err != nil {
@@ -218,34 +215,35 @@ func BuildClient(config ClientConfig) (*Client, error) {
 
 }
 
-func SetupCookieJar(client *http.Client, clientConfig ClientConfig, log logger.Logger) error {
-	if clientConfig.ClientOptions.Cookies.EnableCookieJar {
-		jar, err := cookiejar.New(nil) // nil options use default options
-		if err != nil {
-			log.Error("Failed to create cookie jar", zap.Error(err))
-			return fmt.Errorf("setupCookieJar failed: %w", err) // Wrap and return the error
-		}
-
-		if clientConfig.ClientOptions.Cookies.CustomCookies != nil {
-			var CookieList []*http.Cookie
-			CookieList = make([]*http.Cookie, 0)
-			for k, v := range clientConfig.ClientOptions.Cookies.CustomCookies {
-				newCookie := &http.Cookie{
-					Name:  k,
-					Value: v,
-				}
-				CookieList = append(CookieList, newCookie)
-			}
-
-			cookieUrl, err := url.Parse(fmt.Sprintf("http://%s.jamfcloud.com", clientConfig.Environment.InstanceName))
-			if err != nil {
-				return err
-			}
-
-			jar.SetCookies(cookieUrl, CookieList)
-		}
-
-		client.Jar = jar
-	}
-	return nil
-}
+// // SetupCookieJar sets up the cookie jar for the HTTP client if enabled in the configuration.
+// func SetupCookieJar(client *http.Client, clientConfig ClientConfig, log logger.Logger) error {
+// 	if clientConfig.ClientOptions.Cookies.EnableCookieJar {
+// 		jar, err := cookiejar.New(nil) // nil options use default options
+// 		if err != nil {
+// 			log.Error("Failed to create cookie jar", zap.Error(err))
+// 			return fmt.Errorf("setupCookieJar failed: %w", err) // Wrap and return the error
+// 		}
+
+// 		if clientConfig.ClientOptions.Cookies.CustomCookies != nil {
+// 			var CookieList []*http.Cookie
+// 			CookieList = make([]*http.Cookie, 0)
+// 			for k, v := range clientConfig.ClientOptions.Cookies.CustomCookies {
+// 				newCookie := &http.Cookie{
+// 					Name:  k,
+// 					Value: v,
+// 				}
+// 				CookieList = append(CookieList, newCookie)
+// 			}
+
+// 			cookieUrl, err := url.Parse(fmt.Sprintf("http://%s.jamfcloud.com", clientConfig.Environment.InstanceName))
+// 			if err != nil {
+// 				return err
+// 			}
+
+// 			jar.SetCookies(cookieUrl, CookieList)
+// 		}
+
+// 		client.Jar = jar
+// 	}
+// 	return nil
+// }

httpclient/client.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"
@@ -160,7 +161,7 @@ func (c *Client) executeRequestWithRetries(method, endpoint string, body, out in
 	}
 
 	// Apply custom cookies if configured
-	// cookiejar.ApplyCustomCookies(req, c.clientConfig.ClientOptions.Cookies.CustomCookies, log)
+	cookiejar.ApplyCustomCookies(req, c.clientConfig.ClientOptions.Cookies.CustomCookies, log)
 
 	// Set request headers
 	headerHandler := headers.NewHeaderHandler(req, c.Logger, c.APIHandler, c.AuthTokenHandler)