From 5c4042e5f30331447b9738ba2911cf0d5b6fd286 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 18 Feb 2024 18:41:29 +0100 Subject: [PATCH] chore(oauth2): fix query function exports --- src/Auth/OAuth2.hs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Auth/OAuth2.hs b/src/Auth/OAuth2.hs index 75373b083..299b6b2e3 100644 --- a/src/Auth/OAuth2.hs +++ b/src/Auth/OAuth2.hs @@ -11,6 +11,8 @@ module Auth.OAuth2 , AzureUserException(..), _AzureUserError, _AzureUserNoResult, _AzureUserAmbiguous , apAzureMock , azureMockServer + , queryOAuth2User + , refreshOAuth2Token ) where import qualified Data.CaseInsensitive as CI @@ -103,7 +105,7 @@ azureMockServer port = } mockServerURL = "http://localhost:" <> fromString port profileSrc = fromString $ mockServerURL <> "/users/me" - in authOAuth2 mockPluginName oa $ \manager token -> do + in authOAuth2 apAzureMock oa $ \manager token -> do (UserID userID, userResponse) <- authGetProfile apAzureMock manager token profileSrc return Creds { credsPlugin = apAzureMock @@ -122,8 +124,12 @@ data UserDataException = UserDataJSONException JSONException instance Exception UserDataException -queryOAuth2User :: forall j m . (FromJSON j, MonadIO m, MonadThrow m, MonadHandler m) - => Text +queryOAuth2User :: forall j m. + ( FromJSON j + , MonadHandler m + , MonadThrow m + ) + => Text -- ^ User identifier (arbitrary needle) -> m (Either UserDataException j) queryOAuth2User userID = runExceptT $ do (queryUrl, tokenUrl) <- liftIO mkBaseUrls @@ -159,7 +165,10 @@ mkBaseUrls = do # endif -refreshOAuth2Token :: forall m. (MonadIO m, MonadThrow m, MonadHandler m) +refreshOAuth2Token :: forall m. + ( MonadHandler m + , MonadThrow m + ) => (Maybe AccessToken, Maybe RefreshToken) -> String -> Bool