From 165713c350829a90679d18e92331aaf86811dee7 Mon Sep 17 00:00:00 2001 From: Freiric Barral Date: Fri, 29 Aug 2014 18:54:04 +0200 Subject: [PATCH] use tls manager argument in fetchGithubProfile (introduced in 'Version upgrade (hoauth2 0.4.1)'.) --- Yesod/Auth/OAuth2/Github.hs | 8 +++----- yesod-auth-oauth2.cabal | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Yesod/Auth/OAuth2/Github.hs b/Yesod/Auth/OAuth2/Github.hs index 5827775..f998819 100644 --- a/Yesod/Auth/OAuth2/Github.hs +++ b/Yesod/Auth/OAuth2/Github.hs @@ -22,8 +22,7 @@ import Yesod.Auth import Yesod.Auth.OAuth2 import Yesod.Core import Yesod.Form -import Network.HTTP.Client (newManager) -import Network.HTTP.Client.TLS (tlsManagerSettings) +import Network.HTTP.Conduit(Manager) import Data.UUID (toString) import Data.UUID.V4 (nextRandom) import qualified Data.ByteString as BS @@ -82,9 +81,8 @@ oauth2Github clientId clientSecret scopes = basicPlugin {apDispatch = dispatch} dispatch method ps = (apDispatch basicPlugin) method ps -fetchGithubProfile :: AccessToken -> IO (Creds m) -fetchGithubProfile token = do - manager <- newManager tlsManagerSettings +fetchGithubProfile :: Manager -> AccessToken -> IO (Creds m) +fetchGithubProfile manager token = do result <- authGetJSON manager token "https://api.github.com/user" case result of diff --git a/yesod-auth-oauth2.cabal b/yesod-auth-oauth2.cabal index aef15aa..2151ee0 100644 --- a/yesod-auth-oauth2.cabal +++ b/yesod-auth-oauth2.cabal @@ -42,8 +42,6 @@ library , transformers >= 0.2.2 && < 0.4 , hoauth2 >= 0.4.1 && < 0.5 , lifted-base >= 0.2 && < 0.4 - , http-client >= 0.3 && < 0.4 - , http-client-tls >= 0.2 && < 0.3 , uuid >= 1.3 && < 1.4 exposed-modules: Yesod.Auth.OAuth2