Add sslOnlyMiddleware to the Foundation

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lebd",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lebd",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "the codebase backing 00dani.me, an indieweb.org site",
   "repository": {
     "type": "git",

package.yaml

@@ -1,5 +1,5 @@
 name:    lebd
-version: "1.6.3"
+version: "1.6.4"
 
 dependencies:
 

src/Foundation.hs

@@ -67,6 +67,9 @@ mkYesodData "App" $(parseRoutesFile "config/routes")
 -- | A convenient synonym for creating forms.
 type Form x = Html -> MForm (HandlerT App IO) (FormResult x, Widget)
 
+sessionLifetime :: Int
+sessionLifetime = 120 -- minutes
+
 -- Please see the documentation for the Yesod typeclass. There are a number
 -- of settings which can be configured by overriding methods here.
 instance Yesod App where
@@ -77,7 +80,7 @@ instance Yesod App where
     -- Store session data on the client in encrypted cookies,
     -- default session idle timeout is 120 minutes
     makeSessionBackend _ = sslOnlySessions . strictSameSiteSessions $ Just <$> defaultClientSessionBackend
-        120    -- timeout in minutes
+        sessionLifetime
         "config/client_session_key.aes"
 
     -- Redirect static requests to a subdomain - this is recommended for best
@@ -97,7 +100,7 @@ instance Yesod App where
     --   b) Validates that incoming write requests include that token in either a header or POST parameter.
     -- To add it, chain it together with the defaultMiddleware: yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
     -- For details, see the CSRF documentation in the Yesod.Core.Handler module of the yesod-core package.
-    yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
+    yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware . sslOnlyMiddleware sessionLifetime
 
     defaultLayout widget = do
         master <- getYesod

templates/mf2/h-feed.cassius

@@ -2,4 +2,4 @@ div.h-feed
   > ol.list-unstyled
     margin-bottom: 0
     > li:not(:last-child)
-    margin-bottom: 1em
+      margin-bottom: 1em