Make LoginAuditService creation unconditional

Author: suvikankare

src/main/kotlin/fi/hsl/jore4/auth/audit/LoginAuditService.kt

@@ -2,18 +2,17 @@ package fi.hsl.jore4.auth.audit
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 /**
  * Service for logging login events.
- * Only enabled when JPA is available.
  */
 @Service
-@ConditionalOnBean(LoginAuditRepository::class)
 open class LoginAuditService(
-    private val loginAuditRepository: LoginAuditRepository
+    @Autowired(required = false)
+    private val loginAuditRepository: LoginAuditRepository?
 ) {
     companion object {
         private val LOGGER: Logger = LoggerFactory.getLogger(LoginAuditService::class.java)
@@ -27,6 +26,11 @@ open class LoginAuditService(
         userId: String,
         userName: String?
     ) {
+        if (loginAuditRepository == null) {
+            LOGGER.warn("LoginAuditRepository is not available, cannot record login")
+            return
+        }
+        
         try {
             val auditRecord =
                 LoginAudit(

src/main/kotlin/fi/hsl/jore4/auth/oidc/OIDCCodeExchangeService.kt

@@ -91,6 +91,8 @@ open class OIDCCodeExchangeService(
         val accessToken = successResponse.oidcTokens.accessToken
         val refreshToken = successResponse.oidcTokens.refreshToken
         val idToken = successResponse.oidcTokens.idToken
+        val accessTokenValue = accessToken.value
+        val userId = idToken.jwtClaimsSet.subject
 
         // verify token authenticity and validity if not using Entra, as it uses an unverifiable internal token
         // See https://learn.microsoft.com/en-us/entra/identity-platform/access-tokens#validate-tokens
@@ -102,10 +104,13 @@ open class OIDCCodeExchangeService(
 
         // Record the login event in the audit log
         try {
-            loginAuditService?.let {
-                val userId = idToken.jwtClaimsSet.subject
-                val userName = fetchUserNameFromUserInfo(accessToken.value, userId)
-                it.recordLogin(userId, userName)
+            loginAuditService?.let { auditService ->
+                LOGGER.info("Recording login for userId: {}", userId)
+                val userName = fetchUserNameFromUserInfo(accessTokenValue, userId)
+                auditService.recordLogin(userId, userName)
+            }
+            if (loginAuditService == null) {
+                LOGGER.warn("LoginAuditService is not available")
             }
         } catch (e: Exception) {
             LOGGER.warn("Could not record login audit", e)