git.iko.soy/typeable/servant
on master help sign in
fixing servant-auth (aeson 2.0 bump)
efffc70akhesacaro
servant-auth/servant-auth/servant-auth.cabal−1
compare with master
unifiedsplit
@@ -40,7 +40,6 @@ library
40 , lens >= 4.16.1 && < 5.1
40 , lens >= 4.16.1 && < 5.1
41 , servant >= 0.15 && < 0.19
41 , servant >= 0.15 && < 0.19
42 , text >= 1.2.3.0 && < 1.3
42 , text >= 1.2.3.0 && < 1.3
43− , unordered-containers >= 0.2.9.0 && < 0.3
44 exposed-modules:
43 exposed-modules:
45 Servant.Auth
44 Servant.Auth
46 Servant.Auth.JWT
45 Servant.Auth.JWT
servant-auth/servant-auth/src/Servant/Auth/JWT.hs+2−2
@@ -4,7 +4,7 @@ import Control.Lens ((^.))
4import qualified Crypto.JWT as Jose
4import qualified Crypto.JWT as Jose
5import Data.Aeson (FromJSON, Result (..), ToJSON, fromJSON,
5import Data.Aeson (FromJSON, Result (..), ToJSON, fromJSON,
6 toJSON)
6 toJSON)
7−import qualified Data.HashMap.Strict as HM
7+import qualified Data.Map as Map
8import qualified Data.Text as T
8import qualified Data.Text as T
9
9
10
10
@@ -17,7 +17,7 @@ import qualified Data.Text as T
17class FromJWT a where
17class FromJWT a where
18 decodeJWT :: Jose.ClaimsSet -> Either T.Text a
18 decodeJWT :: Jose.ClaimsSet -> Either T.Text a
19 default decodeJWT :: FromJSON a => Jose.ClaimsSet -> Either T.Text a
19 default decodeJWT :: FromJSON a => Jose.ClaimsSet -> Either T.Text a
20− decodeJWT m = case HM.lookup "dat" (m ^. Jose.unregisteredClaims) of
20+ decodeJWT m = case Map.lookup "dat" (m ^. Jose.unregisteredClaims) of
21 Nothing -> Left "Missing 'dat' claim"
21 Nothing -> Left "Missing 'dat' claim"
22 Just v -> case fromJSON v of
22 Just v -> case fromJSON v of
23 Error e -> Left $ T.pack e
23 Error e -> Left $ T.pack e