From 50fb48b7f33ecf116030b50db3ccefae3276c12c Mon Sep 17 00:00:00 2001
From: Kory Prince <korylprince@gmail.com>
Date: Fri, 13 May 2022 13:24:12 -0500
Subject: [PATCH] mdmctl: don't send a request body for GET requests (#821)

---
 pkg/httputil/httputil.go         | 4 ++++
 platform/config/client.go        | 2 +-
 platform/dep/client.go           | 2 +-
 platform/dep/get_account_info.go | 4 +---
 platform/dep/sync/client.go      | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/httputil/httputil.go b/pkg/httputil/httputil.go
index 45114a53..d589ed31 100644
--- a/pkg/httputil/httputil.go
+++ b/pkg/httputil/httputil.go
@@ -97,6 +97,10 @@ func JSONErrorDecoder(r *http.Response) error {
 	return errors.New(w.Error)
 }
 
+func EncodeEmptyRequest(c context.Context, r *http.Request, request interface{}) error {
+	return nil
+}
+
 func EncodeRequestWithToken(token string, next httptransport.EncodeRequestFunc) httptransport.EncodeRequestFunc {
 	return func(ctx context.Context, r *http.Request, request interface{}) error {
 		r.SetBasicAuth("micromdm", token)
diff --git a/platform/config/client.go b/platform/config/client.go
index 3367544e..d93649e3 100644
--- a/platform/config/client.go
+++ b/platform/config/client.go
@@ -42,7 +42,7 @@ func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransp
 		getDEPTokensEndpoint = httptransport.NewClient(
 			"GET",
 			httputil.CopyURL(u, "/v1/dep-tokens"),
-			httputil.EncodeRequestWithToken(token, httptransport.EncodeJSONRequest),
+			httputil.EncodeRequestWithToken(token, httputil.EncodeEmptyRequest),
 			decodeGetDEPTokensResponse,
 			opts...,
 		).Endpoint()
diff --git a/platform/dep/client.go b/platform/dep/client.go
index d2b4f6bc..782d3bd8 100644
--- a/platform/dep/client.go
+++ b/platform/dep/client.go
@@ -65,7 +65,7 @@ func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransp
 		getAccountInfoEndpoint = httptransport.NewClient(
 			"GET",
 			httputil.CopyURL(u, "/v1/dep/account"),
-			httputil.EncodeRequestWithToken(token, httptransport.EncodeJSONRequest),
+			httputil.EncodeRequestWithToken(token, httputil.EncodeEmptyRequest),
 			decodeGetAccountInfoResponse,
 			opts...,
 		).Endpoint()
diff --git a/platform/dep/get_account_info.go b/platform/dep/get_account_info.go
index a71477be..4e24d9e9 100644
--- a/platform/dep/get_account_info.go
+++ b/platform/dep/get_account_info.go
@@ -18,7 +18,6 @@ func (svc *DEPService) GetAccountInfo(ctx context.Context) (*dep.Account, error)
 	return svc.client.Account()
 }
 
-type getAccountInfoRequest struct{}
 type getAccountInfoResponse struct {
 	*dep.Account
 	Err error `json:"err,omitempty"`
@@ -44,8 +43,7 @@ func MakeGetAccountInfoEndpoint(svc Service) endpoint.Endpoint {
 }
 
 func (e Endpoints) GetAccountInfo(ctx context.Context) (*dep.Account, error) {
-	request := getAccountInfoRequest{}
-	response, err := e.GetAccountInfoEndpoint(ctx, request)
+	response, err := e.GetAccountInfoEndpoint(ctx, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/platform/dep/sync/client.go b/platform/dep/sync/client.go
index e7a6e862..5df238a8 100644
--- a/platform/dep/sync/client.go
+++ b/platform/dep/sync/client.go
@@ -43,7 +43,7 @@ func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransp
 		getAutoAssignersEndpoint = httptransport.NewClient(
 			"GET",
 			httputil.CopyURL(u, "/v1/dep/autoassigners"),
-			httputil.EncodeRequestWithToken(token, httptransport.EncodeJSONRequest),
+			httputil.EncodeRequestWithToken(token, httputil.EncodeEmptyRequest),
 			decodeGetAutoAssignersResponse,
 			opts...,
 		).Endpoint()