Merge pull request #192 from thejoeker12/main

Cookies fixed hopefully

Author: ShocOne

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

@@ -45,20 +45,42 @@ 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, enableCookieJar bool, log logger.Logger) error {
-	if enableCookieJar {
+func SetupCookieJar(client *http.Client, clientConfig httpclient.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"))
+			if err != nil {
+				return err
+			}
+
+			jar.SetCookies(cookieUrl, CookieList)
+		}
+
 		client.Jar = jar
 	}
 	return nil

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

@@ -8,13 +8,16 @@ 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"
 	"github.com/deploymenttheory/go-api-http-client/authenticationhandler"
 	"github.com/deploymenttheory/go-api-http-client/concurrency"
-	"github.com/deploymenttheory/go-api-http-client/cookiejar"
+
 	"github.com/deploymenttheory/go-api-http-client/logger"
 	"github.com/deploymenttheory/go-api-http-client/redirecthandler"
 	"go.uber.org/zap"
@@ -156,7 +159,7 @@ func BuildClient(config ClientConfig) (*Client, error) {
 	}
 
 	// Conditionally setup cookie jar
-	if err := cookiejar.SetupCookieJar(httpClient, config.ClientOptions.Cookies.EnableCookieJar, log); err != nil {
+	if err := SetupCookieJar(httpClient, config, log); err != nil {
 		log.Error("Error setting up cookie jar", zap.Error(err))
 		return nil, err
 	}
@@ -214,3 +217,35 @@ func BuildClient(config ClientConfig) (*Client, error) {
 	return client, nil
 
 }
+
+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"))
+			if err != nil {
+				return err
+			}
+
+			jar.SetCookies(cookieUrl, CookieList)
+		}
+
+		client.Jar = jar
+	}
+	return nil
+}

httpclient/client.go

@@ -8,7 +8,6 @@ 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"
@@ -161,7 +160,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)
@@ -325,7 +324,7 @@ func (c *Client) executeRequest(method, endpoint string, body, out interface{})
 	}
 
 	// 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)