ci: bump version to v4.41.0

CHANGELOG.md

@@ -348,3 +348,53 @@
 ### Features
 
 * BAC-39 Authentication ([#114](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/114)) ([f6d3a18](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/f6d3a1845205318f43eb443601fd257613b7defb))
+##  (2026-01-20)
+
+### Features
+
+* Update persistence.xml and build.sbt for resource management ([a7292e3](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/a7292e3b5df4788f2f8bea5a2ec7b209b7357608))
+##  (2026-01-20)
+
+### Features
+
+* Update connection provider in persistence.xml for HikariCP ([f4290b4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/f4290b44976fb6dcd4fc4b896614ba6062da73b1))
+##  (2026-01-20)
+
+### Features
+
+* Update Hibernate connection provider and database configuration ([71a549b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/71a549b7f059e748f7691bb9a27e2861b61c6f6f))
+##  (2026-01-20)
+
+### Features
+
+* Add HikariCP specific configuration to db.conf ([009b2b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/009b2b1ad9180f58a0b1434354f8a467b4e452ca))
+##  (2026-01-20)
+
+### Features
+
+* Add HikariCP specific configuration to db.conf ([4aa8709](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4aa8709eb593b03254efc616b6b04c23b23ab6ab))
+##  (2026-01-20)
+
+### Features
+
+* Enhance EntityManagerProvider to use Play configuration for database settings ([476db28](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/476db288216ed2c1013fe3ddb9b82472254e352b))
+##  (2026-01-20)
+
+### Features
+
+* Disable default JPA and Hibernate modules and enhance EntityManagerProvider for HikariCP integration ([9fa1e5e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9fa1e5e07122aebd0391d47c3513013243a72a0f))
+##  (2026-01-20)
+
+### Features
+
+* Add logging for user management operations in HibernateUserManager ([9ca1813](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9ca1813f06539cffeb573d0e00571e4f2d5144f1))
+##  (2026-01-20)
+
+### Features
+
+* Integrate UserManager and HibernateUserManager in session management ([e32f4eb](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e32f4eb8fff9daec46f20284e28e94a59231d033))
+##  (2026-01-20)
+
+### Features
+
+* Implement transaction management for user addition and removal in HibernateUserManager ([45dec00](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/45dec00b86a1395457226ed62ac319c61e38739a))

build.sbt

@@ -59,8 +59,11 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
     libraryDependencies += "org.playframework" %% "play-java-jpa" % "3.0.6",
     libraryDependencies += "com.nimbusds" % "oauth2-oidc-sdk" % "11.31.1",
     libraryDependencies += "org.playframework" %% "play-ws" % "3.0.6",
+    libraryDependencies += "org.hibernate.orm" % "hibernate-hikaricp" % "7.2.1.Final",
     libraryDependencies += ws,
-    JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
+    JsEngineKeys.engineType := JsEngineKeys.EngineType.Node,
+
+    PlayKeys.externalizeResourcesExcludes += baseDirectory.value / "conf" / "META-INF" / "persistence.xml"
   )
 
 lazy val root = (project in file("."))

knockoutwhistweb/app/di/EntityManagerProvider.scala

@@ -1,14 +1,33 @@
 package di
 
-import com.google.inject.Provider
+import com.google.inject.{Inject, Provider}
-import com.google.inject.Inject
 import jakarta.inject.Singleton
 import jakarta.persistence.{EntityManager, EntityManagerFactory, Persistence}
+import play.api.Configuration
 
 @Singleton
-class EntityManagerProvider @Inject()() extends Provider[EntityManager] {
+class EntityManagerProvider @Inject()(config: Configuration) extends Provider[EntityManager] {
 
-  private val emf: EntityManagerFactory = Persistence.createEntityManagerFactory("defaultPersistenceUnit")
+  private val emf: EntityManagerFactory = {
+    val dbConfig = config.get[Configuration]("db.default")
+    val props = new java.util.HashMap[String, Object]()
+    
+    // Map Play configuration to Jakarta Persistence properties
+    props.put("jakarta.persistence.jdbc.driver", dbConfig.get[String]("driver"))
+    props.put("jakarta.persistence.jdbc.url", dbConfig.get[String]("url"))
+    props.put("jakarta.persistence.jdbc.user", dbConfig.get[String]("username"))
+    props.put("jakarta.persistence.jdbc.password", dbConfig.get[String]("password"))
+    
+    // Also pass HikariCP settings if present
+    dbConfig.getOptional[Configuration]("hikaricp").foreach { hikariConfig =>
+      hikariConfig.keys.foreach { key =>
+        val value = hikariConfig.underlying.getValue(key).unwrapped()
+        props.put(s"hibernate.hikari.$key", value)
+      }
+    }
+
+    Persistence.createEntityManagerFactory("defaultPersistenceUnit", props)
+  }
 
   override def get(): EntityManager = {
     emf.createEntityManager()

knockoutwhistweb/app/di/ProductionModule.scala

@@ -1,25 +0,0 @@
-package di
-
-import com.google.inject.AbstractModule
-import com.google.inject.name.Names
-import logic.user.impl.HibernateUserManager
-import play.api.db.DBApi
-import play.api.{Configuration, Environment}
-
-class ProductionModule(
-  environment: Environment,
-  configuration: Configuration
-) extends AbstractModule {
-
-  override def configure(): Unit = {
-    // Bind HibernateUserManager for production
-    bind(classOf[logic.user.UserManager])
-      .to(classOf[logic.user.impl.HibernateUserManager])
-      .asEagerSingleton()
-
-    // Bind EntityManager for JPA
-    bind(classOf[jakarta.persistence.EntityManager])
-      .toProvider(classOf[EntityManagerProvider])
-      .asEagerSingleton()
-  }
-}

knockoutwhistweb/app/logic/user/impl/BaseSessionManager.scala

@@ -4,7 +4,7 @@ import com.auth0.jwt.algorithms.Algorithm
 import com.auth0.jwt.{JWT, JWTVerifier}
 import com.github.benmanes.caffeine.cache.{Cache, Caffeine}
 import com.typesafe.config.Config
-import logic.user.SessionManager
+import logic.user.{SessionManager, UserManager}
 import model.users.User
 import scalafx.util.Duration
 import services.JwtKeyProvider
@@ -16,7 +16,7 @@ import javax.inject.{Inject, Singleton}
 import scala.util.Try
 
 @Singleton
-class BaseSessionManager @Inject()(val keyProvider: JwtKeyProvider, val userManager: StubUserManager, val config: Config) extends SessionManager {
+class BaseSessionManager @Inject()(val keyProvider: JwtKeyProvider, val userManager: UserManager, val config: Config) extends SessionManager {
 
   private val algorithm = Algorithm.RSA512(keyProvider.publicKey, keyProvider.privateKey)
   private val verifier: JWTVerifier = JWT.require(algorithm)

knockoutwhistweb/app/logic/user/impl/HibernateUserManager.scala

@@ -5,6 +5,7 @@ import jakarta.inject.Inject
 import jakarta.persistence.EntityManager
 import logic.user.UserManager
 import model.users.{User, UserEntity}
+import play.api.Logger
 import services.OpenIDUserInfo
 import util.UserHash
 
@@ -14,14 +15,20 @@ import scala.jdk.CollectionConverters.*
 @Singleton
 class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends UserManager {
 
+  private val logger = Logger(getClass.getName)
+
   override def addUser(name: String, password: String): Boolean = {
+    val tx = em.getTransaction
     try {
+      tx.begin()
       // Check if user already exists
       val existing = em.createQuery("SELECT u FROM UserEntity u WHERE u.username = :username", classOf[UserEntity])
         .setParameter("username", name)
         .getResultList
       
       if (!existing.isEmpty) {
+        logger.warn(s"User $name already exists")
+        tx.rollback()
         return false
       }
 
@@ -35,20 +42,30 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
 
       em.persist(userEntity)
       em.flush()
+      tx.commit()
+
       true
     } catch {
-      case _: Exception => false
+      case e: Exception => {
+        if (tx.isActive) tx.rollback()
+        logger.error(s"Error adding user $name", e)
+        false
+      }
     }
   }
 
   override def addOpenIDUser(name: String, userInfo: OpenIDUserInfo): Boolean = {
+    val tx = em.getTransaction
     try {
+      tx.begin()
       // Check if user already exists
       val existing = em.createQuery("SELECT u FROM UserEntity u WHERE u.username = :username", classOf[UserEntity])
         .setParameter("username", name)
         .getResultList
       
       if (!existing.isEmpty) {
+        logger.warn(s"User $name already exists")
+        tx.rollback()
         return false
       }
 
@@ -62,6 +79,8 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
         .getResultList
       
       if (!existingOpenID.isEmpty) {
+        logger.warn(s"OpenID user ${userInfo.provider}_${userInfo.id} already exists")
+        tx.rollback()
         return false
       }
 
@@ -70,9 +89,14 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
 
       em.persist(userEntity)
       em.flush()
+      tx.commit()
       true
     } catch {
-      case _: Exception => false
+      case e: Exception => {
+        if (tx.isActive) tx.rollback()
+        logger.error(s"Error adding OpenID user ${userInfo.provider}_${userInfo.id}", e)
+        false
+      }
     }
   }
 
@@ -93,7 +117,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
         None
       }
     } catch {
-      case _: Exception => None
+      case e: Exception => {
+        logger.error(s"Error authenticating user $name", e)
+        None
+      }
     }
   }
 
@@ -113,7 +140,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
         Some(users.get(0).toUser)
       }
     } catch {
-      case _: Exception => None
+      case e: Exception => {
+        logger.error(s"Error authenticating OpenID user ${provider}_$providerId", e)
+        None
+      }
     }
   }
 
@@ -129,7 +159,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
         Some(users.get(0).toUser)
       }
     } catch {
-      case _: Exception => None
+      case e: Exception => {
+        logger.error(s"Error checking if user $name exists", e)
+        None
+      }
     }
   }
 
