From 8ce5b06823022d8eb67ac6154fa64b303ce2e21c Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Thu, 1 Feb 2024 16:54:41 +0100 Subject: [PATCH] fix: make security config optional for login controller --- .../kotlin/dev/dnpm/etl/processor/web/LoginController.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt index 954b23e..20837bb 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt @@ -24,17 +24,16 @@ import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2Clien import org.springframework.stereotype.Controller import org.springframework.ui.Model import org.springframework.web.bind.annotation.GetMapping -import java.security.Principal @Controller class LoginController( - private val securityConfigProperties: SecurityConfigProperties, + private val securityConfigProperties: SecurityConfigProperties?, private val oAuth2ClientProperties: OAuth2ClientProperties? ) { @GetMapping(path = ["/login"]) - fun login(principal: Principal?, model: Model): String { - if (securityConfigProperties.enableOidc) { + fun login(model: Model): String { + if (securityConfigProperties?.enableOidc == true) { model.addAttribute( "oidcLogins", oAuth2ClientProperties?.registration?.map { (key, value) -> Pair(key, value.clientName) }.orEmpty()