Format

freizl · Aug 16, 2023 · 4e54127 · 4e54127
1 parent d7abd58
commit 4e54127
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 14 deletions.
diff --git a/hoauth2-demo/src/App.hs b/hoauth2-demo/src/App.hs
@@ -142,8 +142,8 @@ createAuthorizationUri AppEnv {..} idpName = do
   (DemoIdp idp) <- pure (findIdpByName idpName)
   authCodeApp <- createAuthorizationCodeApp idp idpName
   (authorizationUri, codeVerifier) <-
-    liftIO
-      $ if isSupportPkce idpName
+    liftIO $
+      if isSupportPkce idpName
         then fmap (second Just) (mkPkceAuthorizeRequest authCodeApp)
         else pure (mkAuthorizationRequest authCodeApp, Nothing)
   insertCodeVerifier sessionStore idpName codeVerifier
@@ -302,8 +302,8 @@ fetchTokenAndUser AppEnv {..} idpData@(IdpAuthorizationCodeAppSessionData {..})
       if isSupportPkce idpName
         then do
           when (isNothing authorizePkceCodeVerifier) (throwE "Unable to find code verifier")
-          withExceptT tokenRequestErrorErrorToText
-            $ conduitPkceTokenRequest
+          withExceptT tokenRequestErrorErrorToText $
+            conduitPkceTokenRequest
               idpApp
               mgr
               (exchangeTokenText, fromJust authorizePkceCodeVerifier)

diff --git a/hoauth2-providers/src/Network/OAuth2/Provider.hs b/hoauth2-providers/src/Network/OAuth2/Provider.hs
@@ -18,4 +18,3 @@ data IdpName
   | Weibo
   | ZOHO
   deriving (Eq, Ord, Show, Enum, Bounded, Generic)
-
diff --git a/hoauth2-tutorial/src/HOAuth2ExperimentTutorial.hs b/hoauth2-tutorial/src/HOAuth2ExperimentTutorial.hs
@@ -291,7 +291,7 @@ paramValue key params =
     hasParam t = (== t) . fst
 
 -- | Lift ExceptT to ActionM which is basically the handler Monad in Scotty.
-excepttToActionM :: (Show a) => ExceptT TL.Text IO a -> ActionM a
+excepttToActionM :: Show a => ExceptT TL.Text IO a -> ActionM a
 excepttToActionM e = do
   result <- liftIO $ runExceptT e
   either Scotty.raise pure result

diff --git a/hoauth2/src/Network/OAuth/OAuth2.hs b/hoauth2/src/Network/OAuth/OAuth2.hs
@@ -5,8 +5,10 @@ module Network.OAuth.OAuth2 (
 
   -- * Authorization Requset
   module Network.OAuth.OAuth2.AuthorizationRequest,
+
   -- * Token Request
   module Network.OAuth.OAuth2.TokenRequest,
+
   -- * OAuth'ed http client utilities
   module Network.OAuth.OAuth2.HttpClient,
 ) where

diff --git a/hoauth2/src/Network/OAuth/OAuth2/Internal.hs b/hoauth2/src/Network/OAuth/OAuth2/Internal.hs
@@ -25,7 +25,9 @@ import URI.ByteString.Aeson ()
 import URI.ByteString.QQ
 
 -------------------------------------------------------------------------------
+
 -- * OAuth2 Configuration
+
 -------------------------------------------------------------------------------
 
 -- | Query Parameter Representation
@@ -49,7 +51,9 @@ instance Default OAuth2 where
       }
 
 -------------------------------------------------------------------------------
+
 -- * Tokens
+
 -------------------------------------------------------------------------------
 
 newtype AccessToken = AccessToken {atoken :: Text} deriving (Binary, Eq, Show, FromJSON, ToJSON)
