apiary-authenticate 1.4.0 → 1.5.0
raw patch · 3 files changed
+14/−16 lines, 3 filesdep −types-compatdep −web-routingdep ~apiarydep ~apiary-sessiondep ~basenew-uploaderPVP ok
version bump matches the API change (PVP)
Dependencies removed: types-compat, web-routing
Dependency ranges changed: apiary, apiary-session, base
API changes (from Hackage documentation)
- Web.Apiary.Authenticate: authLogoutPath :: AuthConfig -> [Text]
- Web.Apiary.Authenticate: authPrefix :: AuthConfig -> [Text]
- Web.Apiary.Authenticate: authReturnToPath :: AuthConfig -> [Text]
- Web.Apiary.Authenticate: authSuccessPage :: AuthConfig -> ByteString
- Web.Apiary.Authenticate: authUrl :: AuthConfig -> Text
- Web.Apiary.Authenticate: claimed :: OpenId_ a -> Maybe a
- Web.Apiary.Authenticate: opLocal :: OpenId_ a -> a
- Web.Apiary.Authenticate: parameters :: Provider -> [(Text, Text)]
- Web.Apiary.Authenticate: params :: OpenId_ a -> [(a, a)]
- Web.Apiary.Authenticate: providerUrl :: Provider -> Text
- Web.Apiary.Authenticate: providers :: AuthConfig -> [(Text, Provider)]
- Web.Apiary.Authenticate: realm :: Provider -> Maybe Text
+ Web.Apiary.Authenticate: [authLogoutPath] :: AuthConfig -> [Text]
+ Web.Apiary.Authenticate: [authPrefix] :: AuthConfig -> [Text]
+ Web.Apiary.Authenticate: [authReturnToPath] :: AuthConfig -> [Text]
+ Web.Apiary.Authenticate: [authSuccessPage] :: AuthConfig -> ByteString
+ Web.Apiary.Authenticate: [authUrl] :: AuthConfig -> Text
+ Web.Apiary.Authenticate: [claimed] :: OpenId_ a -> Maybe a
+ Web.Apiary.Authenticate: [opLocal] :: OpenId_ a -> a
+ Web.Apiary.Authenticate: [parameters] :: Provider -> [(Text, Text)]
+ Web.Apiary.Authenticate: [params] :: OpenId_ a -> [(a, a)]
+ Web.Apiary.Authenticate: [providerUrl] :: Provider -> Text
+ Web.Apiary.Authenticate: [providers] :: AuthConfig -> [(Text, Provider)]
+ Web.Apiary.Authenticate: [realm] :: Provider -> Maybe Text
Files
- apiary-authenticate.cabal +7/−9
- src/Web/Apiary/Authenticate.hs +3/−3
- src/Web/Apiary/Authenticate/Internal.hs +4/−4
apiary-authenticate.cabal view
@@ -1,5 +1,5 @@ name: apiary-authenticate-version: 1.4.0+version: 1.5.0 synopsis: authenticate support for apiary web framework. description: example: <https://github.com/philopon/apiary/blob/master/examples/auth.hs>@@ -19,11 +19,11 @@ library exposed-modules: Web.Apiary.Authenticate other-modules: Web.Apiary.Authenticate.Internal- build-depends: base >=4.6 && <4.8- , apiary >=1.4 && <1.5- , apiary-session >=1.4 && <1.5+ build-depends: base >=4.7 && <5.0+ , apiary >=2.1 && <3.0+ , apiary-session >=1.4 && <1.6 , authenticate >=1.3.2.10 && <1.4- , wai >=3.0 && <3.1+ , wai >=3.0 && <3.3 , monad-control >=0.3 && <1.1 @@ -32,14 +32,12 @@ , data-default-class >=0.0 && <0.1 , bytestring >=0.10 && <0.11- , cereal >=0.4 && <0.5+ , cereal >=0.4 && <0.6 , text >=1.1 && <1.3- , http-types >=0.8 && <0.9+ , http-types >=0.8 && <0.10 , resourcet >=1.1 && <1.2 , blaze-builder >=0.3 && <0.5- , web-routing- , types-compat hs-source-dirs: src ghc-options: -O2 -Wall
src/Web/Apiary/Authenticate.hs view
@@ -23,7 +23,7 @@ import Web.Apiary import qualified Web.Apiary.Authenticate.Internal as I-import qualified Network.Routing.Dict as Dict+import qualified Data.Apiary.Routing.Dict as Dict import qualified Network.HTTP.Client as Client import Network.HTTP.Client.TLS(tlsManagerSettings) import Web.Apiary.Session@@ -34,7 +34,7 @@ import qualified Data.Text as T import qualified Data.ByteString as S -import GHC.TypeLits.Compat(KnownSymbol)+import GHC.TypeLits(KnownSymbol) import Data.Apiary.Extension pOpenId :: Proxy I.OpenId@@ -58,7 +58,7 @@ -- | default auth handlers. since 0.8.0.0. authHandler :: (Monad m, MonadIO actM, Has I.Auth exts, Has (Session I.OpenId actM) exts) => ApiaryT exts prms actM m ()-authHandler = getExt (Proxy :: Proxy I.Auth) >>= I.authHandler +authHandler = getExt (Proxy :: Proxy I.Auth) >>= I.authHandler authorized' :: (Has (Session I.OpenId actM) exts, KnownSymbol key, Monad actM, key Dict.</ kvs) => proxy key
src/Web/Apiary/Authenticate/Internal.hs view
@@ -27,10 +27,10 @@ import Web.Apiary.Session(Session, deleteSession, setSession) import Data.Apiary.Extension(Has, Extension)-import Data.Proxy.Compat(Proxy(..))+import Data.Proxy(Proxy(..)) import Data.Typeable(Typeable) import Data.Apiary.Method(Method(GET))-import qualified Network.Routing as R+import qualified Data.Apiary.Routing as R import qualified Data.Serialize as Serialize import Data.Data (Data)@@ -61,7 +61,7 @@ } instance Default AuthConfig where- def = AuthConfig "/" "http://localhost:3000" ["auth"] ["return_to"] ["logout"] $ + def = AuthConfig "/" "http://localhost:3000" ["auth"] ["return_to"] ["logout"] $ [ ("google", Provider "https://www.google.com/accounts/o8/id" Nothing []) , ("yahoo", Provider "http://me.yahoo.com/" Nothing []) ]@@ -131,7 +131,7 @@ type OpenId = OpenId_ T.Text toOpenId :: OpenId.OpenIdResponse -> OpenId-toOpenId r = OpenId_ +toOpenId r = OpenId_ (OpenId.identifier $ OpenId.oirOpLocal r) (OpenId.oirParams r) (OpenId.identifier <$> OpenId.oirClaimed r)