From b73a76263c3e44899b2e20181eb321c264ce74e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman121@gmail.com>
Date: Mon, 30 Aug 2021 19:24:35 +0200
Subject: [PATCH] Allow paging cursor to decode string when needed

---
 pkg/filter/pagination.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkg/filter/pagination.go b/pkg/filter/pagination.go
index 2836c7022..26903e778 100644
--- a/pkg/filter/pagination.go
+++ b/pkg/filter/pagination.go
@@ -200,8 +200,19 @@ func (p *PagingCursor) UnmarshalJSON(in []byte) error {
 			R  bool
 			LT bool
 		}
+
+		err error
 	)
 
+	// Decode the the string if it's not a JSON
+	if in[0] != byte('{') {
+		s := string(in)
+		in, err = base64.StdEncoding.DecodeString(s[1 : len(s)-1])
+		if err != nil {
+			return err
+		}
+	}
+
 	if err := json.Unmarshal(in, &aux); err != nil {
 		return err
 	}