diff --git a/authenticate-oauth/Web/Authenticate/OAuth.hs b/authenticate-oauth/Web/Authenticate/OAuth.hs index c31cfa0d..8f3b15f6 100644 --- a/authenticate-oauth/Web/Authenticate/OAuth.hs +++ b/authenticate-oauth/Web/Authenticate/OAuth.hs @@ -39,13 +39,12 @@ import Network.HTTP.Types (Header) import Blaze.ByteString.Builder (toByteString) import Control.Monad.IO.Class (MonadIO) import Network.HTTP.Types (renderSimpleQuery, status200) -import Data.Conduit (($$), ($=), Source) +import Data.Conduit (MonadResource, ($$), ($=), Source) import qualified Data.Conduit.List as CL import Data.Conduit.Blaze (builderToByteString) import Blaze.ByteString.Builder (Builder) import Control.Monad.IO.Class (liftIO) import Control.Monad.Trans.Control -import Control.Monad.Trans.Resource import Data.Default -- | Data type for OAuth client (consumer). @@ -272,7 +271,7 @@ injectVerifier :: BS.ByteString -> Credential -> Credential injectVerifier = insert "oauth_verifier" -- | Add OAuth headers & sign to 'Request'. -signOAuth :: (MonadUnsafeIO m) +signOAuth :: (MonadResource m) => OAuth -- ^ OAuth Application -> Credential -- ^ Credential -> Request m -- ^ Original Request @@ -297,14 +296,14 @@ showSigMtd PLAINTEXT = "PLAINTEXT" showSigMtd HMACSHA1 = "HMAC-SHA1" showSigMtd (RSASHA1 _) = "RSA-SHA1" -addNonce :: MonadUnsafeIO m => Credential -> m Credential +addNonce :: MonadResource m => Credential -> m Credential addNonce cred = do - nonce <- unsafeLiftIO $ replicateM 10 (randomRIO ('a','z')) -- FIXME very inefficient + nonce <- liftIO $ replicateM 10 (randomRIO ('a','z')) -- FIXME very inefficient return $ insert "oauth_nonce" (BS.pack nonce) cred -addTimeStamp :: MonadUnsafeIO m => Credential -> m Credential +addTimeStamp :: MonadResource m => Credential -> m Credential addTimeStamp cred = do - stamp <- (floor . (`diffUTCTime` baseTime)) `liftM` unsafeLiftIO getCurrentTime + stamp <- (floor . (`diffUTCTime` baseTime)) `liftM` liftIO getCurrentTime return $ insert "oauth_timestamp" (BS.pack $ show (stamp :: Integer)) cred injectOAuthToCred :: OAuth -> Credential -> Credential @@ -314,7 +313,7 @@ injectOAuthToCred oa cred = , ("oauth_version", "1.0") ] cred -genSign :: MonadUnsafeIO m => OAuth -> Credential -> Request m -> m BS.ByteString +genSign :: MonadResource m => OAuth -> Credential -> Request m -> m BS.ByteString genSign oa tok req = case oauthSignatureMethod oa of HMACSHA1 -> do @@ -342,7 +341,7 @@ paramEncode = BS.concatMap escape oct = '%' : replicate (2 - length num) '0' ++ num in BS.pack oct -getBaseString :: MonadUnsafeIO m => Credential -> Request m -> m BSL.ByteString +getBaseString :: MonadResource m => Credential -> Request m -> m BSL.ByteString getBaseString tok req = do let bsMtd = BS.map toUpper $ method req isHttps = secure req @@ -362,14 +361,14 @@ getBaseString tok req = do -- So this is OK. return $ BSL.intercalate "&" $ map (fromStrict.paramEncode) [bsMtd, bsURI, bsParams] -toLBS :: MonadUnsafeIO m => RequestBody m -> m BS.ByteString +toLBS :: MonadResource m => RequestBody m -> m BS.ByteString toLBS (RequestBodyLBS l) = return $ toStrict l toLBS (RequestBodyBS s) = return s toLBS (RequestBodyBuilder _ b) = return $ toByteString b toLBS (RequestBodySource _ src) = toLBS' src toLBS (RequestBodySourceChunked src) = toLBS' src -toLBS' :: MonadUnsafeIO m => Source m Builder -> m BS.ByteString +toLBS' :: MonadResource m => Source m Builder -> m BS.ByteString toLBS' src = liftM BS.concat $ src $= builderToByteString $$ CL.consume isBodyFormEncoded :: [Header] -> Bool diff --git a/authenticate-oauth/Web/Authenticate/OAuth/IO.hs b/authenticate-oauth/Web/Authenticate/OAuth/IO.hs index 3db6fa25..b7ba1238 100644 --- a/authenticate-oauth/Web/Authenticate/OAuth/IO.hs +++ b/authenticate-oauth/Web/Authenticate/OAuth/IO.hs @@ -1,86 +1,10 @@ {-# LANGUAGE DeriveDataTypeable, OverloadedStrings, StandaloneDeriving #-} {-# OPTIONS_GHC -Wall -fno-warn-orphans #-} --- | This Module provides interface for the instance of 'MonadIO' instead of 'MonadIO'. --- What this module do is just adding 'withManager' or 'runResourceT'. +-- | This module is deprecated due to the interface change at conduit-0.3. +-- For now, this package only re-exports 'Web.Authenticate.OAuth' module. module Web.Authenticate.OAuth.IO - {-# DEPRECATED "This module is deprecated; rewrite your code using MonadResource" #-} + {-# DEPRECATED "This module is deprecated; use Web.Authenticate.OAuth instead." #-} ( module Web.Authenticate.OAuth, - getAccessToken, - getTemporaryCredential, getTemporaryCredentialWithScope, - getTemporaryCredentialProxy, getTemporaryCredential', - getTokenCredential, - getAccessTokenProxy, getTokenCredentialProxy, - getAccessToken' ) where -import Network.HTTP.Conduit -import qualified Web.Authenticate.OAuth as OA -import Web.Authenticate.OAuth hiding - (getAccessToken, - getTemporaryCredential, getTemporaryCredentialWithScope, - getTemporaryCredentialProxy, getTemporaryCredential', - getTokenCredential, getTemporaryCredentialWithScope, - getAccessTokenProxy, getTemporaryCredentialProxy, - getTokenCredentialProxy, - getAccessToken', getTemporaryCredential') -import Data.Conduit -import Control.Monad.IO.Class -import qualified Data.ByteString.Char8 as BS - - --- | Get temporary credential for requesting acces token. -getTemporaryCredential :: MonadIO m - => OA.OAuth -- ^ OAuth Application - -> m OA.Credential -- ^ Temporary Credential (Request Token & Secret). -getTemporaryCredential = liftIO . withManager . OA.getTemporaryCredential - --- | Get temporary credential for requesting access token with Scope parameter. -getTemporaryCredentialWithScope :: MonadIO m - => BS.ByteString -- ^ Scope parameter string - -> OAuth -- ^ OAuth Application - -> m Credential -- ^ Temporay Credential (Request Token & Secret). -getTemporaryCredentialWithScope bs oa = - liftIO $ withManager $ OA.getTemporaryCredentialWithScope bs oa - - --- | Get temporary credential for requesting access token via the proxy. -getTemporaryCredentialProxy :: MonadIO m - => Maybe Proxy -- ^ Proxy - -> OAuth -- ^ OAuth Application - -> m Credential -- ^ Temporary Credential (Request Token & Secret). -getTemporaryCredentialProxy p oa = liftIO $ withManager $ OA.getTemporaryCredential' (addMaybeProxy p) oa - -getTemporaryCredential' :: MonadIO m - => (Request (ResourceT IO) -> Request (ResourceT IO)) -- ^ Request Hook - -> OAuth -- ^ OAuth Application - -> m Credential -- ^ Temporary Credential (Request Token & Secret). -getTemporaryCredential' hook oa = liftIO $ withManager $ OA.getTemporaryCredential' hook oa - - --- | Get Access token. -getAccessToken, getTokenCredential - :: MonadIO m - => OAuth -- ^ OAuth Application - -> Credential -- ^ Temporary Credential with oauth_verifier - -> m Credential -- ^ Token Credential (Access Token & Secret) -getAccessToken oa cr = liftIO $ withManager $ OA.getAccessToken oa cr - --- | Get Access token via the proxy. -getAccessTokenProxy, getTokenCredentialProxy - :: MonadIO m - => Maybe Proxy -- ^ Proxy - -> OAuth -- ^ OAuth Application - -> Credential -- ^ Temporary Credential with oauth_verifier - -> m Credential -- ^ Token Credential (Access Token & Secret) -getAccessTokenProxy p oa cr = liftIO $ withManager $ OA.getAccessTokenProxy p oa cr - -getAccessToken' :: MonadIO m - => (Request (ResourceT IO) -> Request (ResourceT IO)) -- ^ Request Hook - -> OAuth -- ^ OAuth Application - -> Credential -- ^ Temporary Credential with oauth_verifier - -> m Credential -- ^ Token Credential (Access Token & Secret) -getAccessToken' hook oa cr = liftIO $ withManager $ OA.getAccessToken' hook oa cr - - -getTokenCredential = getAccessToken -getTokenCredentialProxy = getAccessTokenProxy +import Web.Authenticate.OAuth diff --git a/authenticate-oauth/authenticate-oauth.cabal b/authenticate-oauth/authenticate-oauth.cabal index d54f9757..02a4371d 100644 --- a/authenticate-oauth/authenticate-oauth.cabal +++ b/authenticate-oauth/authenticate-oauth.cabal @@ -5,7 +5,7 @@ license: BSD3 license-file: LICENSE author: Hiromi Ishii maintainer: Hiromi Ishii -synopsis: Library to authenticate with OAuth for Haskell web applications. +synopsis: Library to authenticate via OAuth for Haskell web applications. description: OAuth authentication, e.g. Twitter. category: Web stability: Stable @@ -27,7 +27,6 @@ library , http-types >= 0.6 && < 0.7 , blaze-builder , conduit >= 0.4 && < 0.5 - , resourcet >= 0.3 && < 0.4 , blaze-builder-conduit >= 0.4 && < 0.5 , monad-control >= 0.3 && < 0.4 exposed-modules: Web.Authenticate.OAuth, Web.Authenticate.OAuth.IO