From 801b88eb8044d792914d28053bc2ef07a93a37ff Mon Sep 17 00:00:00 2001
From: Hubert Zhang <hubert.zyk@gmail.com>
Date: Sat, 26 Mar 2022 08:47:52 +0800
Subject: [PATCH] Use Bytes from convert.go to unmarshal byte value (#2603)

---
 runtime/query.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/runtime/query.go b/runtime/query.go
index fb0c84ef0cd..59003e529a3 100644
--- a/runtime/query.go
+++ b/runtime/query.go
@@ -1,7 +1,6 @@
 package runtime
 
 import (
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"net/url"
@@ -234,7 +233,7 @@ func parseField(fieldDescriptor protoreflect.FieldDescriptor, value string) (pro
 	case protoreflect.StringKind:
 		return protoreflect.ValueOfString(value), nil
 	case protoreflect.BytesKind:
-		v, err := base64.URLEncoding.DecodeString(value)
+		v, err := Bytes(value)
 		if err != nil {
 			return protoreflect.Value{}, err
 		}
@@ -312,7 +311,7 @@ func parseMessage(msgDescriptor protoreflect.MessageDescriptor, value string) (p
 	case "google.protobuf.StringValue":
 		msg = &wrapperspb.StringValue{Value: value}
 	case "google.protobuf.BytesValue":
-		v, err := base64.URLEncoding.DecodeString(value)
+		v, err := Bytes(value)
 		if err != nil {
 			return protoreflect.Value{}, err
 		}