Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spring Boot improvements #82

Merged
merged 2 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import org.slf4j.LoggerFactory
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties
import org.springframework.boot.runApplication
import org.springframework.boot.web.codec.CodecCustomizer
import org.springframework.context.ApplicationContextInitializer
import org.springframework.context.support.BeanDefinitionDsl
import org.springframework.context.support.GenericApplicationContext
Expand All @@ -59,16 +60,12 @@ import org.springframework.core.env.getProperty
import org.springframework.core.env.getRequiredProperty
import org.springframework.http.HttpStatus
import org.springframework.http.client.reactive.ReactorClientHttpConnector
import org.springframework.http.codec.ServerCodecConfigurer
import org.springframework.http.codec.json.KotlinSerializationJsonDecoder
import org.springframework.http.codec.json.KotlinSerializationJsonEncoder
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
import org.springframework.security.config.web.server.ServerHttpSecurity
import org.springframework.security.config.web.server.invoke
import org.springframework.security.oauth2.server.resource.introspection.SpringReactiveOpaqueTokenIntrospector
import org.springframework.security.web.server.authentication.HttpStatusServerEntryPoint
import org.springframework.web.reactive.config.EnableWebFlux
import org.springframework.web.reactive.config.WebFluxConfigurer
import org.springframework.web.reactive.function.client.WebClient
import org.springframework.web.util.UriComponentsBuilder
import reactor.netty.http.client.HttpClient
Expand Down Expand Up @@ -112,6 +109,7 @@ internal object WebClients {
}
}

@OptIn(ExperimentalSerializationApi::class)
fun beans(clock: Clock) = beans {
//
// Adapters (out ports)
Expand Down Expand Up @@ -322,17 +320,14 @@ fun beans(clock: Clock) = beans {
// Other
//
bean {
object : WebFluxConfigurer {
@OptIn(ExperimentalSerializationApi::class)
override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {
val json = Json {
explicitNulls = false
ignoreUnknownKeys = true
}
configurer.defaultCodecs().kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(json))
configurer.defaultCodecs().kotlinSerializationJsonEncoder(KotlinSerializationJsonEncoder(json))
configurer.defaultCodecs().enableLoggingRequestDetails(true)
CodecCustomizer {
val json = Json {
explicitNulls = false
ignoreUnknownKeys = true
}
it.defaultCodecs().kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(json))
it.defaultCodecs().kotlinSerializationJsonEncoder(KotlinSerializationJsonEncoder(json))
it.defaultCodecs().enableLoggingRequestDetails(true)
}
}
}
Expand Down Expand Up @@ -388,8 +383,6 @@ fun BeanDefinitionDsl.initializer(): ApplicationContextInitializer<GenericApplic
ApplicationContextInitializer<GenericApplicationContext> { initialize(it) }

@SpringBootApplication
@EnableWebFlux
@EnableWebFluxSecurity
class PidIssuerApplication

fun main(args: Array<String>) {
Expand Down
24 changes: 0 additions & 24 deletions src/main/resources/application-prod.properties
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
# Enables logging of Mongo mapping events
logging.level.org.springframework=INFO
logging.level.org.springframework.boot.actuate.endpoint.web=DEBUG

management.endpoints.enabled-by-default=true
server.error.includeStacktrace=ALWAYS
server.port=8080
spring.webflux.base-path=/

#
# Issuer options
#
issuer.clientId=pid-issuer
issuer.publicUrl=http://localhost:${server.port}${spring.webflux.base-path}
issuer.authorizationServer=https://keycloak-eudi.netcompany-intrasoft.com/realms/pid-issuer-realm
issuer.authorizationServer.introspection=${issuer.authorizationServer}/protocol/openid-connect/token/introspect
issuer.authorizationServer.userinfo=${issuer.authorizationServer}/protocol/openid-connect/userinfo
issuer.credentialResponseEncryption.required=true
issuer.credentialResponseEncryption.algorithmsSupported=RSA-OAEP-256
issuer.credentialResponseEncryption.encryptionMethods=A128CBC-HS256
issuer.pid.mso_mdoc.enabled=true
issuer.pid.mso_mdoc.encoderUrl=https://preprod.issuer.eudiw.dev/formatter/cbor
issuer.pid.sd_jwt_vc.enabled=true
issuer.pid.sd_jwt_vc.notUseBefore=PT20
issuer.pid.sd_jwt_vc.complexObjectsSdOption=Structured
issuer.pid.sd_jwt_vc.deferred=true
issuer.pid.issuingCountry=FC
issuer.mdl.enabled=true
issuer.mdl.mso_mdoc.encoderUrl=https://preprod.issuer.eudiw.dev/formatter/cbor

spring.security.oauth2.resourceserver.opaquetoken.client-id=pid-issuer-srv
spring.security.oauth2.resourceserver.opaquetoken.client-secret=zIKAV9DIIIaJCzHCVBPlySgU8KgY68U2
spring.security.oauth2.resourceserver.opaquetoken.introspection-uri=${issuer.authorizationServer.introspection}
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Enables logging of Mongo mapping events
logging.level.org.springframework=INFO
logging.level.org.springframework.boot.actuate.endpoint.web=DEBUG

management.endpoints.enabled-by-default=true
server.error.includeStacktrace=ALWAYS
server.port=8080
spring.main.web-application-type=reactive
spring.webflux.base-path=/

#
Expand Down
Loading