From 3700a89adacb37b0d1987cd1d43e7e156d787133 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 30 Oct 2023 10:56:53 -0400
Subject: [PATCH] Update .Compat for hoauth2-2.9.0

The only breaking change seems to be the error type, which we were
already wrapping in `CPP` and our own `Errors` synonym for 2.7. All this
change does is add a 2.9 case and move some thing around so it's
syntactically nicer.
---
 src/Network/OAuth/OAuth2/Compat.hs | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Network/OAuth/OAuth2/Compat.hs b/src/Network/OAuth/OAuth2/Compat.hs
index affb77b..7c5c4ab 100644
--- a/src/Network/OAuth/OAuth2/Compat.hs
+++ b/src/Network/OAuth/OAuth2/Compat.hs
@@ -16,21 +16,13 @@ module Network.OAuth.OAuth2.Compat
 import Data.ByteString.Lazy (ByteString)
 import Data.Text (Text)
 import Network.HTTP.Conduit (Manager)
+import Network.OAuth.OAuth2
+  ( AccessToken (..)
+  , ExchangeToken (..)
+  , OAuth2Token (..)
+  , RefreshToken (..)
+  )
 import qualified Network.OAuth.OAuth2 as OAuth2
-#if MIN_VERSION_hoauth2(2,7,0)
-import Network.OAuth.OAuth2
-    (AccessToken(..), ExchangeToken(..), OAuth2Token(..), RefreshToken(..))
-import Network.OAuth.OAuth2.TokenRequest (TokenRequestError)
-#else
-import Network.OAuth.OAuth2
-    ( AccessToken(..)
-    , ExchangeToken(..)
-    , OAuth2Error
-    , OAuth2Token(..)
-    , RefreshToken(..)
-    )
-import qualified Network.OAuth.OAuth2.TokenRequest as LegacyTokenRequest
-#endif
 import URI.ByteString
 
 #if MIN_VERSION_hoauth2(2,2,0)
@@ -38,6 +30,20 @@ import Control.Monad.Trans.Except (ExceptT, runExceptT)
 import Data.Maybe (fromMaybe)
 #endif
 
+#if MIN_VERSION_hoauth2(2,9,0)
+import Network.OAuth.OAuth2.TokenRequest (TokenResponseError)
+type Errors = TokenResponseError
+#elif MIN_VERSION_hoauth2(2,7,0)
+import Network.OAuth.OAuth2.TokenRequest (TokenRequestError)
+type Errors = TokenRequestError
+#else
+import qualified Network.OAuth.OAuth2.TokenRequest as LegacyTokenRequest
+import Network.OAuth.OAuth2 (OAuth2Error)
+type Errors = OAuth2Error LegacyTokenRequest.Errors
+#endif
+
+{-# ANN module ("HLint: ignore Use fewer imports" :: String) #-}
+
 data OAuth2 = OAuth2
   { oauth2ClientId :: Text
   , oauth2ClientSecret :: Maybe Text
@@ -46,12 +52,6 @@ data OAuth2 = OAuth2
   , oauth2RedirectUri :: Maybe (URIRef Absolute)
   }
 
-#if MIN_VERSION_hoauth2(2,7,0)
-type Errors = TokenRequestError
-#else
-type Errors = OAuth2Error LegacyTokenRequest.Errors
-#endif
-
 type OAuth2Result err a = Either err a
 
 authorizationUrl :: OAuth2 -> URI