Upgrade base64 to 1.0

freizl · Jan 13, 2024 · e4c9b56 · e4c9b56
1 parent 9a63224
commit e4c9b56
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,5 +1,5 @@
 packages: */*.cabal
-index-state: 2023-12-20T01:31:26Z
+index-state: 2024-01-13T01:06:06Z
 
 -- TODO: doesn't seem work unless add to ~/.cabal/config
 extra-include-dirs: /opt/homebrew/opt/openssl@3/include

diff --git a/hoauth2/hoauth2.cabal b/hoauth2/hoauth2.cabal
@@ -66,7 +66,7 @@ library
   build-depends:
     , aeson                 >=2.0    && <2.3
     , base                  >=4.11   && <5
-    , base64                ^>=0.4
+    , base64                >=1.0    && <1.1
     , binary                >=0.8    && <0.11
     , bytestring            >=0.9    && <0.13
     , containers            >=0.6    && <0.8

diff --git a/hoauth2/src/Network/OAuth2/Experiment/Pkce.hs b/hoauth2/src/Network/OAuth2/Experiment/Pkce.hs
@@ -9,6 +9,7 @@ module Network.OAuth2.Experiment.Pkce (
 import Control.Monad.IO.Class
 import Crypto.Hash qualified as H
 import Crypto.Random qualified as Crypto
+import Data.Base64.Types qualified as B64
 import Data.ByteArray qualified as ByteArray
 import Data.ByteString qualified as BS
 import Data.ByteString.Base64.URL qualified as B64
@@ -42,7 +43,7 @@ mkPkceParam = do
       }
 
 encodeCodeVerifier :: BS.ByteString -> Text
-encodeCodeVerifier = B64.encodeBase64Unpadded . BS.pack . ByteArray.unpack . hashSHA256
+encodeCodeVerifier = B64.extractBase64 . B64.encodeBase64Unpadded . BS.pack . ByteArray.unpack . hashSHA256
 
 genCodeVerifier :: MonadIO m => m BS.ByteString
 genCodeVerifier = liftIO $ getBytesInternal BS.empty