Use Base64url to convert bytes to JSON string

well-typed · Apr 27, 2023 · 4a9304c · 4a9304c
1 parent 6983d83
commit 4a9304c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/cborg-json/cborg-json.cabal b/cborg-json/cborg-json.cabal
@@ -33,7 +33,7 @@ library
     base                 >=4.11 && < 4.19,
     aeson                >=0.7  && <2.2,
     aeson-pretty         >=0.8  && <0.9,
-    base16-bytestring    >= 1.0 && < 1.1,
+    base64-bytestring    >=1.0  && <1.3,
     unordered-containers >=0.2  && <0.3,
     scientific           >=0.3  && <0.4,
     text                 >=1.1  && <2.1,
@@ -89,11 +89,11 @@ test-suite tests
   build-depends:
     base                    >= 4.7     && < 4.19,
     base-orphans,
-    base16-bytestring       >= 0.1     && < 0.2,
+    base16-bytestring       >= 1.0     && < 1.1,
     bytestring              >= 0.10.4  && < 0.12,
     cborg,
     cborg-json,
-    aeson                   >= 0.7     && < 1.6,
+    aeson                   >= 0.7     && < 2.2,
     QuickCheck              >= 2.9     && < 2.15,
     tasty                   >= 0.11    && < 1.5,
     tasty-hunit             >= 0.9     && < 0.11,

diff --git a/cborg-json/src/Codec/CBOR/JSON.hs b/cborg-json/src/Codec/CBOR/JSON.hs
@@ -14,8 +14,7 @@ import           Codec.CBOR.Encoding
 import           Codec.CBOR.Decoding
 import           Data.Aeson                          ( Value(..) )
 import qualified Data.Aeson                          as Aeson
-import qualified Data.ByteString.Base16              as HEX
-import qualified Data.HashMap.Lazy                   as HM
+import qualified Data.ByteString.Base64.URL          as Base64url
 import           Data.Scientific                     as Scientific
 import qualified Data.Text                           as T
 import qualified Data.Text.Encoding                  as TE
@@ -80,12 +79,12 @@ decodeValue lenient = do
       TypeListLenIndef -> decodeListLenIndef >> decodeListIndef lenient []
       TypeMapLen       -> decodeMapLen >>= flip (decodeMapN lenient) mempty
 
-      TypeBytes   -> packHex <$> decodeBytes
+      TypeBytes   -> bytesToBase64Text <$> decodeBytes
 
       _           -> fail $ "unexpected CBOR token type for a JSON value: "
                          ++ show tkty
     where
-      packHex = String . TE.decodeLatin1 . HEX.encode
+      bytesToBase64Text = String . TE.decodeLatin1 . Base64url.encode
 
 
 decodeNumberIntegral :: Decoder s Value

diff --git a/cborg-json/tests/Main.hs b/cborg-json/tests/Main.hs
@@ -20,8 +20,8 @@ tests :: TestTree
 tests =
   testGroup "CBOR-JSON"
     [ testGroup "unit tests"
-        [ testCase "decode variable ByteString as HexString" $
-            Right ("", String "303132") @=? deserialiseFromBytes (decodeValue True)
-                                              (fromStrict . fst $ HEX.decode "5803303132")
+        [ testCase "decode variable ByteString as Base62Url String" $
+            Right ("", String "MDEy") @=? deserialiseFromBytes (decodeValue True)
+                                              (fromStrict . either error id $ HEX.decode "5803303132")
         ]
     ]