Merge branch 'main' into dev-jl-testing

Author: thejoeker12

jamf/jamfprointegration/marshall.go

@@ -34,7 +34,7 @@ import (
 //   - Logs the marshaled request body for POST, PUT, and PATCH methods using the integrated logger.
 //   - Logs an error if marshaling fails and returns the error.
 //   - Returns an error if the format is invalid.
-func (j *Integration) marshalRequest(body interface{}, method string, endpoint string) ([]byte, error) {
+func (j *Integration) marshalRequest(body interface{}, _ string, endpoint string) ([]byte, error) {
 	var (
 		data []byte
 		err  error
@@ -54,9 +54,9 @@ func (j *Integration) marshalRequest(body interface{}, method string, endpoint s
 			return nil, err
 		}
 
-		if method == "POST" || method == "PUT" {
-			j.Sugar.Debug("XML Request Body", zap.String("Body", string(data)))
-		}
+		// if method == "POST" || method == "PUT" {
+		// 	j.Sugar.Debug("XML Request Body", zap.String("Body", string(data)))
+		// }
 
 		return data, nil
 

jamf/jamfprointegration/preprequest.go

@@ -22,8 +22,13 @@ import (
 //   - Checks and refreshes the token if necessary using the Integration's checkRefreshToken method.
 //   - Adds an "Authorization" header with a Bearer token obtained from the Integration's auth.getTokenString method.
 func (j *Integration) prepRequest(req *http.Request) error {
+
+	j.Sugar.Debugw("LOG-CONTENT-TYPE", "METHOD", req.Method, "URL", req.URL.String())
+	if req.Method != "GET" && req.Method != "DELETE" {
+		req.Header.Add("Content-Type", j.getContentTypeHeader(req.URL.String()))
+	}
+
 	req.Header.Add("Accept", j.getAcceptHeader())
-	req.Header.Add("Content-Type", j.getContentTypeHeader(req.URL.String()))
 	req.Header.Add("User-Agent", j.getUserAgentHeader())
 
 	j.Sugar.Debug("request headers added, refreshing token")
@@ -38,7 +43,5 @@ func (j *Integration) prepRequest(req *http.Request) error {
 
 	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", j.auth.getTokenString()))
 
-	j.Sugar.Debug("header added")
-
 	return nil
 }