req-oauth2 0.1.0.0 → 0.1.0.1

raw patch · 6 files changed

+12/−17 lines, 6 filesdep −req-url-extra

Dependencies removed: req-url-extra

Files

• lib/Network/HTTP/Req/OAuth2.hs +2/−1
• lib/Network/HTTP/Req/OAuth2/Internal/AccessToken.hs +2/−4
• lib/Network/HTTP/Req/OAuth2/Internal/RefreshToken.hs +2/−4
• lib/Network/HTTP/Req/OAuth2/Internal/Util.hs +2/−2
• lib/Network/HTTP/Req/OAuth2/Internal/Verbs.hs +2/−3
• req-oauth2.cabal +2/−3

@@ -7,7 +7,7 @@ Stability   : stable Portability : portable -This package provides basic support of OAuth2 authentication for <https://hackage.haskell.org/package/req Req>.+This package provides basic support for OAuth2 authentication for <https://hackage.haskell.org/package/req Req>. -}  module Network.HTTP.Req.OAuth2@@ -25,6 +25,7 @@     , UpdateTokenPair     , evalOAuth2     , fetchAccessToken+    , fetchRefreshToken     , getAuthCode     , oAuth2Get     , runOAuth2

@@ -8,13 +8,11 @@  import           Data.Aeson ((.:), withObject) import           Data.Aeson.Types (Parser, Value, parseEither)-import           Data.Monoid ((<>)) import           Data.Text (Text)-import           Network.HTTP.Req ((=:))+import           Network.HTTP.Req ((=:), useHttpsURI) import           Network.HTTP.Req.OAuth2.Internal.AuthCode import           Network.HTTP.Req.OAuth2.Internal.Types import           Network.HTTP.Req.OAuth2.Internal.Util-import           Network.HTTP.Req.Url.Extra (toUrlHttps)  data AccessTokenRequest = AccessTokenRequest AuthCode @@ -31,7 +29,7 @@ fetchAccessToken app (AccessTokenRequest (AuthCode ac)) = do     let clientPair = appClientPair app         ClientPair (ClientId cid) _ = clientPair-        Just (url, _) = toUrlHttps $ appTokenUri app+        Just (url, _) = useHttpsURI $ appTokenUri app     parseEither pResponse <$>         oAuth2PostRaw             url

@@ -8,10 +8,8 @@  import           Data.Aeson ((.:), withObject) import           Data.Aeson.Types (Parser, Value, parseEither)-import           Data.Monoid ((<>)) import           Data.Text (Text)-import           Network.HTTP.Req ((=:))-import           Network.HTTP.Req.Url.Extra (toUrlHttps)+import           Network.HTTP.Req ((=:), useHttpsURI) import           Network.HTTP.Req.OAuth2.Internal.Types import           Network.HTTP.Req.OAuth2.Internal.Util @@ -22,7 +20,7 @@ fetchRefreshToken :: App -> RefreshTokenRequest -> IO (Either String RefreshTokenResponse) fetchRefreshToken app (RefreshTokenRequest (RefreshToken rt)) = do     let clientPair = appClientPair app-        Just (url, _) = toUrlHttps $ appTokenUri app+        Just (url, _) = useHttpsURI $ appTokenUri app     parseEither pResponse <$>         oAuth2PostRaw             url

@@ -16,7 +16,6 @@ import           Data.Aeson (Value) import qualified Data.ByteString as ByteString (append, concat) import qualified Data.ByteString.Base64 as Base64 (encode)-import           Data.Default.Class (def) import qualified Data.Text.Encoding as Text (encodeUtf8) import qualified Network.HTTP.Client as HTTP (HttpException(..), HttpExceptionContent(..), responseStatus) import           Network.HTTP.Req@@ -27,6 +26,7 @@                     , ReqBodyUrlEnc(..)                     , Scheme(..)                     , Url+                    , defaultHttpConfig                     , header                     , jsonResponse                     , oAuth2Bearer@@ -57,7 +57,7 @@  oAuth2PostRaw :: Url 'Https -> Option 'Https -> FormUrlEncodedParam -> IO Value oAuth2PostRaw url opts formBody =-    runReq def $+    runReq defaultHttpConfig $         responseBody <$> req POST url (ReqBodyUrlEnc formBody) jsonResponse opts  evalOAuth2 :: TokenPair -> OAuth2 a -> IO a

@@ -9,13 +9,12 @@ import           Control.Monad.Trans.State.Strict (get, put) import           Data.Aeson (Value) import           Data.Aeson.Types (Parser, parseEither)-import           Data.Default.Class (def)-import           Data.Monoid ((<>)) import           Network.HTTP.Req                     ( GET(..)                     , NoReqBody(..)                     , Scheme(..)                     , Url+                    , defaultHttpConfig                     , jsonResponse                     , req                     , responseBody@@ -52,7 +51,7 @@     -> AccessToken     -> IO Value getHelper url accessToken =-    responseBody <$> (runReq def $ req GET url NoReqBody jsonResponse (oAuth2BearerHeader accessToken <> acceptLanguage))+    responseBody <$> (runReq defaultHttpConfig $ req GET url NoReqBody jsonResponse (oAuth2BearerHeader accessToken <> acceptLanguage))  refreshHelper ::     App

@@ -1,6 +1,6 @@  name:                                       req-oauth2-version:                                    0.1.0.0+version:                                    0.1.0.1 synopsis:                                   Provides OAuth2 authentication for use with Req description:                                This package adds OAuth2 authentication to Req. homepage:                                   https://github.com/rcook/req-oauth2#readme@@ -8,7 +8,7 @@ license-file:                               LICENSE author:                                     Richard Cook maintainer:                                 rcook@rcook.org-copyright:                                  2018 Richard Cook+copyright:                                  (C) 2018-2021 Richard Cook category:                                   Command Line build-type:                                 Simple cabal-version:                              >= 1.10@@ -36,7 +36,6 @@                                           , lens                                           , modern-uri                                           , req-                                          , req-url-extra                                           , text                                           , transformers   exposed-modules:                          Network.HTTP.Req.OAuth2