on master help sign in
use queryString not rawQueryString, enables param rewrites with Middleware possible
commit28c4533659316f9a99deb72588ea456d7111b30e authorIlia Rodionov <ilya.rodionov@gmail.com> dateSat 7 Dec 2019, 16:12 (7 years ago) parentb4e5aa0
1 file changed+5−5
servant-server/src/Servant/Server/Internal.hs+5−5
servant-server/src/Servant/Server/Internal.hs+5−5
@@ -64,7 +64,7 @@ import Network.Socket
6464 (SockAddr)
6565import Network.Wai
6666 (Application, Request, httpVersion, isSecure, lazyRequestBody,
67− rawQueryString, remoteHost, requestBody, requestHeaders,
67+ queryString, remoteHost, requestBody, requestHeaders,
6868 requestMethod, responseLBS, responseStream, vault)
6969import Prelude ()
7070import Prelude.Compat
@@ -452,7 +452,7 @@ instance
452452 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
453453
454454 route Proxy context subserver =
455− let querytext req = parseQueryText $ rawQueryString req
455+ let querytext = queryToQueryText . queryString
456456 paramname = cs $ symbolVal (Proxy :: Proxy sym)
457457
458458 parseParam :: Request -> DelayedIO (RequestArgument mods a)
@@ -519,8 +519,8 @@ instance (KnownSymbol sym, FromHttpApiData a, HasServer api context)
519519 params :: [T.Text]
520520 params = mapMaybe snd
521521 . filter (looksLikeParam . fst)
522− . parseQueryText
523− . rawQueryString
522+ . queryToQueryText
523+ . queryString
524524 $ req
525525
526526 looksLikeParam name = name == paramname || name == (paramname <> "[]")
@@ -546,7 +546,7 @@ instance (KnownSymbol sym, HasServer api context)
546546 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
547547
548548 route Proxy context subserver =
549− let querytext r = parseQueryText $ rawQueryString r
549+ let querytext = queryToQueryText . queryString
550550 param r = case lookup paramname (querytext r) of
551551 Just Nothing -> True -- param is there, with no value
552552 Just (Just v) -> examine v -- param with a value