@@ -137,25 +170,35 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
     try {
       Option(em.find(classOf[UserEntity], id)).map(_.toUser)
     } catch {
-      case _: Exception => None
+      case e: Exception => {
+        logger.error(s"Error checking if user with ID $id exists", e)
+        None
+      }
     }
   }
 
   override def removeUser(name: String): Boolean = {
+    val tx = em.getTransaction
     try {
+      tx.begin()
       val users = em.createQuery("SELECT u FROM UserEntity u WHERE u.username = :username", classOf[UserEntity])
         .setParameter("username", name)
         .getResultList
       
       if (users.isEmpty) {
+        tx.rollback()
         false
       } else {
         em.remove(users.get(0))
         em.flush()
+        tx.commit()
         true
       }
     } catch {
-      case _: Exception => false
+      case _: Exception => {
+        if (tx.isActive) tx.rollback()
+        false
+      }
     }
   }
 }

knockoutwhistweb/app/modules/GatewayModule.scala

@@ -1,10 +1,24 @@
 package modules
 
 import com.google.inject.AbstractModule
+import di.EntityManagerProvider
+import jakarta.persistence.EntityManager
 import logic.Gateway
+import logic.user.UserManager
+import logic.user.impl.HibernateUserManager
 
 class GatewayModule extends AbstractModule {
   override def configure(): Unit = {
     bind(classOf[Gateway]).asEagerSingleton()
+
+    // Bind HibernateUserManager for production (when GatewayModule is used)
+    bind(classOf[UserManager])
+      .to(classOf[HibernateUserManager])
+      .asEagerSingleton()
+
+    // Bind EntityManager for JPA
+    bind(classOf[EntityManager])
+      .toProvider(classOf[EntityManagerProvider])
+      .asEagerSingleton()
   }
 }

