From 87dc101b47743aa6b89e0a7fc9754e8f87400457 Mon Sep 17 00:00:00 2001 From: "William R. Arellano" Date: Tue, 31 Oct 2023 11:11:27 -0500 Subject: [PATCH] use alternative in oauth2RedirectUri --- src/Yesod/Auth/OAuth2/Dispatch.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Yesod/Auth/OAuth2/Dispatch.hs b/src/Yesod/Auth/OAuth2/Dispatch.hs index 499a632..5db2c76 100644 --- a/src/Yesod/Auth/OAuth2/Dispatch.hs +++ b/src/Yesod/Auth/OAuth2/Dispatch.hs @@ -13,6 +13,7 @@ module Yesod.Auth.OAuth2.Dispatch ) where import Control.Monad (unless) +import Control.Applicative ((<|>)) import Control.Monad.Except (MonadError (..)) import Data.Text (Text) import qualified Data.Text as T @@ -109,7 +110,7 @@ withCallbackAndState name oauth2 csrf = do callback <- maybe (throwError $ InvalidCallbackUri uri) pure $ fromText uri pure oauth2 - { oauth2RedirectUri = Just callback + { oauth2RedirectUri = (oauth2RedirectUri oauth2) <|> Just callback , oauth2AuthorizeEndpoint = oauth2AuthorizeEndpoint oauth2 `withQuery` [("state", encodeUtf8 csrf)] }