haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http-conduit queryString change

Browse Source
This commit is contained in:
Michael 2011-12-29 13:38:26 +02:00
parent dca8501d7f
commit 1e095162d0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Web/Authenticate/OAuth.hs
View File

@ -34,7 +34,6 @@ import Data.Time
import Numeric import Numeric
import Codec.Crypto.RSA (rsassa_pkcs1_v1_5_sign, ha_SHA1, PrivateKey(..)) import Codec.Crypto.RSA (rsassa_pkcs1_v1_5_sign, ha_SHA1, PrivateKey(..))
import Network.HTTP.Types (Header) import Network.HTTP.Types (Header)
import Control.Arrow (second)
import Blaze.ByteString.Builder (toByteString) import Blaze.ByteString.Builder (toByteString)
import Control.Monad.IO.Class (MonadIO) import Control.Monad.IO.Class (MonadIO)
import Network.HTTP.Types (renderSimpleQuery) import Network.HTTP.Types (renderSimpleQuery)
@ -263,7 +262,7 @@ getBaseString tok req = do
bsPort = if (isHttps && port req /= 443) || (not isHttps && port req /= 80) bsPort = if (isHttps && port req /= 443) || (not isHttps && port req /= 80)
then ':' `BS.cons` BS.pack (show $ port req) else "" then ':' `BS.cons` BS.pack (show $ port req) else ""
bsURI = BS.concat [scheme, "://", host req, bsPort, path req] bsURI = BS.concat [scheme, "://", host req, bsPort, path req]
bsQuery = map (second $ fromMaybe "") $ queryString req bsQuery = parseSimpleQuery $ queryString req
bsBodyQ <- if isBodyFormEncoded $ requestHeaders req bsBodyQ <- if isBodyFormEncoded $ requestHeaders req
then liftM parseSimpleQuery $ toLBS (requestBody req) then liftM parseSimpleQuery $ toLBS (requestBody req)
else return [] else return []

2
authenticate.cabal
View File

@ -1,5 +1,5 @@
name: authenticate name: authenticate
version: 0.11.0 version: 0.11.0.1
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Hiromi Ishii, Arash Rouhani author: Michael Snoyman, Hiromi Ishii, Arash Rouhani