Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66edab8ffe | ||
| 9ca1813f06 |
@@ -383,3 +383,8 @@
|
|||||||
### Features
|
### Features
|
||||||
|
|
||||||
* Disable default JPA and Hibernate modules and enhance EntityManagerProvider for HikariCP integration ([9fa1e5e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9fa1e5e07122aebd0391d47c3513013243a72a0f))
|
* 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))
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import jakarta.inject.Inject
|
|||||||
import jakarta.persistence.EntityManager
|
import jakarta.persistence.EntityManager
|
||||||
import logic.user.UserManager
|
import logic.user.UserManager
|
||||||
import model.users.{User, UserEntity}
|
import model.users.{User, UserEntity}
|
||||||
|
import play.api.Logger
|
||||||
import services.OpenIDUserInfo
|
import services.OpenIDUserInfo
|
||||||
import util.UserHash
|
import util.UserHash
|
||||||
|
|
||||||
@@ -14,6 +15,8 @@ import scala.jdk.CollectionConverters.*
|
|||||||
@Singleton
|
@Singleton
|
||||||
class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends UserManager {
|
class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends UserManager {
|
||||||
|
|
||||||
|
private val logger = Logger(getClass.getName)
|
||||||
|
|
||||||
override def addUser(name: String, password: String): Boolean = {
|
override def addUser(name: String, password: String): Boolean = {
|
||||||
try {
|
try {
|
||||||
// Check if user already exists
|
// Check if user already exists
|
||||||
@@ -22,6 +25,7 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
.getResultList
|
.getResultList
|
||||||
|
|
||||||
if (!existing.isEmpty) {
|
if (!existing.isEmpty) {
|
||||||
|
logger.warn(s"User $name already exists")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,9 +39,13 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
|
|
||||||
em.persist(userEntity)
|
em.persist(userEntity)
|
||||||
em.flush()
|
em.flush()
|
||||||
|
|
||||||
true
|
true
|
||||||
} catch {
|
} catch {
|
||||||
case _: Exception => false
|
case e: Exception => {
|
||||||
|
logger.error(s"Error adding user $name", e)
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,6 +57,7 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
.getResultList
|
.getResultList
|
||||||
|
|
||||||
if (!existing.isEmpty) {
|
if (!existing.isEmpty) {
|
||||||
|
logger.warn(s"User $name already exists")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,6 +71,7 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
.getResultList
|
.getResultList
|
||||||
|
|
||||||
if (!existingOpenID.isEmpty) {
|
if (!existingOpenID.isEmpty) {
|
||||||
|
logger.warn(s"OpenID user ${userInfo.provider}_${userInfo.id} already exists")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +82,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
em.flush()
|
em.flush()
|
||||||
true
|
true
|
||||||
} catch {
|
} catch {
|
||||||
case _: Exception => false
|
case e: Exception => {
|
||||||
|
logger.error(s"Error adding OpenID user ${userInfo.provider}_${userInfo.id}", e)
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +106,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
case _: Exception => None
|
case e: Exception => {
|
||||||
|
logger.error(s"Error authenticating user $name", e)
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,7 +129,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
Some(users.get(0).toUser)
|
Some(users.get(0).toUser)
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
case _: Exception => None
|
case e: Exception => {
|
||||||
|
logger.error(s"Error authenticating OpenID user ${provider}_$providerId", e)
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,7 +148,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
Some(users.get(0).toUser)
|
Some(users.get(0).toUser)
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
case _: Exception => None
|
case e: Exception => {
|
||||||
|
logger.error(s"Error checking if user $name exists", e)
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +159,10 @@ class HibernateUserManager @Inject()(em: EntityManager, config: Config) extends
|
|||||||
try {
|
try {
|
||||||
Option(em.find(classOf[UserEntity], id)).map(_.toUser)
|
Option(em.find(classOf[UserEntity], id)).map(_.toUser)
|
||||||
} catch {
|
} catch {
|
||||||
case _: Exception => None
|
case e: Exception => {
|
||||||
|
logger.error(s"Error checking if user with ID $id exists", e)
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=4
|
MAJOR=4
|
||||||
MINOR=38
|
MINOR=39
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
Reference in New Issue
Block a user