authenticate 0.9.1 → 0.9.1.1

raw patch · 2 files changed

+10/−10 lines, 2 filesPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

API changes (from Hackage documentation)

Files

• Web/Authenticate/Facebook.hs +9/−9
• authenticate.cabal +1/−1

@@ -7,19 +7,19 @@     , getForwardUrl     , getAccessToken     , getGraphData+    , getGraphData_     ) where  import Network.HTTP.Enumerator-import Data.List (intercalate)+import Network.HTTP.Types (parseSimpleQuery) import Data.Aeson import qualified Data.ByteString.Lazy.Char8 as L8-import Web.Authenticate.Internal (qsEncode) import Data.Data (Data) import Data.Typeable (Typeable) import Control.Exception (Exception, throwIO) import Data.Attoparsec.Lazy (parse, eitherResult) import qualified Data.ByteString.Char8 as S8-import Data.Text (Text, pack)+import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Encoding as TE import Blaze.ByteString.Builder (toByteString, copyByteString)@@ -67,10 +67,10 @@ getAccessToken fb code = do     let url = accessTokenUrl fb code     b <- simpleHttp $ S8.unpack url-    let (front, back) = splitAt 13 $ L8.unpack b-    case front of-        "access_token=" -> return $ AccessToken $ T.pack back-        _ -> error $ "Invalid facebook response: " ++ back+    let params = parseSimpleQuery $ S8.concat $ L8.toChunks b+    case lookup "access_token" params of+        Just x -> return $ AccessToken $ T.pack $ S8.unpack x+        Nothing -> error $ "Invalid facebook response: " ++ L8.unpack b  graphUrl :: AccessToken -> Text -> ByteString graphUrl (AccessToken s) func =@@ -85,8 +85,8 @@     b <- simpleHttp $ S8.unpack url     return $ eitherResult $ parse json b -getGraphData' :: AccessToken -> Text -> IO Value-getGraphData' a b = getGraphData a b >>= either (throwIO . InvalidJsonException) return+getGraphData_ :: AccessToken -> Text -> IO Value+getGraphData_ a b = getGraphData a b >>= either (throwIO . InvalidJsonException) return  data InvalidJsonException = InvalidJsonException String     deriving (Show, Typeable)

@@ -1,5 +1,5 @@ name:            authenticate-version:         0.9.1+version:         0.9.1.1 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>