happstack-authenticate 0.9.5 → 0.9.6

raw patch · 2 files changed

+21/−9 lines, 2 filesdep ~authenticatedep ~bytestringdep ~fb

Dependency ranges changed: authenticate, bytestring, fb

Files

• Happstack/Auth/Core/Auth.hs +17/−5
• happstack-authenticate.cabal +4/−4

@@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell, TypeFamilies, TypeSynonymInstances, DeriveDataTypeable,     FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts,-    UndecidableInstances, TypeOperators, RecordWildCards+    UndecidableInstances, TypeOperators, RecordWildCards, StandaloneDeriving     #-} module Happstack.Auth.Core.Auth     ( UserPass(..)@@ -67,6 +67,7 @@ import qualified Data.Text           as Text import qualified Data.Text.Encoding  as Text import           Data.Text           (Text)+import Facebook                      (UserId, Id(..)) import Network.HTTP.Types            (Ascii) import Web.Authenticate.OpenId       (Identifier) import Web.Routes                    (PathInfo(..))@@ -133,13 +134,24 @@ newtype FacebookId_001 = FacebookId_001 { unFacebookId_001 :: Text }     deriving (Eq, Ord, Read, Show, Data, Typeable, SafeCopy) -newtype FacebookId = FacebookId { unFacebookId :: Ascii }+newtype FacebookId_002 = FacebookId_002 { unFacebookId_002 :: Ascii }     deriving (Eq, Ord, Read, Show, Data, Typeable)-$(deriveSafeCopy 2 'extension ''FacebookId)+$(deriveSafeCopy 2 'extension ''FacebookId_002)+  +instance Migrate FacebookId_002 where+    type MigrateFrom FacebookId_002 = FacebookId_001+    migrate (FacebookId_001 fid) = FacebookId_002 (Text.encodeUtf8 fid) +deriving instance Data Id+$(deriveSafeCopy 0 'base ''Id)++newtype FacebookId = FacebookId { unFacebookId :: UserId }+    deriving (Eq, Ord, Read, Show, Data, Typeable)+$(deriveSafeCopy 3 'extension ''FacebookId)+ instance Migrate FacebookId where-    type MigrateFrom FacebookId = FacebookId_001-    migrate (FacebookId_001 fid) = FacebookId (Text.encodeUtf8 fid)+    type MigrateFrom FacebookId = FacebookId_002+    migrate (FacebookId_002 fid) = FacebookId (Id $ Text.decodeUtf8 fid)  data AuthMethod_v1     = AuthIdentifier_v1 { amIdentifier_v1 :: Identifier

@@ -1,5 +1,5 @@ Name:                happstack-authenticate-Version:             0.9.5+Version:             0.9.6 Synopsis:            Happstack Authentication Library Description:         A themeable authentication library with support for username+password and OpenId. Homepage:            http://src.seereason.com/happstack-authenticate@@ -27,15 +27,15 @@   Build-depends:       base                         > 4 && < 5,                        acid-state                   >= 0.6,                        aeson                        >= 0.4 && < 0.7,-                       authenticate                 == 1.2.*,+                       authenticate                 == 1.3.*,                        blaze-html                   == 0.5.*,-                       bytestring                   == 0.9.*,+                       bytestring                   >= 0.9 && < 0.11,                        containers                   >= 0.4 && < 0.6,                        ixset                        >= 1.0 && < 1.1,                        happstack-server             >= 6.0 && < 7.1,                        http-conduit                 >= 1.4 && < 1.7,                        http-types                   >= 0.6 && < 0.8,-                       fb                           == 0.9.*,+                       fb                           == 0.13.*,                        safecopy                     >= 0.6,                        mtl                          >= 2.0,                        pwstore-purehaskell          == 2.1.*,