Merge pull request #150 from deploymenttheory/dev

refactored func HandleAPISuccessResponse

Author: ShocOne

headers/headers.go

@@ -9,6 +9,7 @@ import (
 	"github.com/deploymenttheory/go-api-http-client/apiintegrations/apihandler"
 	"github.com/deploymenttheory/go-api-http-client/authenticationhandler"
 	"github.com/deploymenttheory/go-api-http-client/headers/redact"
+	"github.com/deploymenttheory/go-api-http-client/version"
 
 	"github.com/deploymenttheory/go-api-http-client/logger"
 	"go.uber.org/zap"
@@ -97,6 +98,11 @@ func SetCustomHeader(req *http.Request, headerName, headerValue string) {
 	req.Header.Set(headerName, headerValue)
 }
 
+// SetUserAgentHeader sets the User-Agent header for an HTTP request.
+func SetUserAgentHeader() string {
+	return fmt.Sprintf("%s/%s", version.UserAgentBase, version.SDKVersion)
+}
+
 // SetRequestHeaders sets the necessary HTTP headers for a given request using the APIHandler to determine the required headers.
 func (h *HeaderHandler) SetRequestHeaders(endpoint string) {
 	// Retrieve the standard headers required for the request

headers/headers_test.go

@@ -2,11 +2,13 @@
 package headers
 
 import (
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
 	"github.com/deploymenttheory/go-api-http-client/authenticationhandler"
+	"github.com/deploymenttheory/go-api-http-client/version"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -127,6 +129,14 @@ func TestSetCustomHeader(t *testing.T) {
 	assert.Equal(t, headerValue, req.Header.Get(headerName), "Custom header should be correctly set")
 }
 
+// TestSetUserAgentHeader verifies that the SetUserAgentHeader function returns the expected user agent string
+func TestSetUserAgentHeader(t *testing.T) {
+	expectedUserAgent := fmt.Sprintf("%s/%s", version.UserAgentBase, version.SDKVersion)
+	userAgent := SetUserAgentHeader()
+
+	assert.Equal(t, expectedUserAgent, userAgent, "User agent string should match expected format")
+}
+
 // TestSetRequestHeaders verifies that standard headers, including a custom Authorization header,
 // are set correctly on the HTTP request based on headers provided by a mock APIHandler.
 // TODO need to implement MockAPIHandler

response/success.go

@@ -4,6 +4,7 @@ and unmarshals the response based on the content type (JSON or XML). */
 package response
 
 import (
+	"bytes"
 	"encoding/json"
 	"encoding/xml"
 	"errors"
@@ -32,18 +33,26 @@ func HandleAPISuccessResponse(resp *http.Response, out interface{}, log logger.L
 		return handleDeleteRequest(resp, log)
 	}
 
-	// No need to read the entire body into memory, pass resp.Body directly.
-	logResponseDetails(resp, nil, log) // Updated to handle nil bodyBytes.
+	// Create a buffer to hold a copy of the response body
+	var bodyBuffer bytes.Buffer
+
+	// Use TeeReader to read the response body and simultaneously write it to the buffer
+	teeReader := io.TeeReader(resp.Body, &bodyBuffer)
+
+	// log the response body
+	logResponseDetails(resp, bodyBuffer.Bytes(), log)
 
 	mimeType, _ := ParseContentTypeHeader(resp.Header.Get("Content-Type"))
 	contentDisposition := resp.Header.Get("Content-Disposition")
 
 	if handler, ok := responseUnmarshallers[mimeType]; ok {
-		// Pass resp.Body directly to the handler for streaming.
-		return handler(resp.Body, out, log, mimeType)
+		// Replace the response body with a new reader that reads from the buffer, allowing it to be read again
+		resp.Body = io.NopCloser(&bodyBuffer)
+		return handler(teeReader, out, log, mimeType) // Use teeReader here to unmarshal from the original response body
 	} else if isBinaryData(mimeType, contentDisposition) {
-		// For binary data, we still need to handle the body directly.
-		return handleBinaryData(resp.Body, log, out, mimeType, contentDisposition)
+		// Replace the response body with a new reader that reads from the buffer, allowing it to be read again
+		resp.Body = io.NopCloser(&bodyBuffer)
+		return handleBinaryData(teeReader, log, out, mimeType, contentDisposition) // Use teeReader here to handle binary data
 	} else {
 		errMsg := fmt.Sprintf("unexpected MIME type: %s", mimeType)
 		log.Error("Unmarshal error", zap.String("content type", mimeType), zap.Error(errors.New(errMsg)))

version/version.go

@@ -1,13 +1,7 @@
 // version.go
 package version
 
-import "fmt"
-
 const (
-	SDKVersion    = "0.0.90"
+	SDKVersion    = "0.1.21"
 	UserAgentBase = "go-api-http-client"
 )
-
-func GetUserAgentHeader() string {
-	return fmt.Sprintf("%s/%s", UserAgentBase, SDKVersion)
-}