Support base64-1.0

Author: 9999years

sdk/src/Temporal/Payload.hs

@@ -71,9 +71,10 @@ import Control.Monad
 import Control.Monad.IO.Class
 import Data.Aeson hiding (decode, encode)
 import qualified Data.Aeson as Aeson
+import Data.Base64.Types (extractBase64)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
-import Data.ByteString.Base64 (decodeBase64, encodeBase64)
+import Data.ByteString.Base64 (decodeBase64Untyped, encodeBase64)
 import qualified Data.ByteString.Char8 as C
 import qualified Data.ByteString.Lazy as BL
 import Data.Kind
@@ -441,12 +442,21 @@ data Payload = Payload
   deriving stock (Show, Eq, Ord, Lift)
 
 
+-- Note: You'd think `decodeBase64Untyped` is the wrong function to use, but
+-- there's actually no way to check the invariants that the typed versions
+-- encode.
+--
+-- See: https://github.com/emilypi/base64/issues/65#issuecomment-2960385097
 base64DecodeFromText :: MonadFail m => T.Text -> m ByteString
-base64DecodeFromText txt = case decodeBase64 $ Text.encodeUtf8 txt of
+base64DecodeFromText txt = case decodeBase64Untyped $ Text.encodeUtf8 txt of
   Left err -> fail $ Text.unpack err
   Right ok -> pure ok
 
 
+base64EncodeToText :: ByteString -> T.Text
+base64EncodeToText = extractBase64 . encodeBase64
+
+
 instance FromJSON Payload where
   parseJSON = withObject "Payload" $ \o -> do
     rawPayloadData <- o .:? "data"
@@ -459,13 +469,13 @@ instance FromJSON Payload where
 instance ToJSON Payload where
   toJSON Payload {..} =
     object $
-      (if payloadData == "" then id else (("data" .= encodeBase64 payloadData) :)) $
-        (if Map.null payloadMetadata then id else (("metadata" .= fmap encodeBase64 payloadMetadata) :))
+      (if payloadData == "" then id else (("data" .= base64EncodeToText payloadData) :)) $
+        (if Map.null payloadMetadata then id else (("metadata" .= fmap base64EncodeToText payloadMetadata) :))
           []
   toEncoding Payload {..} =
     pairs $
-      (if payloadData == "" then mempty else "data" .= encodeBase64 payloadData)
-        <> (if Map.null payloadMetadata then mempty else "metadata" .= fmap encodeBase64 payloadMetadata)
+      (if payloadData == "" then mempty else "data" .= base64EncodeToText payloadData)
+        <> (if Map.null payloadMetadata then mempty else "metadata" .= fmap base64EncodeToText payloadMetadata)
 
 
 convertFromProtoPayload :: Proto.Payload -> Payload