happstack-authenticate 2.3.4.8 → 2.3.4.10

raw patch · 3 files changed

+14/−12 lines, 3 filesdep ~aesondep ~email-validatedep ~http-conduitPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: aeson, email-validate, http-conduit, http-types, lens, time

API changes (from Hackage documentation)

Files

• Happstack/Authenticate/OpenId/Core.hs +3/−2
• Happstack/Authenticate/OpenId/Route.hs +3/−2
• happstack-authenticate.cabal +8/−8

@@ -29,7 +29,7 @@ import Happstack.Authenticate.OpenId.URL import Happstack.Server            (RqBody(..), Happstack, Method(..), Response, askRq, unauthorized, badRequest, internalServerError, forbidden, lookPairsBS, method, resp, takeRequestBody, toResponse, toResponseBS, ok) import Language.Javascript.JMacro-import Network.HTTP.Conduit        (withManager)+import Network.HTTP.Conduit        (newManager, tlsManagerSettings) import Text.Shakespeare.I18N       (RenderMessage(..), Lang, mkMessageFor) import Web.Authenticate.OpenId     (Identifier) import Web.Authenticate.OpenId     (Identifier, OpenIdResponse(..), authenticateClaimed, getForwardUrl)@@ -167,7 +167,8 @@ getIdentifier =     do pairs'      <- lookPairsBS        let pairs = mapMaybe (\(k, ev) -> case ev of (Left _) -> Nothing ; (Right v) -> Just (T.pack k, TL.toStrict $ TL.decodeUtf8 v)) pairs'-       oir <- liftIO $ withManager $ authenticateClaimed pairs+       oir <- liftIO $ do manager <- newManager tlsManagerSettings+                          authenticateClaimed pairs manager        return (oirOpLocal oir)  token :: (Alternative m, Happstack m) =>

@@ -19,7 +19,7 @@ import HSP                        (unXMLGenT) import HSP.HTML4                  (html4StrictFrag) import Language.Javascript.JMacro (JStat)-import Network.HTTP.Conduit        (withManager)+import Network.HTTP.Conduit        (newManager, tlsManagerSettings) import System.FilePath       (combine) import Text.Shakespeare.I18N (Lang) import Web.Authenticate.OpenId     (Identifier, OpenIdResponse(..), authenticateClaimed, getForwardUrl)@@ -46,7 +46,8 @@         (BeginDance providerURL) ->           do returnURL <- nestOpenIdURL $ showURL ReturnTo              realm <- query' openIdState GetOpenIdRealm-             forwardURL <- liftIO $ withManager $ getForwardUrl providerURL returnURL realm [] -- [("Email", "http://schema.openid.net/contact/email")]+             forwardURL <- liftIO $ do manager <- newManager tlsManagerSettings+                                       getForwardUrl providerURL returnURL realm [] manager -- [("Email", "http://schema.openid.net/contact/email")]              seeOther forwardURL (toResponse ())         ReturnTo -> token authenticateState authenticateConfig openIdState         Realm    -> realm authenticateState openIdState

@@ -1,5 +1,5 @@ Name:                happstack-authenticate-Version:             2.3.4.8+Version:             2.3.4.10 Synopsis:            Happstack Authentication Library Description:         A themeable authentication library with support for username+password and OpenId. Homepage:            http://www.happstack.com/@@ -11,7 +11,7 @@ Category:            Web Build-type:          Simple Cabal-version:       >=1.8-tested-with:         GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1+tested-with:         GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1, GHC == 8.2.2 data-files:   messages/core/en.msg   messages/openid/error/en.msg@@ -43,14 +43,14 @@    Build-depends:       base                         > 4     && < 5,                        acid-state                   >= 0.6  && < 0.15,-                       aeson                        (>= 0.4  && < 0.10) || (>= 0.11 && < 1.2),+                       aeson                        (>= 0.4  && < 0.10) || (>= 0.11 && < 1.3),                        authenticate                 == 1.3.*,                        base64-bytestring            >= 1.0  && < 1.1,                        boomerang                    >= 1.4  && < 1.5,                        bytestring                   >= 0.9  && < 0.11,                        containers                   >= 0.4  && < 0.6,                        data-default                 >= 0.5  && < 0.8,-                       email-validate               >= 2.1  && < 2.3,+                       email-validate               >= 2.1  && < 2.4,                        filepath                     >= 1.3  && < 1.5,                        hsx2hs                       >= 0.13 && < 0.15,                        jmacro                       >= 0.6.11  && < 0.7,@@ -59,17 +59,17 @@                        happstack-jmacro             >= 7.0  && < 7.1,                        happstack-server             >= 6.0  && < 7.6,                        happstack-hsp                >= 7.3  && < 7.4,-                       http-conduit                 >= 1.4  && < 2.3,-                       http-types                   >= 0.6  && < 0.10,+                       http-conduit                 >= 2.1.0 && < 2.4,+                       http-types                   >= 0.6  && < 0.13,                        hsp                          >= 0.10 && < 0.11,                        hsx-jmacro                   >= 7.3  && < 7.4,                        safecopy                     >= 0.8  && < 0.10,                        mime-mail                    >= 0.4  && < 0.5,                        mtl                          >= 2.0  && < 2.3,-                       lens                         >= 4.2  && < 4.16,+                       lens                         >= 4.2  && < 4.17,                        pwstore-purehaskell          == 2.1.*,                        text                         >= 0.11 && < 1.3,-                       time                         >= 1.2  && < 1.7,+                       time                         >= 1.2  && < 1.10,                        userid                       >= 0.1  && < 0.2,                        random                       >= 1.0  && < 1.2,                        shakespeare                  >= 2.0  && < 2.1,