Skip to content

Reduce duplicated config to single; move to common AutoConfiguration #359

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.

Sign up for GitHub

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

Merged
skjolber merged 1 commit into from
Aug 28, 2026
Merged

Reduce duplicated config to single; move to common AutoConfiguration #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions ...ver/spring/jwt-spring-common/src/main/java/org/entur/jwt/spring/JwtAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package org.entur.jwt.spring;

import org.entur.jwt.spring.actuate.ListJwksHealthIndicator;
import org.entur.jwt.spring.decode.BoundedJwtHeaderToIssuerMapper;
import org.entur.jwt.spring.decode.DefaultJwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapper;
import org.entur.jwt.spring.properties.JwtProperties;
import org.entur.jwt.spring.properties.SecurityProperties;
import org.entur.jwt.spring.properties.jwk.JwtTenantProperties;
Expand Down Expand Up @@ -67,6 +71,19 @@ public List<OAuth2TokenValidator<Jwt>> claimConstraints(SecurityProperties prope
return oAuth2TokenValidatorFactory.create(properties.getJwt().getClaims());
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapper.class)
public JwtHeaderToIssuerMapper jwtHeaderToIssuerMapper(SecurityProperties securityProperties) {
int maxSize = securityProperties.getJwt().getDecode().getHeader().getMapToIssuer().getMaxSize();
return maxSize != -1 ? new BoundedJwtHeaderToIssuerMapper(maxSize) : new JwtHeaderToIssuerMapper();
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapperDecider.class)
public JwtHeaderToIssuerMapperDecider jwtHeaderToIssuerMapperDecider() {
return new DefaultJwtHeaderToIssuerMapperDecider();
}

}
17 changes: 0 additions & 17 deletions ...g-grpc-native/src/main/java/org/entur/jwt/spring/grpc/netty/JwtGrpcAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import org.entur.jwt.spring.JwtAutoConfiguration;
import org.entur.jwt.spring.KeycloakJwtAuthorityEnricher;
import org.entur.jwt.spring.NoUserDetailsService;
import org.entur.jwt.spring.decode.BoundedJwtHeaderToIssuerMapper;
import org.entur.jwt.spring.decode.DefaultJwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapper;
import org.entur.jwt.spring.grpc.properties.GrpcPermitAll;
Expand Down Expand Up @@ -100,21 +98,6 @@ public JwtAuthorityEnricher jwtAuthorityEnricher() {
return new DefaultJwtAuthorityEnricher();
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapper.class)
public JwtHeaderToIssuerMapper jwtHeaderToIssuerMapper() {
int maxSize = securityProperties.getJwt().getDecode().getHeader().getMapToIssuer().getMaxSize();
return maxSize != -1 ? new BoundedJwtHeaderToIssuerMapper(maxSize) : new JwtHeaderToIssuerMapper();
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapperDecider.class)
public JwtHeaderToIssuerMapperDecider jwtHeaderToIssuerMapperDecider() {
return new DefaultJwtHeaderToIssuerMapperDecider();
}

@Bean
@GlobalServerInterceptor
public AuthenticationProcessInterceptor jwtSecurityFilterChain(
Expand Down
17 changes: 0 additions & 17 deletions ...t-spring-web/src/main/java/org/entur/jwt/spring/JwtWebSecurityChainAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import org.entur.jwt.spring.config.EnturAuthorizeHttpRequestsCustomizer;
import org.entur.jwt.spring.config.EnturOauth2ResourceServerCustomizer;
import org.entur.jwt.spring.config.JwtMappedDiagnosticContextFilter;
import org.entur.jwt.spring.decode.BoundedJwtHeaderToIssuerMapper;
import org.entur.jwt.spring.decode.DefaultJwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapper;
import org.entur.jwt.spring.filter.log.JwtMappedDiagnosticContextMapper;
Expand Down Expand Up @@ -101,21 +99,6 @@ public CompositeWebSecurityConfigurerAdapter(SecurityProperties securityProperti
this.securityProperties = securityProperties;
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapper.class)
public JwtHeaderToIssuerMapper jwtHeaderToIssuerMapper(SecurityProperties securityProperties) {
int maxSize = securityProperties.getJwt().getDecode().getHeader().getMapToIssuer().getMaxSize();
return maxSize != -1 ? new BoundedJwtHeaderToIssuerMapper(maxSize) : new JwtHeaderToIssuerMapper();
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapperDecider.class)
public JwtHeaderToIssuerMapperDecider jwtHeaderToIssuerHeaderMapperDecider() {
return new DefaultJwtHeaderToIssuerMapperDecider();
}

@Bean
@ConditionalOnExpression("${entur.authorization.enabled:true} && !${entur.jwt.enabled:true}")
public SecurityFilterChain securityWebFilterChain(
Expand Down
17 changes: 0 additions & 17 deletions ...pring-webflux/src/main/java/org/entur/jwt/spring/JwtWebFluxSecurityAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import org.entur.jwt.spring.config.EnturAuthorizeHttpRequestsCustomizer;
import org.entur.jwt.spring.config.EnturOauth2ResourceServerCustomizer;
import org.entur.jwt.spring.decode.BoundedJwtHeaderToIssuerMapper;
import org.entur.jwt.spring.decode.DefaultJwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapperDecider;
import org.entur.jwt.spring.decode.JwtHeaderToIssuerMapper;
import org.entur.jwt.spring.properties.Auth0Flavour;
Expand Down Expand Up @@ -81,21 +79,6 @@ public JwtAuthorityEnricher jwtAuthorityEnricher() {
return new DefaultJwtAuthorityEnricher();
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapper.class)
public JwtHeaderToIssuerMapper jwtHeaderToIssuerMapper(SecurityProperties securityProperties) {
int maxSize = securityProperties.getJwt().getDecode().getHeader().getMapToIssuer().getMaxSize();
return maxSize != -1 ? new BoundedJwtHeaderToIssuerMapper(maxSize) : new JwtHeaderToIssuerMapper();
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapperDecider.class)
public JwtHeaderToIssuerMapperDecider jwtHeaderToIssuerHeaderMapperDecider() {
return new DefaultJwtHeaderToIssuerMapperDecider();
}

@Configuration
@ConditionalOnMissingBean(name = BeanIds.SPRING_SECURITY_FILTER_CHAIN)
@ConditionalOnExpression("${entur.authorization.enabled:true} || ${entur.jwt.enabled:true}")
Expand Down