Update error detail logic

yorkie-team · Dec 11, 2023 · c97c1bf · c97c1bf
1 parent 0381041
commit c97c1bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/server/rpc/connecthelper/status.go b/server/rpc/connecthelper/status.go
@@ -23,7 +23,6 @@ import (
 
 	"connectrpc.com/connect"
 	"google.golang.org/genproto/googleapis/rpc/errdetails"
-	"google.golang.org/protobuf/runtime/protoiface"
 
 	"github.com/yorkie-team/yorkie/api/converter"
 	"github.com/yorkie-team/yorkie/api/types"
@@ -87,7 +86,7 @@ var errorToCode = map[error]connect.Code{
 	context.Canceled: connect.CodeCanceled,
 }
 
-func detailsFromError(err error) (protoiface.MessageV1, bool) {
+func detailsFromError(err error) (*errdetails.BadRequest, bool) {
 	invalidFieldsError, ok := err.(*validation.StructError)
 	if !ok {
 		return nil, false
@@ -102,6 +101,7 @@ func detailsFromError(err error) (protoiface.MessageV1, bool) {
 		}
 		br.FieldViolations = append(br.FieldViolations, v)
 	}
+
 	return br, true
 }
 
@@ -122,9 +122,13 @@ func ToStatusError(err error) error {
 	var invalidFieldsError *validation.StructError
 	if errors.As(err, &invalidFieldsError) {
 		st := connect.NewError(connect.CodeInvalidArgument, err)
-		//if details, ok := detailsFromError(err); ok {
-		//	st, _ = st.AddDetail(details)
-		//}
+		details, ok := detailsFromError(err)
+		if !ok {
+			return st
+		}
+		if detail, err := connect.NewErrorDetail(details); err == nil {
+			st.AddDetail(detail)
+		}
 		return st
 	}
 

diff --git a/server/rpc/server.go b/server/rpc/server.go
@@ -126,8 +126,6 @@ func (s *Server) listenAndServe() error {
 }
 
 func newCORS() *cors.Cors {
-	// To let web developers play with the demo service from browsers, we need a
-	// very permissive CORS setup.
 	return cors.New(cors.Options{
 		AllowedMethods: []string{
 			http.MethodHead,