fixup header filling after making new request

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

go.mod

@@ -2,4 +2,4 @@ module github.com/unistack-org/micro-client-http/v3
 
 go 1.16
 
-require github.com/unistack-org/micro/v3 v3.3.20
+require github.com/unistack-org/micro/v3 v3.4.8

go.sum

@@ -5,8 +5,8 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.3.20 h1:gB+sPtvYuEKJQG/k5xnC1TK7MnZbr7wlgyqpYNREdyo=
-github.com/unistack-org/micro/v3 v3.3.20/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
+github.com/unistack-org/micro/v3 v3.4.8 h1:9+qGlNHgChC3aMuFrtTFUtG55PEAjneSvplg7phwoCI=
+github.com/unistack-org/micro/v3 v3.4.8/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

http.go

@@ -32,10 +32,10 @@ func filterLabel(r []router.Route) []router.Route {
 */
 
 type httpClient struct {
-	opts    client.Options
 	httpcli *http.Client
-	init    bool
+	opts    client.Options
 	sync.RWMutex
+	init bool
 }
 
 func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg interface{}, opts client.CallOptions) (*http.Request, error) {
@@ -72,13 +72,20 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 			if t, ok := opts.Context.Value(structTagsKey{}).([]string); ok && len(t) > 0 {
 				tags = t
 			}
+			if md, ok := opts.Context.Value(metadataKey{}).(metadata.Metadata); ok {
+				for k, v := range md {
+					hreq.Header.Set(k, v)
+				}
+			}
 		}
 		hreq.URL, err = u.Parse(ep)
 		if err != nil {
 			return nil, errors.BadRequest("go.micro.client", err.Error())
 		}
 	}
-
+	if opts.AuthToken != "" {
+		hreq.Header.Set("Authorization", opts.AuthToken)
+	}
 	if len(tags) == 0 {
 		switch ct {
 		default:
@@ -116,23 +123,11 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 }
 
 func (h *httpClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
-	header := make(http.Header, 2)
-	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		for k, v := range md {
-			header.Set(k, v)
-		}
-	}
-
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
-	// set timeout in nanoseconds
-	header.Set("Timeout", fmt.Sprintf("%d", opts.RequestTimeout))
-	// set the content type for the request
-	header.Set("Content-Type", ct)
-
 	cf, err := h.newCodec(ct)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
@@ -142,7 +137,16 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 		return err
 	}
 
-	hreq.Header = header
+	if md, ok := metadata.FromOutgoingContext(ctx); ok {
+		for k, v := range md {
+			hreq.Header.Set(k, v)
+		}
+	}
+
+	// set timeout in nanoseconds
+	hreq.Header.Set("Timeout", fmt.Sprintf("%d", opts.RequestTimeout))
+	// set the content type for the request
+	hreq.Header.Set("Content-Type", ct)
 
 	// make the request
 	hrsp, err := h.httpcli.Do(hreq.WithContext(ctx))

options.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/unistack-org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/metadata"
 )
 
 var (
@@ -96,3 +97,9 @@ type structTagsKey struct{}
 func StructTags(tags []string) client.CallOption {
 	return client.SetCallOption(structTagsKey{}, tags)
 }
+
+type metadataKey struct{}
+
+func Metadata(md metadata.Metadata) client.CallOption {
+	return client.SetCallOption(metadataKey{}, md)
+}

util.go

@@ -21,6 +21,23 @@ var (
 	mu            sync.RWMutex
 )
 
+// Error struct holds error
+type Error struct {
+	err interface{}
+}
+
+// Error func for error interface
+func (err *Error) Error() string {
+	return fmt.Sprintf("%v", err.err)
+}
+
+func GetError(err error) interface{} {
+	if rerr, ok := err.(*Error); ok {
+		return rerr.err
+	}
+	return err
+}
+
 func newPathRequest(path string, method string, body string, msg interface{}, tags []string) (string, interface{}, error) {
 	// parse via https://github.com/googleapis/googleapis/blob/master/google/api/http.proto definition
 	tpl, err := newTemplate(path)
@@ -185,7 +202,6 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 		if hrsp.StatusCode == http.StatusNoContent {
 			return nil
 		}
-
 		ct := DefaultContentType
 
 		if htype := hrsp.Header.Get("Content-Type"); htype != "" {
@@ -197,6 +213,7 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 			return errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
+		// succeseful response
 		if hrsp.StatusCode < 400 {
 			if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
@@ -204,13 +221,17 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 			return nil
 		}
 
+		// response with error
+		var rerr interface{}
 		errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
 		if ok && errmap != nil {
-			if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
-				err, ok = errmap["default"].(error)
+			rerr, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)]
+			if !ok {
+				rerr, ok = errmap["default"]
 			}
 		}
-		if !ok || err == nil {
+
+		if !ok || rerr == nil {
 			buf, rerr := io.ReadAll(hrsp.Body)
 			if rerr != nil {
 				return errors.InternalServerError("go.micro.client", rerr.Error())
@@ -218,9 +239,14 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 			return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
 		}
 
-		if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
-			err = errors.InternalServerError("go.micro.client", cerr.Error())
+		if cerr := cf.ReadBody(hrsp.Body, rerr); cerr != nil {
+			return errors.InternalServerError("go.micro.client", cerr.Error())
 		}
+
+		if err, ok = rerr.(error); !ok {
+			err = &Error{rerr}
+		}
+
 	}
 
 	return err