Format code with ormolu

Makefile

@@ -2,3 +2,18 @@
 .PHONY: test
 test:
 	export SAML2_WEB_SSO_ROOT=$$(pwd) && stack build --test
+
+# formats all Haskell files (which don't contain CPP)
+.PHONY: format
+format:
+	./tools/ormolu.sh
+
+# formats all Haskell files even if local changes are not committed to git
+.PHONY: formatf
+formatf:
+	./tools/ormolu.sh -f
+
+# checks that all Haskell files are formatted; fail if a `make format` run is needed.
+.PHONY: formatc
+formatc:
+	./tools/ormolu.sh -c

README.md

@@ -93,3 +93,9 @@ This should start the `toy-sp` app.  Now you can connect to
 
 `<your-idp>` has to be the path value of one of the IdPs registered in
 `server.yaml`.
+
+# Contributing
+
+Before submitting a PR, make sure to install [ormolu](https://github.com/tweag/ormolu)
+by doing `stack install ormolu` (we pin the version in our `stack.yaml` file)
+and run `make format`.

src/SAML2/Util.hs

@@ -1,19 +1,20 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module SAML2.Util (module SAML2.Util, module Text.XML.Util)
+module SAML2.Util
+  ( module SAML2.Util,
+    module Text.XML.Util,
+  )
 where
 
 import Control.Lens
 import Control.Monad.Except
 import Data.String.Conversions
+import qualified Data.Text as ST
 import Data.Typeable
 import GHC.Stack
 import Text.XML.Util
 import URI.ByteString
 
-import qualified Data.Text as ST
-
-
 renderURI :: URI -> ST
 renderURI = cs . serializeURIRef'
 
@@ -38,13 +39,16 @@ oldpath -/ pathext = uriUnSegments . uriSegments $ oldpath <> "/" <> pathext
 uri =/ pathext = normURI $ uri & pathL %~ (<> "/" <> cs pathext)
 
 normURI :: URI -> URI
-normURI = unsafeParseURI . cs . normalizeURIRef' URINormalizationOptions
-  { unoDowncaseScheme    = True
-  , unoDowncaseHost      = True
-  , unoDropDefPort       = False
-  , unoSlashEmptyPath    = True
-  , unoDropExtraSlashes  = True
-  , unoSortParameters    = True
-  , unoRemoveDotSegments = True
-  , unoDefaultPorts      = mempty
-  }
+normURI =
+  unsafeParseURI . cs
+    . normalizeURIRef'
+      URINormalizationOptions
+        { unoDowncaseScheme = True,
+          unoDowncaseHost = True,
+          unoDropDefPort = False,
+          unoSlashEmptyPath = True,
+          unoDropExtraSlashes = True,
+          unoSortParameters = True,
+          unoRemoveDotSegments = True,
+          unoDefaultPorts = mempty
+        }

src/SAML2/WebSSO.hs

@@ -1,25 +1,26 @@
-{- |
-
-Relevant parts of the standard are referenced throughout the code, using the notation
-@[<file>/<paragraph>]@.  <file> is one of these:
-
-[1] http://docs.oasis-open.org/security/saml/v2.0/saml-core-2.0-os.pdf
-[2] http://docs.oasis-open.org/security/saml/v2.0/saml-bindings-2.0-os.pdf
-[3] http://docs.oasis-open.org/security/saml/v2.0/saml-profiles-2.0-os.pdf
-[4] http://docs.oasis-open.org/security/saml/v2.0/saml-metadata-2.0-os.pdf
-[5] http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
-[6] http://docs.oasis-open.org/security/saml/v2.0/saml-conformance-2.0-os.pdf
-[7] http://docs.oasis-open.org/security/saml/v2.0/saml-sec-consider-2.0-os.pdf
-[8] http://docs.oasis-open.org/security/saml/v2.0/saml-glossary-2.0-os.pdf
-
--}
-module SAML2.WebSSO (module X) where
+-- |
+--
+-- Relevant parts of the standard are referenced throughout the code, using the notation
+-- @[<file>/<paragraph>]@.  <file> is one of these:
+--
+-- [1] http://docs.oasis-open.org/security/saml/v2.0/saml-core-2.0-os.pdf
+-- [2] http://docs.oasis-open.org/security/saml/v2.0/saml-bindings-2.0-os.pdf
+-- [3] http://docs.oasis-open.org/security/saml/v2.0/saml-profiles-2.0-os.pdf
+-- [4] http://docs.oasis-open.org/security/saml/v2.0/saml-metadata-2.0-os.pdf
+-- [5] http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
+-- [6] http://docs.oasis-open.org/security/saml/v2.0/saml-conformance-2.0-os.pdf
+-- [7] http://docs.oasis-open.org/security/saml/v2.0/saml-sec-consider-2.0-os.pdf
+-- [8] http://docs.oasis-open.org/security/saml/v2.0/saml-glossary-2.0-os.pdf
+module SAML2.WebSSO
+  ( module X,
+  )
+where
 
 import SAML2.Util as X
 import SAML2.WebSSO.API as X
 import SAML2.WebSSO.Config as X
+import SAML2.WebSSO.Cookie as X
 import SAML2.WebSSO.Error as X
 import SAML2.WebSSO.SP as X
 import SAML2.WebSSO.Types as X
 import SAML2.WebSSO.XML as X
-import SAML2.WebSSO.Cookie as X