Fix

tdex-network · Sep 14, 2023 · fb15333 · fb15333
1 parent 7858f97
commit fb15333
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/internal/interfaces/grpc/service.go b/internal/interfaces/grpc/service.go
@@ -448,10 +448,10 @@ func (s *service) newOperatorServer(
 	// Reverse proxy grpc-gateway.
 	gwmux := runtime.NewServeMux(
 		runtime.WithHealthzEndpoint(grpchealth.NewHealthClient(conn)),
-		runtime.WithMarshalerOption("application/json", &runtime.JSONPb{
+		runtime.WithMarshalerOption("application/json+pretty", &runtime.JSONPb{
 			MarshalOptions: protojson.MarshalOptions{
 				Indent:    "  ",
-				Multiline: true, // Optional, implied by presence of "Indent".
+				Multiline: true,
 			},
 			UnmarshalOptions: protojson.UnmarshalOptions{
 				DiscardUnknown: true,
@@ -595,7 +595,18 @@ func (s *service) newTradeServer(tlsConfig *tls.Config) (*http.Server, error) {
 	if err != nil {
 		return nil, err
 	}
-	gwmux := runtime.NewServeMux(runtime.WithHealthzEndpoint(grpchealth.NewHealthClient(conn)))
+	gwmux := runtime.NewServeMux(
+		runtime.WithHealthzEndpoint(grpchealth.NewHealthClient(conn)),
+		runtime.WithMarshalerOption("application/json+pretty", &runtime.JSONPb{
+			MarshalOptions: protojson.MarshalOptions{
+				Indent:    "  ",
+				Multiline: true,
+			},
+			UnmarshalOptions: protojson.UnmarshalOptions{
+				DiscardUnknown: true,
+			},
+		}),
+	)
 	if err := tdexv2.RegisterTransportServiceHandler(
 		ctx, gwmux, conn,
 	); err != nil {

diff --git a/internal/interfaces/grpc/service_one_port.go b/internal/interfaces/grpc/service_one_port.go
@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 
 	grpchealth "google.golang.org/grpc/health/grpc_health_v1"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
 	reflectionv1 "github.com/tdex-network/reflection/api-spec/protobuf/gen/reflection/v1"
@@ -303,7 +304,18 @@ func (s *serviceOnePort) newServer(
 		return nil, err
 	}
 	// Reverse proxy grpc-gateway.
-	gwmux := runtime.NewServeMux(runtime.WithHealthzEndpoint(grpchealth.NewHealthClient(conn)))
+	gwmux := runtime.NewServeMux(
+		runtime.WithHealthzEndpoint(grpchealth.NewHealthClient(conn)),
+		runtime.WithMarshalerOption("application/json+pretty", &runtime.JSONPb{
+			MarshalOptions: protojson.MarshalOptions{
+				Indent:    "  ",
+				Multiline: true,
+			},
+			UnmarshalOptions: protojson.UnmarshalOptions{
+				DiscardUnknown: true,
+			},
+		}),
+	)
 
 	// Register wallet interface.
 	walletHandler := grpchandler.NewWalletHandler(