feat: support CORS by using rest.WithCors(...) (#1212)
* feat: support CORS by using rest.WithCors(...) * chore: add comments * refactor: lowercase unexported methods * ci: fix lint errors
This commit is contained in:
@@ -22,11 +22,6 @@ Port: 54321
|
||||
`
|
||||
var cnf RestConf
|
||||
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(configYaml), &cnf))
|
||||
failStart := func(server *Server) {
|
||||
server.opts.start = func(e *engine) error {
|
||||
return http.ErrServerClosed
|
||||
}
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
c RestConf
|
||||
@@ -35,38 +30,40 @@ Port: 54321
|
||||
}{
|
||||
{
|
||||
c: RestConf{},
|
||||
opts: []RunOption{failStart},
|
||||
opts: []RunOption{WithRouter(mockedRouter{}), WithCors()},
|
||||
fail: true,
|
||||
},
|
||||
{
|
||||
c: cnf,
|
||||
opts: []RunOption{failStart},
|
||||
opts: []RunOption{WithRouter(mockedRouter{})},
|
||||
},
|
||||
{
|
||||
c: cnf,
|
||||
opts: []RunOption{WithNotAllowedHandler(nil), failStart},
|
||||
opts: []RunOption{WithRouter(mockedRouter{}), WithNotAllowedHandler(nil)},
|
||||
},
|
||||
{
|
||||
c: cnf,
|
||||
opts: []RunOption{WithNotFoundHandler(nil), failStart},
|
||||
opts: []RunOption{WithNotFoundHandler(nil), WithRouter(mockedRouter{})},
|
||||
},
|
||||
{
|
||||
c: cnf,
|
||||
opts: []RunOption{WithUnauthorizedCallback(nil), failStart},
|
||||
opts: []RunOption{WithUnauthorizedCallback(nil), WithRouter(mockedRouter{})},
|
||||
},
|
||||
{
|
||||
c: cnf,
|
||||
opts: []RunOption{WithUnsignedCallback(nil), failStart},
|
||||
opts: []RunOption{WithUnsignedCallback(nil), WithRouter(mockedRouter{})},
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
srv, err := NewServer(test.c, test.opts...)
|
||||
var srv *Server
|
||||
var err error
|
||||
if test.fail {
|
||||
_, err = NewServer(test.c, test.opts...)
|
||||
assert.NotNil(t, err)
|
||||
}
|
||||
if err != nil {
|
||||
continue
|
||||
} else {
|
||||
srv = MustNewServer(test.c, test.opts...)
|
||||
}
|
||||
|
||||
srv.Use(ToMiddleware(func(next http.Handler) http.Handler {
|
||||
@@ -80,8 +77,21 @@ Port: 54321
|
||||
Handler: nil,
|
||||
}, WithJwt("thesecret"), WithSignature(SignatureConf{}),
|
||||
WithJwtTransition("preivous", "thenewone"))
|
||||
srv.Start()
|
||||
srv.Stop()
|
||||
|
||||
func() {
|
||||
defer func() {
|
||||
p := recover()
|
||||
switch v := p.(type) {
|
||||
case error:
|
||||
assert.Equal(t, "foo", v.Error())
|
||||
default:
|
||||
t.Fail()
|
||||
}
|
||||
}()
|
||||
|
||||
srv.Start()
|
||||
srv.Stop()
|
||||
}()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,6 +190,9 @@ func TestMultiMiddlewares(t *testing.T) {
|
||||
next.ServeHTTP(w, r)
|
||||
}
|
||||
},
|
||||
ToMiddleware(func(next http.Handler) http.Handler {
|
||||
return next
|
||||
}),
|
||||
}, Route{
|
||||
Method: http.MethodGet,
|
||||
Path: "/first/:name/:year",
|
||||
@@ -282,3 +295,18 @@ Port: 54321
|
||||
assert.Equal(t, srv.ngin.tlsConfig, testCase.res)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithCors(t *testing.T) {
|
||||
const configYaml = `
|
||||
Name: foo
|
||||
Port: 54321
|
||||
`
|
||||
var cnf RestConf
|
||||
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(configYaml), &cnf))
|
||||
rt := router.NewRouter()
|
||||
srv, err := NewServer(cnf, WithRouter(rt))
|
||||
assert.Nil(t, err)
|
||||
|
||||
opt := WithCors("local")
|
||||
opt(srv)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user