api add middleware support (#140)
* rebase upstream
* rebase
* trim no need line
* trim no need line
* trim no need line
* update doc
* remove update
* remove no need
* remove no need
* goctl add jwt support
* goctl add jwt support
* goctl add jwt support
* goctl support import
* goctl support import
* support return ()
* revert
* refactor and rename folder to group
* remove no need
* add anonymous annotation
* optimized
* rename
* rename
* update test
* api add middleware support: usage:
@server(
middleware: M1, M2
)
* api add middleware support: usage:
@server(
middleware: M1, M2
)
* simple logic
* should reverse middlewares
* optimized
* optimized
* rename
Co-authored-by: kingxt <dream4kingxt@163.com>
This commit is contained in:
@@ -103,6 +103,13 @@ func WithJwtTransition(secret, prevSecret string) RouteOption {
|
||||
}
|
||||
}
|
||||
|
||||
func WithMiddlewares(ms []Middleware, rs ...Route) []Route {
|
||||
for i := len(ms) - 1; i >= 0; i-- {
|
||||
rs = WithMiddleware(ms[i], rs...)
|
||||
}
|
||||
return rs
|
||||
}
|
||||
|
||||
func WithMiddleware(middleware Middleware, rs ...Route) []Route {
|
||||
routes := make([]Route, len(rs))
|
||||
|
||||
|
||||
@@ -68,3 +68,75 @@ func TestWithMiddleware(t *testing.T) {
|
||||
"wan": "2020",
|
||||
}, m)
|
||||
}
|
||||
|
||||
func TestMultiMiddleware(t *testing.T) {
|
||||
m := make(map[string]string)
|
||||
router := router.NewPatRouter()
|
||||
handler := func(w http.ResponseWriter, r *http.Request) {
|
||||
var v struct {
|
||||
Nickname string `form:"nickname"`
|
||||
Zipcode int64 `form:"zipcode"`
|
||||
}
|
||||
|
||||
err := httpx.Parse(r, &v)
|
||||
assert.Nil(t, err)
|
||||
_, err = io.WriteString(w, fmt.Sprintf("%s:%s", v.Nickname, m[v.Nickname]))
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
rs := WithMiddlewares([]Middleware{
|
||||
func(next http.HandlerFunc) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var v struct {
|
||||
Name string `path:"name"`
|
||||
Year string `path:"year"`
|
||||
}
|
||||
assert.Nil(t, httpx.ParsePath(r, &v))
|
||||
m[v.Name] = v.Year
|
||||
next.ServeHTTP(w, r)
|
||||
}
|
||||
},
|
||||
func(next http.HandlerFunc) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var v struct {
|
||||
Name string `form:"nickname"`
|
||||
Zipcode string `form:"zipcode"`
|
||||
}
|
||||
assert.Nil(t, httpx.ParseForm(r, &v))
|
||||
assert.NotEmpty(t, m)
|
||||
m[v.Name] = v.Zipcode + v.Zipcode
|
||||
next.ServeHTTP(w, r)
|
||||
}
|
||||
},
|
||||
}, Route{
|
||||
Method: http.MethodGet,
|
||||
Path: "/first/:name/:year",
|
||||
Handler: handler,
|
||||
}, Route{
|
||||
Method: http.MethodGet,
|
||||
Path: "/second/:name/:year",
|
||||
Handler: handler,
|
||||
})
|
||||
|
||||
urls := []string{
|
||||
"http://hello.com/first/kevin/2017?nickname=whatever&zipcode=200000",
|
||||
"http://hello.com/second/wan/2020?nickname=whatever&zipcode=200000",
|
||||
}
|
||||
for _, route := range rs {
|
||||
assert.Nil(t, router.Handle(route.Method, route.Path, route.Handler))
|
||||
}
|
||||
for _, url := range urls {
|
||||
r, err := http.NewRequest(http.MethodGet, url, nil)
|
||||
assert.Nil(t, err)
|
||||
|
||||
rr := httptest.NewRecorder()
|
||||
router.ServeHTTP(rr, r)
|
||||
|
||||
assert.Equal(t, "whatever:200000200000", rr.Body.String())
|
||||
}
|
||||
|
||||
assert.EqualValues(t, map[string]string{
|
||||
"kevin": "2017",
|
||||
"wan": "2020",
|
||||
"whatever": "200000200000",
|
||||
}, m)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user