Upgrade & bugfix

Author: nodew

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
     "features": {
         "ghcr.io/devcontainers-contrib/features/haskell:2": {
-            "ghcVersion": "9.2.7",
+            "ghcVersion": "9.4.8",
             "installHLS": true,
             "installStack": true,
             "installStackGHCupHook": true,

Dockerfile

@@ -1,5 +1,5 @@
 # builder
-FROM fpco/stack-build-small:lts-20.21 as base
+FROM fpco/stack-build-small:lts-21.25 as base
 
 ARG DEBIAN_FRONTEND=noninteractive
 

src/Conduit/Api/User.hs

@@ -65,7 +65,7 @@ updateUserHandler user (UserData user') = do
         else throwIO err400
     where
         newName = maybe (userName user) Username (uurUsername user')
-        newEmail = maybe (userEmail user) EmailAddress (uurUsername user')
+        newEmail = maybe (userEmail user) EmailAddress (uurEmail user')
         newPassword = Password <$> uurPassword user'
         newBio = fromMaybe (userBio user) (uurBio user')
         newImage = fromMaybe (userImage user) (uurImage user')

src/Conduit/Db/Transaction.hs

@@ -4,6 +4,7 @@ import Conduit.App
 import Conduit.Config
 import Conduit.Environment
 import Data.List
+import Data.Time.Clock (secondsToDiffTime, DiffTime)
 import Hasql.Connection (Connection)
 import Hasql.Pool (Pool, UsageError (..), acquire)
 import qualified Hasql.Pool as Pool
@@ -13,8 +14,14 @@ import Hasql.Transaction (Transaction, condemn, sql, statement)
 import qualified Hasql.Transaction.Sessions as Hasql
 import RIO
 
+connectionAcquisitionTimeout :: DiffTime
+connectionAcquisitionTimeout = secondsToDiffTime 10 -- 10 seconds
+
+maximalConnectionLifetime :: DiffTime
+maximalConnectionLifetime = secondsToDiffTime 1800 -- 30 minutes
+
 loadPool :: ByteString -> Int -> IO Pool
-loadPool connectString poolSize = acquire poolSize (Just 10) connectString
+loadPool connectString poolSize = acquire poolSize connectionAcquisitionTimeout maximalConnectionLifetime connectString
 
 runTransactionWithConnection :: MonadIO m => Connection -> Transaction b -> m b
 runTransactionWithConnection conn transaction = do

stack-8.10.7.yaml

@@ -1,9 +1,10 @@
-resolver: lts-20.21
+resolver: lts-21.25
 
 packages:
 - .
 
 allow-newer: true
 
 extra-deps:
-- unix-compat-0.7
+- jose-0.9
+- servant-auth-server-0.4.7.0