Skip to content

more ghc9 changes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cliffordbeshers wants to merge 1 commit into
base: version-3
Choose a base branch
from
Open

more ghc9 changes #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/Happstack/Authenticate/Password/Handlers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,15 @@ verifyTurnstileToken :: Text -> Maybe Text -> IO (Either (Maybe Value) ())
verifyTurnstileToken _ Nothing = pure (Left Nothing)
verifyTurnstileToken secret (Just token) =
do initReq <- parseRequest "https://challenges.cloudflare.com/turnstile/v0/siteverify"
#if MIN_VERSION_aeson(2,0,0)
let reqJson = Object (KM.fromList [ ( "secret", String secret)
, ("response", String token)
])
#else
let reqJson = Object (HashMap.fromList [ ( "secret", String secret)
, ("response", String token)
])
#endif
req = setRequestMethod "POST" $
setRequestBodyJSON reqJson $
initReq
Expand All @@ -183,7 +189,11 @@ verifyTurnstileToken secret (Just token) =
-- liftIO $ print resp
case json of
(Object obj) ->
#if MIN_VERSION_aeson(2,0,0)
case KM.lookup "success" obj of
#else
case HashMap.lookup "success" obj of
#endif
Nothing -> pure (Left (Just json))
(Just success) | success == (Bool True) -> pure (Right ())
| otherwise -> pure (Left (Just json))
Expand Down Expand Up @@ -465,8 +475,3 @@ decodeAndVerifyResetToken authenticateState token =
if (now > secondsSinceEpoch exp')
then pure $ Left ExpiredResetToken
else pure $ Right (u, verified)