unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

api/handler/rpc: dont change types of url fields (#1457)

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-04-01 01:26:58 +03:00 committed by GitHub
parent 68b0238a5d
commit 8a8742f867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/handler/rpc/rpc.go
View File

@ -295,8 +295,9 @@ func requestPayload(r *http.Request) ([]byte, error) {
if !ok { if !ok {
md = make(map[string]string) md = make(map[string]string)
} }
// allocate maximum // allocate maximum
matches := make(map[string]string, len(md)) matches := make(map[string]interface{}, len(md))
// get fields from url path // get fields from url path
for k, v := range md { for k, v := range md {
@ -307,9 +308,12 @@ func requestPayload(r *http.Request) ([]byte, error) {
} }
} }
// map of all fields
req := make(map[string]interface{}, len(md))
// get fields from url values // get fields from url values
if len(r.URL.RawQuery) > 0 { if len(r.URL.RawQuery) > 0 {
umd := make(map[string]string) umd := make(map[string]interface{})
err = qson.Unmarshal(&umd, r.URL.RawQuery) err = qson.Unmarshal(&umd, r.URL.RawQuery)
if err != nil { if err != nil {
return nil, err return nil, err
@ -322,7 +326,6 @@ func requestPayload(r *http.Request) ([]byte, error) {
// restore context without fields // restore context without fields
*r = *r.WithContext(metadata.NewContext(ctx, md)) *r = *r.WithContext(metadata.NewContext(ctx, md))
req := make(map[string]interface{}, len(md))
for k, v := range matches { for k, v := range matches {
ps := strings.Split(k, ".") ps := strings.Split(k, ".")
if len(ps) == 1 { if len(ps) == 1 {
@ -342,6 +345,7 @@ func requestPayload(r *http.Request) ([]byte, error) {
for vk, vv := range em { for vk, vv := range em {
nm[vk] = vv nm[vk] = vv
} }
req[ps[0]] = nm
} else { } else {
req[ps[0]] = em req[ps[0]] = em
} }