Merge pull request #118 from deploymenttheory/dev

relocated header helper fuction

Author: ShocOne

apihandlers/msgraph/msgraph_api_headers.go

@@ -64,7 +64,7 @@ func (g *GraphAPIHandler) GetAPIRequestHeaders(endpoint string) map[string]strin
 		"Accept":        g.GetAcceptHeader(),                        // Dynamically set based on API requirements.
 		"Content-Type":  g.GetContentTypeHeader(endpoint, g.Logger), // Dynamically set based on the endpoint.
 		"Authorization": "",                                         // To be set by the client with the actual token.
-		"User-Agent":    "go-api-http-client-graph-handler",         // To be set by the client, usually with application info.
+		"User-Agent":    "go-api-http-client-msgraph-handler",       // To be set by the client, usually with application info.
 	}
 	return headers
 }

httpclient/httpclient_client.go

@@ -126,6 +126,7 @@ func BuildClient(config ClientConfig) (*Client, error) {
 		log.Error("Failed to set up redirect handler", zap.Error(err))
 		return nil, err
 	}
+
 	// Create a new HTTP client with the provided configuration.
 	client := &Client{
 		APIHandler:         apiHandler,

httpclient/httpclient_headers.go

@@ -155,3 +155,19 @@ func CheckDeprecationHeader(resp *http.Response, log logger.Logger) {
 		)
 	}
 }
+
+// RedactSensitiveHeaderData redacts sensitive data if the HideSensitiveData flag is set to true.
+func RedactSensitiveHeaderData(client *Client, key string, value string) string {
+	if client.clientConfig.ClientOptions.HideSensitiveData {
+		// Define sensitive data keys that should be redacted.
+		sensitiveKeys := map[string]bool{
+			"AccessToken":   true,
+			"Authorization": true,
+		}
+
+		if _, found := sensitiveKeys[key]; found {
+			return "REDACTED"
+		}
+	}
+	return value
+}

httpclient/httpclient_headers_test.go

@@ -142,3 +142,34 @@ func TestSetCustomHeader(t *testing.T) {
 	SetCustomHeader(req, "X-Custom-Header", "CustomValue")
 	assert.Equal(t, "CustomValue", req.Header.Get("X-Custom-Header"))
 }
+
+// TestRedactSensitiveData tests the RedactSensitiveData function with various scenarios
+func TestRedactSensitiveData(t *testing.T) {
+	tests := []struct {
+		name            string
+		hideSensitive   bool
+		key             string
+		value           string
+		expectedOutcome string
+	}{
+		{"RedactSensitiveKey", true, "AccessToken", "secret-token", "REDACTED"},
+		{"RedactSensitiveKeyAuthorization", true, "Authorization", "Bearer secret-token", "REDACTED"},
+		{"DoNotRedactNonSensitiveKey", true, "NonSensitiveKey", "non-sensitive-value", "non-sensitive-value"},
+		{"DoNotRedactWhenDisabled", false, "AccessToken", "secret-token", "secret-token"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client := &Client{
+				clientConfig: ClientConfig{
+					ClientOptions: ClientOptions{
+						HideSensitiveData: tt.hideSensitive,
+					},
+				},
+			}
+
+			result := RedactSensitiveHeaderData(client, tt.key, tt.value)
+			assert.Equal(t, tt.expectedOutcome, result, "Redaction outcome should match expected")
+		})
+	}
+}

httpclient/httpclient_helpers.go

@@ -9,19 +9,3 @@ import (
 func ParseISO8601Date(dateStr string) (time.Time, error) {
 	return time.Parse(time.RFC3339, dateStr)
 }
-
-// RedactSensitiveHeaderData redacts sensitive data if the HideSensitiveData flag is set to true.
-func RedactSensitiveHeaderData(client *Client, key string, value string) string {
-	if client.clientConfig.ClientOptions.HideSensitiveData {
-		// Define sensitive data keys that should be redacted.
-		sensitiveKeys := map[string]bool{
-			"AccessToken":   true,
-			"Authorization": true,
-		}
-
-		if _, found := sensitiveKeys[key]; found {
-			return "REDACTED"
-		}
-	}
-	return value
-}

httpclient/httpclient_helpers_test.go

@@ -44,34 +44,3 @@ func TestParseISO8601Date(t *testing.T) {
 		})
 	}
 }
-
-// TestRedactSensitiveData tests the RedactSensitiveData function with various scenarios
-func TestRedactSensitiveData(t *testing.T) {
-	tests := []struct {
-		name            string
-		hideSensitive   bool
-		key             string
-		value           string
-		expectedOutcome string
-	}{
-		{"RedactSensitiveKey", true, "AccessToken", "secret-token", "REDACTED"},
-		{"RedactSensitiveKeyAuthorization", true, "Authorization", "Bearer secret-token", "REDACTED"},
-		{"DoNotRedactNonSensitiveKey", true, "NonSensitiveKey", "non-sensitive-value", "non-sensitive-value"},
-		{"DoNotRedactWhenDisabled", false, "AccessToken", "secret-token", "secret-token"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &Client{
-				clientConfig: ClientConfig{
-					ClientOptions: ClientOptions{
-						HideSensitiveData: tt.hideSensitive,
-					},
-				},
-			}
-
-			result := RedactSensitiveHeaderData(client, tt.key, tt.value)
-			assert.Equal(t, tt.expectedOutcome, result, "Redaction outcome should match expected")
-		})
-	}
-}