diff --git a/src/Yesod/Auth/OAuth2.hs b/src/Yesod/Auth/OAuth2.hs index fd472c4..52a9064 100644 --- a/src/Yesod/Auth/OAuth2.hs +++ b/src/Yesod/Auth/OAuth2.hs @@ -28,21 +28,17 @@ module Yesod.Auth.OAuth2 , getUserResponseJSON ) where -import Control.Error.Util ( note ) -import Control.Monad ( (<=<) ) -import Data.Aeson ( FromJSON - , eitherDecode - ) -import Data.ByteString.Lazy ( ByteString - , fromStrict - ) -import Data.Text ( Text ) -import Data.Text.Encoding ( encodeUtf8 ) -import Network.HTTP.Conduit ( Manager ) -import Network.OAuth.OAuth2.Compat -import Yesod.Auth -import Yesod.Auth.OAuth2.Dispatch -import Yesod.Core.Widget +import Control.Error.Util (note) +import Control.Monad ((<=<)) +import Data.Aeson (FromJSON, eitherDecode) +import Data.ByteString.Lazy (ByteString, fromStrict) +import Data.Text (Text) +import Data.Text.Encoding (encodeUtf8) +import Network.HTTP.Conduit (Manager) +import Network.OAuth.OAuth2.Compat +import Yesod.Auth +import Yesod.Auth.OAuth2.Dispatch +import Yesod.Core.Widget oauth2Url :: Text -> AuthRoute oauth2Url name = PluginR name ["forward"] diff --git a/src/Yesod/Auth/OAuth2/AzureAD.hs b/src/Yesod/Auth/OAuth2/AzureAD.hs index 050434e..b12266a 100644 --- a/src/Yesod/Auth/OAuth2/AzureAD.hs +++ b/src/Yesod/Auth/OAuth2/AzureAD.hs @@ -11,8 +11,8 @@ module Yesod.Auth.OAuth2.AzureAD , oauth2AzureADScoped ) where -import Prelude -import Yesod.Auth.OAuth2.Prelude +import Prelude +import Yesod.Auth.OAuth2.Prelude newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/BattleNet.hs b/src/Yesod/Auth/OAuth2/BattleNet.hs index 68cfe2e..87e778e 100644 --- a/src/Yesod/Auth/OAuth2/BattleNet.hs +++ b/src/Yesod/Auth/OAuth2/BattleNet.hs @@ -13,13 +13,10 @@ module Yesod.Auth.OAuth2.BattleNet , oAuth2BattleNet ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T - ( pack - , toLower - ) -import Yesod.Core.Widget +import qualified Data.Text as T (pack, toLower) +import Yesod.Core.Widget newtype User = User Int diff --git a/src/Yesod/Auth/OAuth2/Bitbucket.hs b/src/Yesod/Auth/OAuth2/Bitbucket.hs index 1ed28f4..a1b7b53 100644 --- a/src/Yesod/Auth/OAuth2/Bitbucket.hs +++ b/src/Yesod/Auth/OAuth2/Bitbucket.hs @@ -11,9 +11,9 @@ module Yesod.Auth.OAuth2.Bitbucket , oauth2BitbucketScoped ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T +import qualified Data.Text as T newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/ClassLink.hs b/src/Yesod/Auth/OAuth2/ClassLink.hs index 7bb1ff6..53ce1e5 100644 --- a/src/Yesod/Auth/OAuth2/ClassLink.hs +++ b/src/Yesod/Auth/OAuth2/ClassLink.hs @@ -5,9 +5,9 @@ module Yesod.Auth.OAuth2.ClassLink , oauth2ClassLinkScoped ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T +import qualified Data.Text as T newtype User = User Int diff --git a/src/Yesod/Auth/OAuth2/Dispatch.hs b/src/Yesod/Auth/OAuth2/Dispatch.hs index 744bfd0..dfeb598 100644 --- a/src/Yesod/Auth/OAuth2/Dispatch.hs +++ b/src/Yesod/Auth/OAuth2/Dispatch.hs @@ -12,21 +12,20 @@ module Yesod.Auth.OAuth2.Dispatch , dispatchAuthRequest ) where -import Control.Monad.Except -import Data.Text ( Text ) -import qualified Data.Text as T -import Data.Text.Encoding ( encodeUtf8 ) -import Network.HTTP.Conduit ( Manager ) -import Network.OAuth.OAuth2.Compat -import Network.OAuth.OAuth2.TokenRequest - ( Errors ) -import URI.ByteString.Extension -import UnliftIO.Exception -import Yesod.Auth hiding ( ServerError ) -import Yesod.Auth.OAuth2.DispatchError -import Yesod.Auth.OAuth2.ErrorResponse -import Yesod.Auth.OAuth2.Random -import Yesod.Core hiding ( ErrorResponse ) +import Control.Monad.Except +import Data.Text (Text) +import qualified Data.Text as T +import Data.Text.Encoding (encodeUtf8) +import Network.HTTP.Conduit (Manager) +import Network.OAuth.OAuth2.Compat +import Network.OAuth.OAuth2.TokenRequest (Errors) +import URI.ByteString.Extension +import UnliftIO.Exception +import Yesod.Auth hiding (ServerError) +import Yesod.Auth.OAuth2.DispatchError +import Yesod.Auth.OAuth2.ErrorResponse +import Yesod.Auth.OAuth2.Random +import Yesod.Core hiding (ErrorResponse) -- | How to fetch an @'OAuth2Token'@ -- diff --git a/src/Yesod/Auth/OAuth2/EveOnline.hs b/src/Yesod/Auth/OAuth2/EveOnline.hs index 53b5add..1918348 100644 --- a/src/Yesod/Auth/OAuth2/EveOnline.hs +++ b/src/Yesod/Auth/OAuth2/EveOnline.hs @@ -13,10 +13,10 @@ module Yesod.Auth.OAuth2.EveOnline , WidgetType(..) ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T -import Yesod.Core.Widget +import qualified Data.Text as T +import Yesod.Core.Widget newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/GitHub.hs b/src/Yesod/Auth/OAuth2/GitHub.hs index ae220d5..c02fd7b 100644 --- a/src/Yesod/Auth/OAuth2/GitHub.hs +++ b/src/Yesod/Auth/OAuth2/GitHub.hs @@ -11,9 +11,9 @@ module Yesod.Auth.OAuth2.GitHub , oauth2GitHubScoped ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T +import qualified Data.Text as T newtype User = User Int diff --git a/src/Yesod/Auth/OAuth2/GitLab.hs b/src/Yesod/Auth/OAuth2/GitLab.hs index f538b04..87b636c 100644 --- a/src/Yesod/Auth/OAuth2/GitLab.hs +++ b/src/Yesod/Auth/OAuth2/GitLab.hs @@ -6,9 +6,9 @@ module Yesod.Auth.OAuth2.GitLab , defaultScopes ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T +import qualified Data.Text as T newtype User = User Int diff --git a/src/Yesod/Auth/OAuth2/Google.hs b/src/Yesod/Auth/OAuth2/Google.hs index 8646cc0..9c16e4a 100644 --- a/src/Yesod/Auth/OAuth2/Google.hs +++ b/src/Yesod/Auth/OAuth2/Google.hs @@ -31,10 +31,8 @@ module Yesod.Auth.OAuth2.Google , oauth2GoogleScopedWidget ) where -import Yesod.Auth.OAuth2.Prelude -import Yesod.Core ( WidgetFor - , whamlet - ) +import Yesod.Auth.OAuth2.Prelude +import Yesod.Core (WidgetFor, whamlet) newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/Nylas.hs b/src/Yesod/Auth/OAuth2/Nylas.hs index 160347b..7ccb8e5 100644 --- a/src/Yesod/Auth/OAuth2/Nylas.hs +++ b/src/Yesod/Auth/OAuth2/Nylas.hs @@ -4,13 +4,13 @@ module Yesod.Auth.OAuth2.Nylas ( oauth2Nylas ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import Control.Monad ( unless ) -import qualified Data.ByteString.Lazy.Char8 as BL8 -import Network.HTTP.Client -import qualified Network.HTTP.Types as HT -import qualified Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception +import Control.Monad (unless) +import qualified Data.ByteString.Lazy.Char8 as BL8 +import Network.HTTP.Client +import qualified Network.HTTP.Types as HT +import qualified Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/Prelude.hs b/src/Yesod/Auth/OAuth2/Prelude.hs index c879457..600860d 100644 --- a/src/Yesod/Auth/OAuth2/Prelude.hs +++ b/src/Yesod/Auth/OAuth2/Prelude.hs @@ -56,20 +56,20 @@ module Yesod.Auth.OAuth2.Prelude , authOAuth2Widget ) where -import Control.Exception.Safe -import Data.Aeson -import Data.ByteString ( ByteString ) -import qualified Data.ByteString.Lazy as BL -import Data.Text ( Text ) -import qualified Data.Text as T -import Data.Text.Encoding -import Network.HTTP.Conduit -import Network.OAuth.OAuth2.Compat -import URI.ByteString -import URI.ByteString.Extension -import Yesod.Auth -import Yesod.Auth.OAuth2 -import qualified Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception +import Control.Exception.Safe +import Data.Aeson +import Data.ByteString (ByteString) +import qualified Data.ByteString.Lazy as BL +import Data.Text (Text) +import qualified Data.Text as T +import Data.Text.Encoding +import Network.HTTP.Conduit +import Network.OAuth.OAuth2.Compat +import URI.ByteString +import URI.ByteString.Extension +import Yesod.Auth +import Yesod.Auth.OAuth2 +import qualified Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception -- | Retrieve a user's profile as JSON -- diff --git a/src/Yesod/Auth/OAuth2/Salesforce.hs b/src/Yesod/Auth/OAuth2/Salesforce.hs index ef7b11d..a86b019 100644 --- a/src/Yesod/Auth/OAuth2/Salesforce.hs +++ b/src/Yesod/Auth/OAuth2/Salesforce.hs @@ -13,7 +13,7 @@ module Yesod.Auth.OAuth2.Salesforce , oauth2SalesforceSandboxScoped ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/Slack.hs b/src/Yesod/Auth/OAuth2/Slack.hs index 593644e..8bf9a28 100644 --- a/src/Yesod/Auth/OAuth2/Slack.hs +++ b/src/Yesod/Auth/OAuth2/Slack.hs @@ -11,14 +11,11 @@ module Yesod.Auth.OAuth2.Slack , oauth2SlackScoped ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import Network.HTTP.Client ( httpLbs - , parseUrlThrow - , responseBody - , setQueryString - ) -import Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception +import Network.HTTP.Client + (httpLbs, parseUrlThrow, responseBody, setQueryString) +import Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception data SlackScope = SlackBasicScope diff --git a/src/Yesod/Auth/OAuth2/Spotify.hs b/src/Yesod/Auth/OAuth2/Spotify.hs index f85a77c..1890742 100644 --- a/src/Yesod/Auth/OAuth2/Spotify.hs +++ b/src/Yesod/Auth/OAuth2/Spotify.hs @@ -7,7 +7,7 @@ module Yesod.Auth.OAuth2.Spotify ( oauth2Spotify ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude newtype User = User Text diff --git a/src/Yesod/Auth/OAuth2/Upcase.hs b/src/Yesod/Auth/OAuth2/Upcase.hs index 9332bf6..c2898ef 100644 --- a/src/Yesod/Auth/OAuth2/Upcase.hs +++ b/src/Yesod/Auth/OAuth2/Upcase.hs @@ -10,9 +10,9 @@ module Yesod.Auth.OAuth2.Upcase ( oauth2Upcase ) where -import Yesod.Auth.OAuth2.Prelude +import Yesod.Auth.OAuth2.Prelude -import qualified Data.Text as T +import qualified Data.Text as T newtype User = User Int diff --git a/src/Yesod/Auth/OAuth2/WordPressDotCom.hs b/src/Yesod/Auth/OAuth2/WordPressDotCom.hs index 8cf3798..bd73529 100644 --- a/src/Yesod/Auth/OAuth2/WordPressDotCom.hs +++ b/src/Yesod/Auth/OAuth2/WordPressDotCom.hs @@ -4,8 +4,8 @@ module Yesod.Auth.OAuth2.WordPressDotCom ( oauth2WordPressDotCom ) where -import qualified Data.Text as T -import Yesod.Auth.OAuth2.Prelude +import qualified Data.Text as T +import Yesod.Auth.OAuth2.Prelude pluginName :: Text pluginName = "WordPress.com"