Compare commits

...

2 Commits

Author SHA1 Message Date
TeamCity
773b760bc1 ci: bump version to v4.45.0 2026-01-20 20:06:17 +00:00
b729344d1e feat: Add logging for OpenID authentication process in OpenIDController 2026-01-20 21:03:47 +01:00
4 changed files with 18 additions and 3 deletions

View File

@@ -413,3 +413,8 @@
### Features ### Features
* Use environment variables for Keycloak client configuration in staging ([fccd94c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/fccd94cc11db43f99eded13207cc93fb59d8703e)) * Use environment variables for Keycloak client configuration in staging ([fccd94c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/fccd94cc11db43f99eded13207cc93fb59d8703e))
## (2026-01-20)
### Features
* Add logging for OpenID authentication process in OpenIDController ([b729344](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b729344d1e79c631146dd988248d033d97e12d93))

View File

@@ -2,7 +2,7 @@ package controllers
import logic.user.{SessionManager, UserManager} import logic.user.{SessionManager, UserManager}
import model.users.User import model.users.User
import play.api.Configuration import play.api.{Configuration, Logger}
import play.api.libs.json.Json import play.api.libs.json.Json
import play.api.mvc.* import play.api.mvc.*
import play.api.mvc.Cookie.SameSite.Lax import play.api.mvc.Cookie.SameSite.Lax
@@ -20,6 +20,8 @@ class OpenIDController @Inject()(
val config: Configuration val config: Configuration
)(implicit ec: ExecutionContext) extends BaseController { )(implicit ec: ExecutionContext) extends BaseController {
private val logger = Logger(this.getClass)
def loginWithProvider(provider: String): Action[AnyContent] = Action.async { implicit request => def loginWithProvider(provider: String): Action[AnyContent] = Action.async { implicit request =>
val state = openIDService.generateState() val state = openIDService.generateState()
val nonce = openIDService.generateNonce() val nonce = openIDService.generateNonce()
@@ -47,8 +49,11 @@ class OpenIDController @Inject()(
val code = request.getQueryString("code") val code = request.getQueryString("code")
val error = request.getQueryString("error") val error = request.getQueryString("error")
logger.info(s"Received callback from $provider with state $sessionState, nonce $sessionNonce, provider $sessionProvider, returned state $returnedState, code $code, error $error")
error match { error match {
case Some(err) => case Some(err) =>
logger.error(s"Authentication failed: $err")
Future.successful(Redirect("/login").flashing("error" -> s"Authentication failed: $err")) Future.successful(Redirect("/login").flashing("error" -> s"Authentication failed: $err"))
case None => case None =>
(for { (for {
@@ -63,6 +68,7 @@ class OpenIDController @Inject()(
// Check if user already exists // Check if user already exists
userManager.authenticateOpenID(provider, userInfo.id) match { userManager.authenticateOpenID(provider, userInfo.id) match {
case Some(user) => case Some(user) =>
logger.info(s"User ${userInfo.name} (${userInfo.id}) already exists, logging them in")
// User already exists, log them in // User already exists, log them in
val sessionToken = sessionManager.createSession(user) val sessionToken = sessionManager.createSession(user)
Future.successful(Redirect(config.getOptional[String]("openid.mainRoute").getOrElse("/")) Future.successful(Redirect(config.getOptional[String]("openid.mainRoute").getOrElse("/"))
@@ -75,6 +81,7 @@ class OpenIDController @Inject()(
)) ))
.removingFromSession("oauth_state", "oauth_nonce", "oauth_provider", "oauth_access_token")) .removingFromSession("oauth_state", "oauth_nonce", "oauth_provider", "oauth_access_token"))
case None => case None =>
logger.info(s"User ${userInfo.name} (${userInfo.id}) not found, creating new user")
// New user, redirect to username selection // New user, redirect to username selection
Future.successful(Redirect(config.get[String]("openid.selectUserRoute")) Future.successful(Redirect(config.get[String]("openid.selectUserRoute"))
.withSession( .withSession(
@@ -84,12 +91,15 @@ class OpenIDController @Inject()(
)) ))
} }
case None => case None =>
logger.error("Failed to retrieve user information")
Future.successful(Redirect("/login").flashing("error" -> "Failed to retrieve user information")) Future.successful(Redirect("/login").flashing("error" -> "Failed to retrieve user information"))
} }
case None => case None =>
logger.error("Failed to exchange authorization code")
Future.successful(Redirect("/login").flashing("error" -> "Failed to exchange authorization code")) Future.successful(Redirect("/login").flashing("error" -> "Failed to exchange authorization code"))
} }
}).getOrElse { }).getOrElse {
logger.error("Invalid state parameter")
Future.successful(Redirect("/login").flashing("error" -> "Invalid state parameter")) Future.successful(Redirect("/login").flashing("error" -> "Invalid state parameter"))
} }
} }

View File

@@ -1,3 +1,3 @@
MAJOR=4 MAJOR=4
MINOR=44 MINOR=45
PATCH=0 PATCH=0