unistack-org/micro-wrapper-validator
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

enable rsp validation #51

Merged
vtolstov merged 2 commits from validate_rsp into v3 2022-12-03 02:28:18 +03:00
Conversation 0 Commits 2 Files Changed 1 +29 -11
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bfbb2bcbc1 - Show all commits

40
validator.go
View File

@ -29,28 +29,40 @@ func NewClientCallWrapper() client.CallWrapper {
return func(fn client.CallFunc) client.CallFunc {
return func(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
if v, ok := req.Body().(validator); ok {
if err := v.Validate(); err != nil {
return errors.BadRequest(req.Service(), "%v", err)
if verr := v.Validate(); verr != nil {
return errors.BadRequest(req.Service(), "%v", verr)
}
}
return fn(ctx, addr, req, rsp, opts)
err := fn(ctx, addr, req, rsp, opts)
if v, ok := rsp.(validator); ok {
if verr := v.Validate(); verr != nil {
return errors.BadGateway(req.Service(), "%v", verr)
}
}
return err
}
}
}
func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
if v, ok := req.Body().(validator); ok {
if err := v.Validate(); err != nil {
return errors.BadRequest(req.Service(), "%v", err)
if verr := v.Validate(); verr != nil {
return errors.BadRequest(req.Service(), "%v", verr)
}
}
return w.Client.Call(ctx, req, rsp, opts...)
err := w.Client.Call(ctx, req, rsp, opts...)
if v, ok := rsp.(validator); ok {
if verr := v.Validate(); verr != nil {
return errors.BadGateway(req.Service(), "%v", verr)
}
}
return err
}
func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
if v, ok := req.Body().(validator); ok {
if err := v.Validate(); err != nil {
return nil, errors.BadRequest(req.Service(), "%v", err)
if verr := v.Validate(); verr != nil {
return nil, errors.BadRequest(req.Service(), "%v", verr)
}
}
return w.Client.Stream(ctx, req, opts...)
@ -69,11 +81,17 @@ func NewServerHandlerWrapper() server.HandlerWrapper {
return func(fn server.HandlerFunc) server.HandlerFunc {
return func(ctx context.Context, req server.Request, rsp interface{}) error {
if v, ok := req.Body().(validator); ok {
if err := v.Validate(); err != nil {
return errors.BadRequest(req.Service(), "%v", err)
if verr := v.Validate(); verr != nil {
return errors.BadRequest(req.Service(), "%v", verr)
}
}
return fn(ctx, req, rsp)
err := fn(ctx, req, rsp)
if v, ok := rsp.(validator); ok {
if verr := v.Validate(); verr != nil {
return errors.BadGateway(req.Service(), "%v", verr)
}
}
return err
}
}
}