Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60ec7de366 | ||
| 4a6598f102 |
@@ -433,3 +433,8 @@
|
|||||||
### Features
|
### Features
|
||||||
|
|
||||||
* Change log level to warn for OpenID callback in OpenIDController ([23cdbe9](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/23cdbe9bd127bc26405fd216372bbb2d7e718a77))
|
* Change log level to warn for OpenID callback in OpenIDController ([23cdbe9](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/23cdbe9bd127bc26405fd216372bbb2d7e718a77))
|
||||||
|
## (2026-01-21)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Change log level to warn for OpenID callback in OpenIDController ([4a6598f](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4a6598f102d8934c7502944a0addd400dd0cbcac))
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ class OpenIDController @Inject()(
|
|||||||
_ <- Option(sessionProvider.contains(provider))
|
_ <- Option(sessionProvider.contains(provider))
|
||||||
authCode <- code
|
authCode <- code
|
||||||
} yield {
|
} yield {
|
||||||
|
logger.warn(s"Authentication successful for $provider")
|
||||||
openIDService.exchangeCodeForTokens(provider, authCode, sessionState.get).flatMap {
|
openIDService.exchangeCodeForTokens(provider, authCode, sessionState.get).flatMap {
|
||||||
case Some(tokenResponse) =>
|
case Some(tokenResponse) =>
|
||||||
openIDService.getUserInfo(provider, tokenResponse.accessToken).flatMap {
|
openIDService.getUserInfo(provider, tokenResponse.accessToken).flatMap {
|
||||||
@@ -68,7 +69,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")
|
logger.warn(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("/"))
|
||||||
@@ -81,7 +82,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")
|
logger.warn(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(
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=4
|
MAJOR=4
|
||||||
MINOR=48
|
MINOR=49
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
Reference in New Issue
Block a user