yesod-auth-oauth2 0.1.0 → 0.1.1

raw patch · 6 files changed

+91/−38 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Yesod/Auth/OAuth2.hs +20/−0
• Yesod/Auth/OAuth2/Github.hs +1/−1
• Yesod/Auth/OAuth2/Spotify.hs +1/−10
• Yesod/Auth/OAuth2/Twitter.hs +53/−0
• Yesod/Auth/OAuth2/Upcase.hs +14/−26
• yesod-auth-oauth2.cabal +2/−1

@@ -12,6 +12,7 @@ module Yesod.Auth.OAuth2     ( authOAuth2     , oauth2Url+    , fromProfileURL     , YesodOAuth2Exception(..)     , module Network.OAuth.OAuth2     ) where@@ -54,6 +55,9 @@            --   retrieve additional information about the user, to be            --   set in the session as @'Creds'@. Usually this means a            --   second authorized request to @api/me.json@.+           --+           --   See @'fromProfileURL'@ for an example.+           --            -> AuthPlugin m authOAuth2 name oauth getCreds = AuthPlugin name dispatch login @@ -103,6 +107,22 @@     login tm = [whamlet|         <a href=@{tm $ oauth2Url name}>Login via #{name}         |]++-- | Handle the common case of fetching Profile information a JSON endpoint+--+-- Throws @'InvalidProfileResponse'@ if JSON parsing fails+--+fromProfileURL :: FromJSON a+               => Text           -- ^ Plugin name+               -> URI            -- ^ Profile URI+               -> (a -> Creds m) -- ^ Conversion to Creds+               -> Manager -> AccessToken -> IO (Creds m)+fromProfileURL name url toCreds manager token = do+    result <- authGetJSON manager token url++    case result of+        Right profile -> return $ toCreds profile+        Left err -> throwIO $ InvalidProfileResponse name err  bsToText :: ByteString -> Text bsToText = decodeUtf8With lenientDecode

@@ -15,7 +15,7 @@     ) where  #if __GLASGOW_HASKELL__ < 710-import Control.Applicative ((<$>), (<*>), pure)+import Control.Applicative ((<$>), (<*>)) #endif  import Control.Exception.Lifted

@@ -13,14 +13,12 @@ import Control.Applicative ((<$>), (<*>), pure) #endif -import Control.Exception.Lifted import Control.Monad (mzero) import Data.Aeson import Data.ByteString (ByteString) import Data.Maybe import Data.Text (Text) import Data.Text.Encoding (encodeUtf8)-import Network.HTTP.Conduit(Manager) import Yesod.Auth import Yesod.Auth.OAuth2 @@ -78,14 +76,7 @@         , oauthAccessTokenEndpoint = "https://accounts.spotify.com/api/token"         , oauthCallback = Nothing         }-    fetchSpotifyProfile--fetchSpotifyProfile :: Manager -> AccessToken -> IO (Creds m)-fetchSpotifyProfile manager token = do-    result <- authGetJSON manager token "https://api.spotify.com/v1/me"-    case result of-        Right user -> return $ toCreds user-        Left err -> throwIO $ InvalidProfileResponse "spotify" err+    $ fromProfileURL "spotify" "https://api.spotify.com/v1/me" toCreds  toCreds :: SpotifyUser -> Creds m toCreds user = Creds

