clean up imports

master
dfsek 2 years ago
parent 9224419449
commit b3c7d2b720
  1. 6
      src/Application.hs
  2. 7
      src/GenericOIDC.hs

@ -13,8 +13,8 @@
module Application where
import Apps
import ClassyPrelude.Yesod (ReaderT, fromString, newManager, pack, runMigration, unpack, (</>))
import Data.Aeson (decodeStrict, eitherDecodeStrict)
import ClassyPrelude.Yesod (newManager, pack)
import Data.Aeson (decodeStrict)
import Data.ByteString (ByteString)
import Data.Yaml.Aeson (decodeFileEither)
import GenericOIDC
@ -22,7 +22,6 @@ import InterdimensionalConfig
import Match
import System.Directory (createDirectoryIfMissing)
import Text.Cassius
import Text.Julius
import URI.ByteString ()
import Util
import qualified Web.ClientSession as CS
@ -30,7 +29,6 @@ import Yesod
import Yesod.Auth
import Yesod.Auth.OAuth2 (getUserResponseJSON)
import Yesod.Auth.OAuth2.Prelude
import Yesod.Form.Bootstrap3
import Yesod.Static
import Prelude

@ -12,13 +12,8 @@ import qualified Yesod.Auth.OAuth2.Exception as YesodOAuth2Exception
import Yesod.Auth.OAuth2.Prelude
import Data.Aeson (Value)
import Data.Aeson.Lens
import Data.Text (unpack, splitOn)
import Prelude
import Lens.Micro ((^?))
import Control.Lens (Prism')
import Match
import Yesod (setSession, liftIO)
import Util
oidcAuth' :: YesodAuth m => OIDCConfig -> AuthPlugin m
@ -41,7 +36,7 @@ oidcAuth widget config =
let unKey = username_attribute config
username <- case fromQuery "preferred_username" (_String) json of
username <- case fromQuery "preferred_username" _String json of
Nothing -> throwIO $ YesodOAuth2Exception.JSONDecodingError pluginName ("No such key " <> show unKey <> " in response.")
Just s -> return s

Loading…
Cancel
Save