need to json.unmarshal data_base64

Signed-off-by: Doug Davis <[email protected]>

Author: duglin

v2/event/event_unmarshal.go

@@ -7,6 +7,7 @@ package event
 
 import (
 	"encoding/base64"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -385,9 +386,14 @@ func consumeData(e *Event, isBase64 bool, iter *jsoniter.Iterator) error {
 		e.DataBase64 = true
 
 		// Allocate payload byte buffer
-		base64Encoded := iter.ReadStringAsSlice()
-		e.DataEncoded = make([]byte, base64.StdEncoding.DecodedLen(len(base64Encoded)))
-		length, err := base64.StdEncoding.Decode(e.DataEncoded, base64Encoded)
+		base64Encoded := iter.ReadString()
+		var base64DeJSON string
+		err := json.Unmarshal([]byte(`"`+base64Encoded+`"`), &base64DeJSON)
+		if err != nil {
+			return err
+		}
+		e.DataEncoded = make([]byte, base64.StdEncoding.DecodedLen(len(base64DeJSON)))
+		length, err := base64.StdEncoding.Decode(e.DataEncoded, []byte(base64DeJSON))
 		if err != nil {
 			return err
 		}

v2/event/event_unmarshal_test.go

@@ -298,6 +298,31 @@ func TestUnmarshal(t *testing.T) {
 				DataBase64:  true,
 			},
 		},
+		"base64 json encoded data v1.0 - escaped json string": {
+			body: []byte(`{
+				"specversion":     "1.0",
+				"datacontenttype": "text/plain",
+				"data_base64": "\u002B\u002B\u002B\u002B",
+				"id":          "ABC-123",
+				"time":        "` + now.Format(time.RFC3339Nano) + `",
+				"type":        "com.example.test",
+				"dataschema":  "http://example.com/schema",
+				"source":      "http://example.com/source"
+			}`),
+			want: &event.Event{
+				Context: event.EventContextV1{
+					Type:            "com.example.test",
+					Source:          *sourceV1,
+					DataSchema:      schemaV1,
+					ID:              "ABC-123",
+					Time:            &now,
+					DataContentType: event.StringOfTextPlain(),
+				}.AsV1(),
+				// base64 decode of "++++"
+				DataEncoded: []byte{0xfb, 0xef, 0xbe},
+				DataBase64:  true,
+			},
+		},
 		"base64 xml encoded data v1.0": {
 			body: mustJsonMarshal(t, map[string]interface{}{
 				"specversion":     "1.0",