From 986bc1b0eaaacf605f0f7b676c4947aaeba49509 Mon Sep 17 00:00:00 2001
From: Leonard Lyubich <leonard@nspcc.ru>
Date: Fri, 13 Nov 2020 17:07:49 +0300
Subject: [PATCH] [#168] session: Implement binary/JSON encoders/decoders on
 RequestVerify

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
---
 v2/session/json.go         | 20 ++++++++++++++++++++
 v2/session/json_test.go    | 12 ++++++++++++
 v2/session/marshal.go      | 11 +++++++++++
 v2/session/marshal_test.go |  6 ++----
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/v2/session/json.go b/v2/session/json.go
index 063f4a8..7929e4e 100644
--- a/v2/session/json.go
+++ b/v2/session/json.go
@@ -124,3 +124,23 @@ func (r *RequestMetaHeader) UnmarshalJSON(data []byte) error {
 
 	return nil
 }
+
+func (r *RequestVerificationHeader) MarshalJSON() ([]byte, error) {
+	return protojson.MarshalOptions{
+		EmitUnpopulated: true,
+	}.Marshal(
+		RequestVerificationHeaderToGRPCMessage(r),
+	)
+}
+
+func (r *RequestVerificationHeader) UnmarshalJSON(data []byte) error {
+	msg := new(session.RequestVerificationHeader)
+
+	if err := protojson.Unmarshal(data, msg); err != nil {
+		return err
+	}
+
+	*r = *RequestVerificationHeaderFromGRPCMessage(msg)
+
+	return nil
+}
diff --git a/v2/session/json_test.go b/v2/session/json_test.go
index 595a74c..78bd9d3 100644
--- a/v2/session/json_test.go
+++ b/v2/session/json_test.go
@@ -78,3 +78,15 @@ func TestRequestMetaHeaderJSON(t *testing.T) {
 
 	require.Equal(t, r, r2)
 }
+
+func TestRequestVerificationHeaderJSON(t *testing.T) {
+	r := generateRequestVerificationHeader("key", "value")
+
+	data, err := r.MarshalJSON()
+	require.NoError(t, err)
+
+	r2 := new(session.RequestVerificationHeader)
+	require.NoError(t, r2.UnmarshalJSON(data))
+
+	require.Equal(t, r, r2)
+}
diff --git a/v2/session/marshal.go b/v2/session/marshal.go
index e5db851..fd48a5b 100644
--- a/v2/session/marshal.go
+++ b/v2/session/marshal.go
@@ -595,6 +595,17 @@ func (r *RequestVerificationHeader) StableSize() (size int) {
 	return size
 }
 
+func (r *RequestVerificationHeader) Unmarshal(data []byte) error {
+	m := new(session.RequestVerificationHeader)
+	if err := goproto.Unmarshal(data, m); err != nil {
+		return err
+	}
+
+	*r = *RequestVerificationHeaderFromGRPCMessage(m)
+
+	return nil
+}
+
 func (r *ResponseMetaHeader) StableMarshal(buf []byte) ([]byte, error) {
 	if r == nil {
 		return []byte{}, nil
diff --git a/v2/session/marshal_test.go b/v2/session/marshal_test.go
index a7fbbea..1e48cc9 100644
--- a/v2/session/marshal_test.go
+++ b/v2/session/marshal_test.go
@@ -134,16 +134,14 @@ func TestRequestVerificationHeader_StableMarshal(t *testing.T) {
 	verifHeaderOrigin := generateRequestVerificationHeader("Key", "Inside")
 	verifHeaderFrom := generateRequestVerificationHeader("Value", "Outside")
 	verifHeaderFrom.SetOrigin(verifHeaderOrigin)
-	transport := new(grpc.RequestVerificationHeader)
 
 	t.Run("non empty", func(t *testing.T) {
 		wire, err := verifHeaderFrom.StableMarshal(nil)
 		require.NoError(t, err)
 
-		err = goproto.Unmarshal(wire, transport)
-		require.NoError(t, err)
+		verifHeaderTo := new(session.RequestVerificationHeader)
+		require.NoError(t, verifHeaderTo.Unmarshal(wire))
 
-		verifHeaderTo := session.RequestVerificationHeaderFromGRPCMessage(transport)
 		require.Equal(t, verifHeaderFrom, verifHeaderTo)
 	})
 }