Skip to content

Move configuration of optional bean to avoid ordering problem #358

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

Move configuration of optional bean to avoid ordering problem #358

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
40 changes: 18 additions & 22 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 @@ -89,21 +89,6 @@ public UserDetailsService userDetailsService() {
return new NoUserDetailsService(); // avoid the default user.
}

@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 All @@ -112,16 +97,25 @@ public static class CompositeWebSecurityConfigurerAdapter {

private SecurityProperties securityProperties;

@Autowired(required = false)
private JwtHeaderToIssuerMapper jwtHeaderToIssuerMapper;

@Autowired(required = false)
private JwtHeaderToIssuerMapperDecider jwtHeaderToIssuerMapperDecider;

public CompositeWebSecurityConfigurerAdapter(SecurityProperties securityProperties) {
this.securityProperties = securityProperties;
}

@Bean
@ConditionalOnProperty(name = "entur.jwt.decode.header.map-to-issuer.enabled", havingValue = "true")
@ConditionalOnMissingBean(JwtHeaderToIssuerMapper.class)
Comment thread
skjolber marked this conversation as resolved.
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 All @@ -143,7 +137,9 @@ public SecurityFilterChain filterChain(
HttpSecurity http,
JwkSourceMap jwkSourceMap,
List<JwtAuthorityEnricher> jwtAuthorityEnrichers,
List<OAuth2TokenValidator<Jwt>> jwtValidators
List<OAuth2TokenValidator<Jwt>> jwtValidators,
@Autowired(required = false) JwtHeaderToIssuerMapper jwtHeaderToIssuerMapper,
@Autowired(required = false) JwtHeaderToIssuerMapperDecider jwtHeaderToIssuerMapperDecider
) throws Exception {

AuthorizationProperties authorization = securityProperties.getAuthorization();
Expand Down