From dd93a0da3b29a36797bbad1b67d5213c5a19a95b Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Fri, 24 Sep 2021 00:10:13 +0300
Subject: [PATCH] fix codec.Frame in case of flatten struct tag

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 codec_test.go |  32 ++++++++++++++++
 jsonpb.go     | 102 +++++++++++++++++++++++++-------------------------
 2 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/codec_test.go b/codec_test.go
index 6ca352b..6cb59ae 100644
--- a/codec_test.go
+++ b/codec_test.go
@@ -3,8 +3,40 @@ package jsonpb
 import (
 	"bytes"
 	"testing"
+
+	"github.com/unistack-org/micro/v3/codec"
 )
 
+func TestFrame(t *testing.T) {
+	s := &codec.Frame{Data: []byte("test")}
+
+	buf, err := NewCodec().Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(buf, []byte(`test`)) {
+		t.Fatalf("bytes not equal %s != %s", buf, `test`)
+	}
+}
+
+func TestFrameFlatten(t *testing.T) {
+	s := &struct {
+		One  string
+		Name *codec.Frame `json:"name" codec:"flatten"`
+	}{
+		One:  "xx",
+		Name: &codec.Frame{Data: []byte("test")},
+	}
+
+	buf, err := NewCodec().Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(buf, []byte(`test`)) {
+		t.Fatalf("bytes not equal %s != %s", buf, `test`)
+	}
+}
+
 func TestReadBody(t *testing.T) {
 	t.Skip("skip without proto message")
 	s := &struct {
diff --git a/jsonpb.go b/jsonpb.go
index f966b70..d14bada 100644
--- a/jsonpb.go
+++ b/jsonpb.go
@@ -33,66 +33,68 @@ const (
 )
 
 func (c *jsonpbCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
-	switch m := v.(type) {
-	case nil:
+	if v == nil {
 		return nil, nil
-	case *codec.Frame:
-		return m.Data, nil
-	case proto.Message:
-		options := c.opts
-		for _, o := range opts {
-			o(&options)
-		}
-
-		if nv, nerr := rutil.StructFieldByTag(m, options.TagName, flattenTag); nerr == nil {
-			if nm, ok := nv.(proto.Message); ok {
-				m = nm
-			}
-		}
-
-		marshalOptions := DefaultMarshalOptions
-		if options.Context != nil {
-			if f, ok := options.Context.Value(marshalOptionsKey{}).(jsonpb.MarshalOptions); ok {
-				marshalOptions = f
-			}
-		}
-
-		return marshalOptions.Marshal(m)
 	}
-	return nil, codec.ErrInvalidMessage
+
+	options := c.opts
+	for _, o := range opts {
+		o(&options)
+	}
+
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
+		v = nv
+	}
+
+	if m, ok := v.(*codec.Frame); ok {
+		return m.Data, nil
+	}
+
+	if _, ok := v.(proto.Message); !ok {
+		return nil, codec.ErrInvalidMessage
+	}
+
+	marshalOptions := DefaultMarshalOptions
+	if options.Context != nil {
+		if f, ok := options.Context.Value(marshalOptionsKey{}).(jsonpb.MarshalOptions); ok {
+			marshalOptions = f
+		}
+	}
+
+	return marshalOptions.Marshal(v.(proto.Message))
 }
 
 func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
-	if len(d) == 0 {
+	if v == nil || len(d) == 0 {
 		return nil
 	}
-	switch m := v.(type) {
-	case nil:
-		return nil
-	case *codec.Frame:
+
+	options := c.opts
+	for _, o := range opts {
+		o(&options)
+	}
+
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
+		v = nv
+	}
+
+	if m, ok := v.(*codec.Frame); ok {
 		m.Data = d
 		return nil
-	case proto.Message:
-		options := c.opts
-		for _, o := range opts {
-			o(&options)
-		}
-
-		if nv, nerr := rutil.StructFieldByTag(m, options.TagName, flattenTag); nerr == nil {
-			if nm, ok := nv.(proto.Message); ok {
-				m = nm
-			}
-		}
-
-		unmarshalOptions := DefaultUnmarshalOptions
-		if options.Context != nil {
-			if f, ok := options.Context.Value(unmarshalOptionsKey{}).(jsonpb.UnmarshalOptions); ok {
-				unmarshalOptions = f
-			}
-		}
-		return unmarshalOptions.Unmarshal(d, m)
 	}
-	return codec.ErrInvalidMessage
+
+	if _, ok := v.(proto.Message); !ok {
+		return codec.ErrInvalidMessage
+	}
+
+	unmarshalOptions := DefaultUnmarshalOptions
+	if options.Context != nil {
+		if f, ok := options.Context.Value(unmarshalOptionsKey{}).(jsonpb.UnmarshalOptions); ok {
+			unmarshalOptions = f
+		}
+	}
+
+	return unmarshalOptions.Unmarshal(d, v.(proto.Message))
 }
 
 func (c *jsonpbCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {