fix api metadata extract from context (#1452)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-03-31 22:36:51 +03:00
parent d0a368340a
commit 2c4c352aa2

16
rpc.go
View File

@ -118,6 +118,17 @@ func (h *rpcHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// create context
cx := ctx.FromRequest(r)
// get context from http handler wrappers
md, ok := r.Context().Value(metadata.MetadataKey{}).(metadata.Metadata)
if !ok {
md = make(metadata.Metadata)
}
// merge context with overwrite
cx = metadata.MergeContext(cx, md, true)
// set merged context to request
*r = *r.WithContext(cx)
// if stream we currently only support json
if isStream(r, service) {
@ -287,6 +298,7 @@ func requestPayload(r *http.Request) ([]byte, error) {
// allocate maximum
matches := make(map[string]string, len(md))
for k, v := range md {
// filter own keys
if strings.HasPrefix(k, "x-api-field-") {
matches[strings.TrimPrefix(k, "x-api-field-")] = v
delete(md, k)
@ -294,8 +306,8 @@ func requestPayload(r *http.Request) ([]byte, error) {
}
// restore context without fields
ctx = metadata.NewContext(ctx, md)
*r = *r.WithContext(ctx)
*r = *r.WithContext(metadata.NewContext(ctx, md))
req := make(map[string]interface{}, len(md))
for k, v := range matches {
ps := strings.Split(k, ".")