ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-10 19:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

add common http functions to httputil pkg (#350)

Browse Source
This commit is contained in:
Victor Vrantchan
2017-12-09 21:14:42 -05:00
committed by GitHub
parent abe10a1b2c
commit 45aacebb02
15 changed files with 189 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/remove/client.go
View File

@@ -1,13 +1,12 @@
package remove
import (
"context"
"net/http"
"net/url"
"github.com/go-kit/kit/endpoint"
"github.com/go-kit/kit/log"
httptransport "github.com/go-kit/kit/transport/http"
"github.com/micromdm/micromdm/pkg/httputil"
)
func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransport.ClientOption) (Service, error) {
@@ -20,8 +19,8 @@ func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransp
{
blockDeviceEndpoint = httptransport.NewClient(
"POST",
copyURL(u, ""), // empty path, modified by the encodeRequest func
encodeRequestWithToken(token, encodeBlockDeviceRequest),
httputil.CopyURL(u, ""), // empty path, modified by the encodeRequest func
httputil.EncodeRequestWithToken(token, encodeBlockDeviceRequest),
decodeBlockDeviceResponse,
opts...,
).Endpoint()
@@ -31,8 +30,8 @@ func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransp
{
unblockDeviceEndpoint = httptransport.NewClient(
"POST",
copyURL(u, ""), //modified by encodeRequestFunc
encodeRequestWithToken(token, encodeUnblockDeviceRequest),
httputil.CopyURL(u, ""), //modified by encodeRequestFunc
httputil.EncodeRequestWithToken(token, encodeUnblockDeviceRequest),
decodeUnblockDeviceResponse,
opts...,
).Endpoint()
@@ -43,16 +42,3 @@ func NewHTTPClient(instance, token string, logger log.Logger, opts ...httptransp
UnblockDeviceEndpoint: unblockDeviceEndpoint,
}, 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)
return next(ctx, r, request)
}
}
func copyURL(base *url.URL, path string) *url.URL {
next := *base
next.Path = path
return &next
}