apiary-authenticate 0.12.1 → 0.14.0
raw patch · 2 files changed
+21/−24 lines, 2 filesdep −taggeddep ~apiaryPVP ok
version bump matches the API change (PVP)
Dependencies removed: tagged
Dependency ranges changed: apiary
API changes (from Hackage documentation)
Files
apiary-authenticate.cabal view
@@ -1,5 +1,5 @@ name: apiary-authenticate-version: 0.12.1+version: 0.14.0 synopsis: authenticate support for apiary web framework. description: example: <https://github.com/philopon/apiary/blob/master/examples/auth.hs>@@ -21,7 +21,7 @@ Web.Apiary.Authenticate.Explicit other-modules: Web.Apiary.Authenticate.Internal build-depends: base >=4.6 && <4.8- , apiary >=0.12 && <0.14+ , apiary >=0.14 && <0.15 , apiary-clientsession >=0.9 && <0.14 , authenticate >=1.3 && <1.4 , http-client >=0.3 && <0.4@@ -34,9 +34,6 @@ , blaze-builder >=0.3 && <0.4 , reflection >=1.4 && <1.6 , binary >=0.7 && <0.8-- if impl(ghc < 7.8)- build-depends: tagged >=0.7 && <0.8 hs-source-dirs: src ghc-options: -O2 -Wall
src/Web/Apiary/Authenticate/Internal.hs view
@@ -4,39 +4,39 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE CPP #-} module Web.Apiary.Authenticate.Internal where -import Control.Monad.Trans.Resource+import GHC.Generics(Generic)+ import Control.Applicative+import Control.Monad.Trans.Resource+import Control.Monad.Apiary.Filter.Internal -import GHC.Generics(Generic)+import Network.HTTP.Client.TLS(tlsManagerSettings)+import qualified Network.HTTP.Types as HTTP+import qualified Network.HTTP.Client as Client++import Web.Authenticate.OpenId+import Web.Apiary hiding(Default(..))+import Web.Apiary.ClientSession.Explicit+import qualified Web.Apiary.Wai as Wai+ import Data.Binary import Data.Data import Data.Maybe import Data.List import Data.Default.Class-#if __GLASGOW_HASKELL__ < 707-import Data.Proxy -- for ghc-7.6-#endif+import Data.Apiary.Proxy+import Data.Apiary.SList++import Blaze.ByteString.Builder import qualified Data.ByteString.Char8 as S import qualified Data.ByteString.Lazy as L import qualified Data.Text as T import qualified Data.Text.Encoding as T-import Blaze.ByteString.Builder -import qualified Web.Apiary.Wai as Wai-import qualified Network.HTTP.Types as HTTP-import qualified Network.HTTP.Client as Client-import Network.HTTP.Client.TLS(tlsManagerSettings)-import Web.Authenticate.OpenId -import Web.Apiary hiding(Default(..))-import Data.Apiary.SList-import Control.Monad.Apiary.Filter.Internal-import Web.Apiary.ClientSession.Explicit- data AuthConfig = AuthConfig { authSessionName :: S.ByteString , authSuccessPage :: S.ByteString@@ -80,10 +80,10 @@ where pfxPath p = function id (\_ r -> if p `isPrefixOf` Wai.pathInfo r then Just SNil else Nothing) - retH = pfxPath (authPrefix config ++ authReturnToPath config) . stdMethod GET . action $+ retH = pfxPath (authPrefix config ++ authReturnToPath config) . method GET . action $ returnAction authSession manager (authSessionName config) (authSuccessPage config) - go name Provider{..} = pfxPath (authPrefix config ++ [name]) . stdMethod GET . action $+ go name Provider{..} = pfxPath (authPrefix config ++ [name]) . method GET . action $ authAction manager providerUrl returnTo realm parameters returnTo = T.decodeUtf8 $ T.encodeUtf8 (authUrl config) `S.append`