@@ -62,6 +66,7 @@ newtype IdToken = IdToken {idtoken :: Text} deriving (Binary, Eq, Show, FromJSON
 newtype ExchangeToken = ExchangeToken {extoken :: Text} deriving (Show, FromJSON, ToJSON)
 
 -- FIXME: rename to TokenResponse and move to that module
+
 -- | https://www.rfc-editor.org/rfc/rfc6749#section-4.1.4
 data OAuth2Token = OAuth2Token
   { accessToken :: AccessToken
@@ -96,7 +101,9 @@ instance ToJSON OAuth2Token where
   toEncoding = genericToEncoding defaultOptions {fieldLabelModifier = camelTo2 '_'}
 
 -------------------------------------------------------------------------------
+
 -- * Client Authentication methods
+
 -------------------------------------------------------------------------------
 
 -- | https://www.rfc-editor.org/rfc/rfc6749#section-2.3
@@ -118,7 +125,9 @@ data ClientAuthenticationMethod
   deriving (Eq)
 
 -------------------------------------------------------------------------------
+
 -- * Utilies for Request and URI
+
 -------------------------------------------------------------------------------
 
 -- | Type synonym of post body content
@@ -127,7 +136,6 @@ type PostBody = [(BS.ByteString, BS.ByteString)]
 -- | Type sysnonym of request query params
 type QueryParams = [(BS.ByteString, BS.ByteString)]
 
-
 defaultRequestHeaders :: [(HT.HeaderName, BS.ByteString)]
 defaultRequestHeaders =
   [ (HT.hUserAgent, "hoauth2-" <> BS8.pack (showVersion version))

diff --git a/hoauth2/src/Network/OAuth2/Experiment/Flows/AuthorizationRequest.hs b/hoauth2/src/Network/OAuth2/Experiment/Flows/AuthorizationRequest.hs
@@ -21,9 +21,9 @@ data AuthorizationRequestParam = AuthorizationRequestParam
   , arState :: AuthorizeState
   , arClientId :: ClientId
   , arRedirectUri :: Maybe RedirectUri
-  -- | It could be optional there is only one redirect_uri registered.
-  -- See: https://www.rfc-editor.org/rfc/rfc6749#section-3.1.2.3
   , arResponseType :: ResponseType
+  -- ^ It could be optional there is only one redirect_uri registered.
+  -- See: https://www.rfc-editor.org/rfc/rfc6749#section-3.1.2.3
   , arExtraParams :: Map Text Text
   }
 

diff --git a/hoauth2/src/Network/OAuth2/Experiment/Flows/RefreshTokenRequest.hs b/hoauth2/src/Network/OAuth2/Experiment/Flows/RefreshTokenRequest.hs
@@ -4,10 +4,10 @@ module Network.OAuth2.Experiment.Flows.RefreshTokenRequest where
 
 import Control.Monad.IO.Class (MonadIO (..))
 import Control.Monad.Trans.Except (ExceptT (..))
-import Data.Map.Strict qualified as Map
-import Data.Text.Lazy (Text)
 import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
 import Data.Set (Set)
+import Data.Text.Lazy (Text)
 import Network.HTTP.Conduit
 import Network.OAuth.OAuth2 hiding (RefreshToken)
 import Network.OAuth.OAuth2 qualified as OAuth2

diff --git a/hoauth2/src/Network/OAuth2/Experiment/Grants/AuthorizationCode.hs b/hoauth2/src/Network/OAuth2/Experiment/Grants/AuthorizationCode.hs
@@ -52,7 +52,7 @@ instance HasAuthorizeRequest AuthorizationCodeApplication where
       }
 
 instance HasPkceAuthorizeRequest AuthorizationCodeApplication where
-  mkPkceAuthorizeRequestParam :: (MonadIO m) => AuthorizationCodeApplication -> m (AuthorizationRequestParam, CodeVerifier)
+  mkPkceAuthorizeRequestParam :: MonadIO m => AuthorizationCodeApplication -> m (AuthorizationRequestParam, CodeVerifier)
   mkPkceAuthorizeRequestParam app = do
     PkceRequestParam {..} <- mkPkceParam
     let authReqParam = mkAuthorizationRequestParam app

diff --git a/hoauth2/src/Network/OAuth2/Experiment/Types.hs b/hoauth2/src/Network/OAuth2/Experiment/Types.hs
@@ -34,7 +34,6 @@ import URI.ByteString (URI, serializeURIRef')
 -- And it is PolyKinds.
 -- Hence whenever `Idp i` or `IdpApplication i a` is used as function parameter,
 -- PolyKinds need to be enabled.
---
 data Idp (i :: k) = Idp
   { idpUserInfoEndpoint :: URI
   -- ^ Userinfo Endpoint
@@ -54,7 +53,6 @@ data Idp (i :: k) = Idp
 -- * `Network.OAuth2.Experiment.ClientCredentialsApplication`
 -- * `Network.OAuth2.Experiment.ResourceOwnerPasswordApplication`
 -- * `Network.OAuth2.Experiment.JwtBearerApplication`
---
 data IdpApplication (i :: k) a = IdpApplication
   { idp :: Idp i
   , application :: a