authenticate 1.3.2.7 → 1.3.2.8

raw patch · 5 files changed

+11/−5 lines, 5 filesdep +monad-controldep +resourcetdep ~aesondep ~conduit

Dependencies added: monad-control, resourcet

Dependency ranges changed: aeson, conduit

Files

• OpenId2/Discovery.hs +2/−1
• Web/Authenticate/BrowserId.hs +2/−1
• Web/Authenticate/OpenId.hs +2/−1
• Web/Authenticate/Rpxnow.hs +2/−1
• authenticate.cabal +3/−1

@@ -40,7 +40,8 @@ import Control.Applicative ((<$>), (<*>)) import Network.HTTP.Types (status200) import Control.Exception (throwIO)-import Data.Conduit (MonadBaseControl, MonadResource)+import Control.Monad.Trans.Control (MonadBaseControl)+import Control.Monad.Trans.Resource (MonadResource) import Data.Conduit ((=$), ($$), yield) import Text.HTML.TagStream.Text (tokenStream, Token) import Text.HTML.TagStream.Types (Token' (TagOpen))

@@ -12,7 +12,8 @@ import qualified Data.HashMap.Lazy as Map import Data.Text.Encoding (encodeUtf8) import Control.Monad.IO.Class (liftIO)-import Data.Conduit (MonadBaseControl, MonadResource)+import Control.Monad.Trans.Control (MonadBaseControl)+import Control.Monad.Trans.Resource (MonadResource)  -- | Location of the Javascript file hosted by browserid.org browserIdJs :: Text

@@ -36,7 +36,8 @@ import Blaze.ByteString.Builder (toByteString) import Network.HTTP.Types (renderQueryText) import Control.Exception (throwIO)-import Data.Conduit (MonadBaseControl, MonadResource)+import Control.Monad.Trans.Control (MonadBaseControl)+import Control.Monad.Trans.Resource (MonadResource)  getForwardUrl     :: (MonadResource m, MonadBaseControl IO m)

@@ -38,7 +38,8 @@ import qualified Data.HashMap.Lazy as Map import Control.Applicative ((<$>), (<*>)) import Control.Exception (throwIO)-import Data.Conduit (MonadBaseControl, MonadResource)+import Control.Monad.Trans.Control (MonadBaseControl)+import Control.Monad.Trans.Resource (MonadResource)  -- | Information received from Rpxnow after a valid login. data Identifier = Identifier

@@ -1,5 +1,5 @@ name:            authenticate-version:         1.3.2.7+version:         1.3.2.8 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman, Hiromi Ishii, Arash Rouhani@@ -32,6 +32,8 @@                    , unordered-containers                    , conduit                       >= 0.5                    , tagstream-conduit             >= 0.5.5+                   , resourcet+                   , monad-control     exposed-modules: Web.Authenticate.Rpxnow,                      Web.Authenticate.OpenId,                      Web.Authenticate.BrowserId,