eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Escape segments in linkURI

Browse source
This commit is contained in:
Oleg Grenrus 2017-05-14 20:35:32 +03:00
parent 2cfcff4c7f
commit 54c3053342
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servant/src/Servant/Utils/Links.hs
View file

@ -164,6 +164,10 @@ addQueryParam qp l =
-- >>> linkURI $ safeLink (Proxy :: Proxy API) (Proxy :: Proxy API) [1, 2, 3] -- >>> linkURI $ safeLink (Proxy :: Proxy API) (Proxy :: Proxy API) [1, 2, 3]
-- sum?x[]=1&x[]=2&x[]=3 -- sum?x[]=1&x[]=2&x[]=3
-- --
-- >>> type API = "foo/bar" :> Get '[JSON] Int
-- >>> linkURI $ safeLink (Proxy :: Proxy API) (Proxy :: Proxy API)
-- foo%2Fbar
--
linkURI :: Link -> URI linkURI :: Link -> URI
linkURI = linkURI' LinkArrayElementBracket linkURI = linkURI' LinkArrayElementBracket
@ -186,7 +190,7 @@ linkURI' :: LinkArrayElementStyle -> Link -> URI
linkURI' addBrackets (Link segments q_params) = linkURI' addBrackets (Link segments q_params) =
URI mempty -- No scheme (relative) URI mempty -- No scheme (relative)
Nothing -- Or authority (relative) Nothing -- Or authority (relative)
(intercalate "/" segments) (intercalate "/" $ map escape segments)
(makeQueries q_params) mempty (makeQueries q_params) mempty
where where
makeQueries :: [Param] -> String makeQueries :: [Param] -> String