diff --git a/src/Network/OAuth2/JWT.hs b/src/Network/OAuth2/JWT.hs index 842ab6a..5397c3c 100644 --- a/src/Network/OAuth2/JWT.hs +++ b/src/Network/OAuth2/JWT.hs @@ -18,8 +18,6 @@ import Data.Typeable import qualified Data.Aeson as A (FromJSON(..), ToJSON(..), ToJSONKey(..), FromJSON(..), FromJSONKey(..), Value(..)) -- containers import qualified Data.Map.Strict as M (Map, lookup) --- -- hoauth2 --- import Network.OAuth.OAuth2 (OAuth2Token(..), IdToken(..)) -- jwt import qualified Web.JWT as J (decode, claims, JWTClaimsSet(..), StringOrURI, NumericDate, ClaimsMap(..)) -- scientific diff --git a/src/Network/OAuth2/Session.hs b/src/Network/OAuth2/Session.hs index f0282fe..c194165 100644 --- a/src/Network/OAuth2/Session.hs +++ b/src/Network/OAuth2/Session.hs @@ -38,8 +38,7 @@ import qualified Data.Map as M (Map, insert, lookup, alter) -- import qualified Data.Heap as H (Heap, empty, null, size, insert, viewMin, deleteMin, Entry(..), ) -- hoauth2 import Network.OAuth.OAuth2 (OAuth2Token(..)) -import Network.OAuth2.Experiment (IdpUserInfo, conduitUserInfoRequest, mkAuthorizeRequest, conduitTokenRequest, conduitRefreshTokenRequest) -import Network.OAuth2.Experiment.Types (HasRefreshTokenRequest(..), WithExchangeToken(..), IdpApplication(..), GrantTypeFlow(..)) +import Network.OAuth2.Experiment (IdpUserInfo, conduitUserInfoRequest, mkAuthorizeRequest, conduitTokenRequest, conduitRefreshTokenRequest, HasRefreshTokenRequest(..), WithExchangeToken, IdpApplication(..), GrantTypeFlow(..)) import Network.OAuth.OAuth2.Internal (AccessToken(..), ExchangeToken(..), RefreshToken(..), OAuth2Error, IdToken(..)) import Network.OAuth.OAuth2.TokenRequest (Errors) -- http-client diff --git a/stack.yaml b/stack.yaml index da433a7..9bf81ca 100644 --- a/stack.yaml +++ b/stack.yaml @@ -33,10 +33,16 @@ packages: - . # Dependency packages to be pulled from upstream that are not in the resolver. # These entries can reference officially published versions as well as -# forks / in-progress versions pinned to a git hash. For example: +# forks / in-progress versions pinned to a git hash. For extra: # extra-deps: +# - hoauth2-2.6.0 - validation-selective-0.2.0.0 +- selective-0.6 + +allow-newer: true + + # - acme-missiles-0.3 # - git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a