haskell/yesod-auth-oauth2
1
0
Fork 0
mirror of https://github.com/freckle/yesod-auth-oauth2.git synced 2026-09-06 09:53:50 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Compile on Stackage Nightly again

Browse Source 
- Support for hoauth2-2.6.0 (but not 2.7)
This commit is contained in:
patrick brisbin 2022-12-15 16:29:02 -05:00
parent ab73e2fe20
commit 36805f0580
No known key found for this signature in database
GPG Key ID: C6A68C15A00FB52B
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Network/OAuth/OAuth2/Compat.hs
View File

@ -134,7 +134,9 @@ fetchAccessTokenBasic
-> IO (OAuth2Result Errors OAuth2Token) -> IO (OAuth2Result Errors OAuth2Token)
fetchAccessTokenBasic m o e = runOAuth2 $ f m (getOAuth2 o) e fetchAccessTokenBasic m o e = runOAuth2 $ f m (getOAuth2 o) e
where where
#if MIN_VERSION_hoauth2(2,3,0) #if MIN_VERSION_hoauth2(2,6,0)
f = OAuth2.fetchAccessTokenWithAuthMethod OAuth2.ClientSecretBasic
#elif MIN_VERSION_hoauth2(2,3,0)
f = OAuth2.fetchAccessTokenInternal OAuth2.ClientSecretBasic f = OAuth2.fetchAccessTokenInternal OAuth2.ClientSecretBasic
#else #else
f = OAuth2.fetchAccessToken f = OAuth2.fetchAccessToken
@ -147,7 +149,9 @@ fetchAccessTokenPost
-> IO (OAuth2Result Errors OAuth2Token) -> IO (OAuth2Result Errors OAuth2Token)
fetchAccessTokenPost m o e = runOAuth2 $ f m (getOAuth2 o) e fetchAccessTokenPost m o e = runOAuth2 $ f m (getOAuth2 o) e
where where
#if MIN_VERSION_hoauth2(2,3,0) #if MIN_VERSION_hoauth2(2, 6, 0)
f = OAuth2.fetchAccessTokenWithAuthMethod OAuth2.ClientSecretPost
#elif MIN_VERSION_hoauth2(2,3,0)
f = OAuth2.fetchAccessTokenInternal OAuth2.ClientSecretPost f = OAuth2.fetchAccessTokenInternal OAuth2.ClientSecretPost
#else #else
f = OAuth2.fetchAccessToken2 f = OAuth2.fetchAccessToken2

15
stack-nightly.yaml
View File

@ -1,8 +1,11 @@
resolver: nightly-2022-03-25 resolver: nightly-2022-12-09
extra-deps: extra-deps:
- hoauth2-2.4.0 - hoauth2-2.6.0
- yesod-auth-1.6.11
- yesod-core-1.6.22.0 # hoauth2 needs upper-bounds relaxed for
- yesod-form-1.7.0 #
- yesod-persistent-1.6.0.7 # - memory-0.18.0
# - text-2.0.1
#
allow-newer: true

6
yesod-auth-oauth2.cabal
View File

@ -1,10 +1,10 @@
cabal-version: 1.18 cabal-version: 1.18
-- This file has been generated from package.yaml by hpack version 0.34.4. -- This file has been generated from package.yaml by hpack version 0.35.0.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: d8816664cb0b39ecb9a3775f44bcd9b4787d0af5d0d3f8565786479461e5ae99 -- hash: 6ff32214308580349bea075f2eb01f97fc72598ea3e9a23f77a3e678d9c2c23a
name: yesod-auth-oauth2 name: yesod-auth-oauth2
version: 0.7.0.2 version: 0.7.0.2
@ -108,9 +108,9 @@ executable yesod-auth-oauth2-example
, yesod , yesod
, yesod-auth >=1.6.0 , yesod-auth >=1.6.0
, yesod-auth-oauth2 , yesod-auth-oauth2
default-language: Haskell2010
if !(flag(example)) if !(flag(example))
buildable: False buildable: False
default-language: Haskell2010
test-suite test test-suite test
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0