Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge: v1.1.14 #69

Merged
merged 4 commits into from
Mar 24, 2024
Merged

merge: v1.1.14 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a5e38d
fix: fallback the logic of GlobalMiddleware (#42) (#43)
hwbrzzl Nov 15, 2023
29df926
fix: [#375] [Bug] using fiber, unable to handle files alongside other…
hwbrzzl Mar 18, 2024
94d1eb4
fix: [#378] [Bug] InputArray returns a wrong value when requesting by…
hwbrzzl Mar 24, 2024
651b0a1
merge v1.1.14
hwbrzzl Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 64 additions & 36 deletions context_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"net/http"
"reflect"
"regexp"
"strconv"
"strings"

"github.com/gofiber/fiber/v2"
Expand Down Expand Up @@ -254,16 +255,20 @@ func (r *ContextRequest) Path() string {
}

func (r *ContextRequest) Input(key string, defaultValue ...string) string {
keys := strings.Split(key, ".")
current := r.httpBody
for _, k := range keys {
value, found := current[k]
if found {
if nestedMap, isMap := value.(map[string]any); isMap {
current = nestedMap
} else {
return cast.ToString(value)
valueFromHttpBody := r.getValueFromHttpBody(key)
if valueFromHttpBody != nil {
switch reflect.ValueOf(valueFromHttpBody).Kind() {
case reflect.Map:
valueFromHttpBodyByte, err := json.Marshal(valueFromHttpBody)
if err != nil {
return ""
}

return string(valueFromHttpBodyByte)
case reflect.Slice:
return strings.Join(cast.ToStringSlice(valueFromHttpBody), ",")
default:
return cast.ToString(valueFromHttpBody)
}
}

Expand All @@ -280,18 +285,8 @@ func (r *ContextRequest) Input(key string, defaultValue ...string) string {
}

func (r *ContextRequest) InputArray(key string, defaultValue ...[]string) []string {
keys := strings.Split(key, ".")
current := r.httpBody
for _, k := range keys {
value, found := current[k]
if !found {
return []string{}
}
if nestedMap, isMap := value.(map[string]any); isMap {
current = nestedMap
} else {
return cast.ToStringSlice(value)
}
if valueFromHttpBody := r.getValueFromHttpBody(key); valueFromHttpBody != nil {
return cast.ToStringSlice(valueFromHttpBody)
}

if len(defaultValue) > 0 {
Expand All @@ -302,18 +297,8 @@ func (r *ContextRequest) InputArray(key string, defaultValue ...[]string) []stri
}

func (r *ContextRequest) InputMap(key string, defaultValue ...map[string]string) map[string]string {
keys := strings.Split(key, ".")
current := r.httpBody
for _, k := range keys {
value, found := current[k]
if !found {
return map[string]string{}
}
if nestedMap, isMap := value.(map[string]string); isMap {
current = cast.ToStringMap(nestedMap)
} else {
return cast.ToStringMapString(value)
}
if valueFromHttpBody := r.getValueFromHttpBody(key); valueFromHttpBody != nil {
return cast.ToStringMapString(valueFromHttpBody)
}

if len(defaultValue) > 0 {
Expand Down Expand Up @@ -433,6 +418,39 @@ func (r *ContextRequest) ValidateRequest(request contractshttp.FormRequest) (con
return validator.Errors(), nil
}

func (r *ContextRequest) getValueFromHttpBody(key string) any {
if r.httpBody == nil {
return nil
}

var current any
current = r.httpBody
keys := strings.Split(key, ".")
for _, k := range keys {
currentValue := reflect.ValueOf(current)
switch currentValue.Kind() {
case reflect.Map:
if value := currentValue.MapIndex(reflect.ValueOf(k)); value.IsValid() {
current = value.Interface()
} else {
if value := currentValue.MapIndex(reflect.ValueOf(k + "[]")); value.IsValid() {
current = value.Interface()
} else {
return nil
}
}
case reflect.Slice:
if number, err := strconv.Atoi(k); err == nil {
return cast.ToStringSlice(current)[number]
} else {
return nil
}
}
}

return current
}

func getHttpBody(ctx *Context) (map[string]any, error) {
if len(ctx.instance.Request().Body()) == 0 {
return nil, nil
Expand All @@ -452,10 +470,16 @@ func getHttpBody(ctx *Context) (map[string]any, error) {
if strings.Contains(contentType, "multipart/form-data") {
if form, err := ctx.instance.MultipartForm(); err == nil {
for k, v := range form.Value {
data[k] = strings.Join(v, ",")
if len(v) > 1 {
data[k] = v
} else if len(v) == 1 {
data[k] = v[0]
}
}
for k, v := range form.File {
if len(v) > 0 {
if len(v) > 1 {
data[k] = v
} else if len(v) == 1 {
data[k] = v[0]
}
}
Expand All @@ -465,7 +489,11 @@ func getHttpBody(ctx *Context) (map[string]any, error) {
if strings.Contains(contentType, "application/x-www-form-urlencoded") {
args := ctx.instance.Request().PostArgs()
args.VisitAll(func(key, value []byte) {
data[utils.UnsafeString(key)] = utils.UnsafeString(value)
if existValue, exist := data[string(key)]; exist {
data[utils.UnsafeString(key)] = append([]string{cast.ToString(existValue)}, utils.UnsafeString(value))
} else {
data[utils.UnsafeString(key)] = utils.UnsafeString(value)
}
})
}

Expand Down
Loading
Loading