From dac09582fb9ef6574d28ae933ff198cee1024ad4 Mon Sep 17 00:00:00 2001
From: "Michael \"Gilli\" Gilliland" <michael.gilliland@renaissance.com>
Date: Tue, 31 Jan 2023 09:58:05 -0500
Subject: [PATCH] Bring back `err` type param to `OAuth2Result`

---
 src/Network/OAuth/OAuth2/Compat.hs | 10 +++++-----
 src/Yesod/Auth/OAuth2/Dispatch.hs  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Network/OAuth/OAuth2/Compat.hs b/src/Network/OAuth/OAuth2/Compat.hs
index 79ac434..28a408a 100644
--- a/src/Network/OAuth/OAuth2/Compat.hs
+++ b/src/Network/OAuth/OAuth2/Compat.hs
@@ -59,7 +59,7 @@ type Error = TokenRequestError
 type Error = OAuth2Error Errors
 #endif
 
-type OAuth2Result a = Either Error a
+type OAuth2Result err a = Either err a
 
 authorizationUrl :: OAuth2 -> URI
 authorizationUrl = OAuth2.authorizationUrl . getOAuth2
@@ -68,14 +68,14 @@ fetchAccessToken
     :: Manager
     -> OAuth2
     -> ExchangeToken
-    -> IO (OAuth2Result OAuth2Token)
+    -> IO (OAuth2Result Error OAuth2Token)
 fetchAccessToken = fetchAccessTokenBasic
 
 fetchAccessToken2
     :: Manager
     -> OAuth2
     -> ExchangeToken
-    -> IO (OAuth2Result OAuth2Token)
+    -> IO (OAuth2Result Error OAuth2Token)
 fetchAccessToken2 = fetchAccessTokenPost
 
 authGetBS :: Manager -> AccessToken -> URI -> IO (Either ByteString ByteString)
@@ -151,7 +151,7 @@ fetchAccessTokenBasic
     :: Manager
     -> OAuth2
     -> ExchangeToken
-    -> IO (OAuth2Result OAuth2Token)
+    -> IO (OAuth2Result Error OAuth2Token)
 fetchAccessTokenBasic m o e = runOAuth2 $ f m (getOAuth2 o) e
   where
 #if MIN_VERSION_hoauth2(2,6,0)
@@ -166,7 +166,7 @@ fetchAccessTokenPost
     :: Manager
     -> OAuth2
     -> ExchangeToken
-    -> IO (OAuth2Result OAuth2Token)
+    -> IO (OAuth2Result Error OAuth2Token)
 fetchAccessTokenPost m o e = runOAuth2 $ f m (getOAuth2 o) e
   where
 #if MIN_VERSION_hoauth2(2, 6, 0)
diff --git a/src/Yesod/Auth/OAuth2/Dispatch.hs b/src/Yesod/Auth/OAuth2/Dispatch.hs
index a98f41d..783e38d 100644
--- a/src/Yesod/Auth/OAuth2/Dispatch.hs
+++ b/src/Yesod/Auth/OAuth2/Dispatch.hs
@@ -31,7 +31,7 @@ import Yesod.Core hiding (ErrorResponse)
 -- This will be 'fetchAccessToken' or 'fetchAccessToken2'
 --
 type FetchToken
-  = Manager -> OAuth2 -> ExchangeToken -> IO (OAuth2Result OAuth2Token)
+  = Manager -> OAuth2 -> ExchangeToken -> IO (OAuth2Result Error OAuth2Token)
 
 -- | How to take an @'OAuth2Token'@ and retrieve user credentials
 type FetchCreds m = Manager -> OAuth2Token -> IO (Creds m)