knockoutwhistweb/conf/META-INF/persistence.xml

@@ -11,15 +11,10 @@
         <class>model.users.UserEntity</class>
 
         <properties>
-            <!-- Database connection settings -->
-            <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-            <property name="jakarta.persistence.jdbc.url" value="${DATABASE_URL}"/>
-            <property name="jakarta.persistence.jdbc.user" value="${DB_USER}"/>
-            <property name="jakarta.persistence.jdbc.password" value="${DB_PASSWORD}"/>
-            
             <!-- Hibernate specific settings -->
             <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
+            <property name="hibernate.archive.autodetection" value="class"/>
             <property name="hibernate.show_sql" value="false"/>
             <property name="hibernate.format_sql" value="true"/>
             <property name="hibernate.use_sql_comments" value="true"/>

knockoutwhistweb/conf/application.conf

@@ -2,6 +2,9 @@
 play.filters.disabled += play.filters.csrf.CSRFFilter
 play.filters.disabled += play.filters.hosts.AllowedHostsFilter
 
+# Disable default JPA and Hibernate modules to use custom EntityManagerProvider
+play.modules.disabled += "play.db.jpa.JPAModule"
+
 play.http.secret.key="QCY?tAnfk?aZ?iwrNwnxIlR6CTf:G3gf:90Latabg@5241AB`R5W:1uDFN];Ik@n"
 play.http.secret.key=${?APPLICATION_SECRET}
 