@@ -0,0 +1,53 @@+{-# LANGUAGE CPP #-}+{-# LANGUAGE OverloadedStrings #-}+module Yesod.Auth.OAuth2.Twitter+    ( oauth2Twitter+    , module Yesod.Auth.OAuth2+    ) where++#if __GLASGOW_HASKELL__ < 710+import Control.Applicative ((<$>), (<*>))+#endif++import Control.Monad (mzero)+import Data.Aeson+import Data.Text (Text)+import Data.Text.Encoding (encodeUtf8)+import Yesod.Auth+import Yesod.Auth.OAuth2++data TwitterUser = TwitterUser+    { twitterUserId :: Text+    , twitterUserName :: Text+    , twitterScreenName :: Text+    }++instance FromJSON TwitterUser where+    parseJSON (Object o) = TwitterUser+        <$> o .: "id_str"+        <*> o .: "name"+        <*> o .: "screen_name"++    parseJSON _ = mzero++oauth2Twitter :: YesodAuth m+              => Text -- ^ Client ID+              -> Text -- ^ Client Secret+              -> AuthPlugin m+oauth2Twitter clientId clientSecret = authOAuth2 "twitter"+    OAuth2+        { oauthClientId = encodeUtf8 clientId+        , oauthClientSecret = encodeUtf8 clientSecret+        , oauthOAuthorizeEndpoint = "https://api.twitter.com/oauth/authorize"+        , oauthAccessTokenEndpoint = "https://api.twitter.com/oauth/access_token"+        , oauthCallback = Nothing+        }+    $ fromProfileURL "twitter" "https://api.twitter.com/1.1/account/verify_credentials.json"+    $ \user -> Creds+        { credsPlugin = "twitter"+        , credsIdent = twitterUserId user+        , credsExtra =+            [ ("name", twitterUserName user)+            , ("screen_name", twitterScreenName user)+            ]+        }

@@ -14,17 +14,15 @@     ) where  #if __GLASGOW_HASKELL__ < 710-import Control.Applicative ((<$>), (<*>), pure)+import Control.Applicative ((<$>), (<*>)) #endif -import Control.Exception.Lifted import Control.Monad (mzero) import Data.Aeson import Data.Text (Text) import Data.Text.Encoding (encodeUtf8) import Yesod.Auth import Yesod.Auth.OAuth2-import Network.HTTP.Conduit(Manager) import qualified Data.Text as T  data UpcaseUser = UpcaseUser@@ -52,9 +50,9 @@     parseJSON _ = mzero  oauth2Upcase :: YesodAuth m-            => Text -- ^ Client ID-            -> Text -- ^ Client Secret-            -> AuthPlugin m+             => Text -- ^ Client ID+             -> Text -- ^ Client Secret+             -> AuthPlugin m oauth2Upcase clientId clientSecret = authOAuth2 "upcase"     OAuth2         { oauthClientId = encodeUtf8 clientId@@ -63,23 +61,13 @@         , oauthAccessTokenEndpoint = "http://upcase.com/oauth/token"         , oauthCallback = Nothing         }-    fetchUpcaseProfile--fetchUpcaseProfile :: Manager -> AccessToken -> IO (Creds m)-fetchUpcaseProfile manager token = do-    result <- authGetJSON manager token "http://upcase.com/api/v1/me.json"--    case result of-        Right (UpcaseResponse user) -> return $ toCreds user-        Left err -> throwIO $ InvalidProfileResponse "upcase" err--toCreds :: UpcaseUser -> Creds m-toCreds user = Creds-    { credsPlugin = "upcase"-    , credsIdent = T.pack $ show $ upcaseUserId user-    , credsExtra =-        [ ("first_name", upcaseUserFirstName user)-        , ("last_name" , upcaseUserLastName user)-        , ("email"     , upcaseUserEmail user)-        ]-    }+    $ fromProfileURL "upcase" "http://upcase.com/api/v1/me.json"+    $ \user -> Creds+        { credsPlugin = "upcase"+        , credsIdent = T.pack $ show $ upcaseUserId user+        , credsExtra =+            [ ("first_name", upcaseUserFirstName user)+            , ("last_name", upcaseUserLastName user)+            , ("email", upcaseUserEmail user)+            ]+        }

@@ -1,5 +1,5 @@ name:            yesod-auth-oauth2-version:         0.1.0+version:         0.1.1 license:         BSD3 license-file:    LICENSE author:          Tom Streller@@ -40,6 +40,7 @@     exposed-modules: Yesod.Auth.OAuth2                      Yesod.Auth.OAuth2.Github                      Yesod.Auth.OAuth2.Spotify+                     Yesod.Auth.OAuth2.Twitter                      Yesod.Auth.OAuth2.Upcase      ghc-options:     -Wall