knockoutwhistweb/conf/db.conf

@@ -1,10 +1,21 @@
 
 # Database configuration - PostgreSQL with environment variables
-db.default.driver=org.postgresql.Driver
+db.default.driver="org.postgresql.Driver"
+db.default.url="jdbc:postgresql://localhost:5432/knockoutwhist"
 db.default.url=${?DATABASE_URL}
+db.default.username="kw_user"
 db.default.username=${?DB_USER}
+db.default.password="postgres"
 db.default.password=${?DB_PASSWORD}
-db.default.password=""
+
+# HikariCP specific configuration
+db.default.hikaricp.driverClassName="org.postgresql.Driver"
+db.default.hikaricp.jdbcUrl="jdbc:postgresql://localhost:5432/knockoutwhist"
+db.default.hikaricp.jdbcUrl=${?DATABASE_URL}
+db.default.hikaricp.username="kw_user"
+db.default.hikaricp.username=${?DB_USER}
+db.default.hikaricp.password="postgres"
+db.default.hikaricp.password=${?DB_PASSWORD}
 
 # JPA/Hibernate configuration
 jpa.default=defaultPersistenceUnit

knockoutwhistweb/conf/prod.conf

@@ -23,7 +23,7 @@ openid {
     clientId = ${?DISCORD_CLIENT_ID}
     clientSecret = ${?DISCORD_CLIENT_SECRET}
     redirectUri = ${?DISCORD_REDIRECT_URI}
-    redirectUri = "https://knockout.janis-eccarius.de/auth/discord/callback"
+    redirectUri = "https://knockout.janis-eccarius.de/api/auth/discord/callback"
   }
   
   keycloak {

knockoutwhistweb/conf/staging.conf

@@ -20,7 +20,7 @@ openid {
     clientId = ${?DISCORD_CLIENT_ID}
     clientSecret = ${?DISCORD_CLIENT_SECRET}
     redirectUri = ${?DISCORD_REDIRECT_URI}
-    redirectUri = "https://st.knockout.janis-eccarius.de/auth/discord/callback"
+    redirectUri = "https://st.knockout.janis-eccarius.de/api/auth/discord/callback"
   }
   
   keycloak {

versions.env

@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=31
+MINOR=41
 PATCH=0