saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-08-02 18:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

More clean up

Browse Source
This commit is contained in:
Dario Ghunney Ware 2025-07-10 13:16:29 +01:00
parent 460f2d9ade
commit 006c186694
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
View File

@ -73,7 +73,6 @@ public class SecurityConfiguration {
private final ApplicationProperties.Security securityProperties; private final ApplicationProperties.Security securityProperties;
private final AppConfig appConfig; private final AppConfig appConfig;
private final UserAuthenticationFilter userAuthenticationFilter; private final UserAuthenticationFilter userAuthenticationFilter;
private final JWTAuthenticationFilter jwtAuthenticationFilter;
private final JWTServiceInterface jwtService; private final JWTServiceInterface jwtService;
private final JWTAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final JWTAuthenticationEntryPoint jwtAuthenticationEntryPoint;
private final LoginAttemptService loginAttemptService; private final LoginAttemptService loginAttemptService;
@ -93,7 +92,6 @@ public class SecurityConfiguration {
AppConfig appConfig, AppConfig appConfig,
ApplicationProperties.Security securityProperties, ApplicationProperties.Security securityProperties,
UserAuthenticationFilter userAuthenticationFilter, UserAuthenticationFilter userAuthenticationFilter,
JWTAuthenticationFilter jwtAuthenticationFilter,
JWTServiceInterface jwtService, JWTServiceInterface jwtService,
JWTAuthenticationEntryPoint jwtAuthenticationEntryPoint, JWTAuthenticationEntryPoint jwtAuthenticationEntryPoint,
LoginAttemptService loginAttemptService, LoginAttemptService loginAttemptService,
@ -111,7 +109,6 @@ public class SecurityConfiguration {
this.appConfig = appConfig; this.appConfig = appConfig;
this.securityProperties = securityProperties; this.securityProperties = securityProperties;
this.userAuthenticationFilter = userAuthenticationFilter; this.userAuthenticationFilter = userAuthenticationFilter;
this.jwtAuthenticationFilter = jwtAuthenticationFilter;
this.jwtService = jwtService; this.jwtService = jwtService;
this.jwtAuthenticationEntryPoint = jwtAuthenticationEntryPoint; this.jwtAuthenticationEntryPoint = jwtAuthenticationEntryPoint;
this.loginAttemptService = loginAttemptService; this.loginAttemptService = loginAttemptService;
@ -138,9 +135,10 @@ public class SecurityConfiguration {
} }
if (loginEnabledValue) { if (loginEnabledValue) {
if (jwtEnabled && jwtAuthenticationFilter != null) { if (jwtEnabled) {
http.addFilterBefore( http.addFilterBefore(
jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) jwtAuthenticationFilter(),
UsernamePasswordAuthenticationFilter.class)
.exceptionHandling( .exceptionHandling(
exceptionHandling -> exceptionHandling ->
exceptionHandling.authenticationEntryPoint( exceptionHandling.authenticationEntryPoint(
@ -370,4 +368,10 @@ public class SecurityConfiguration {
public PersistentTokenRepository persistentTokenRepository() { public PersistentTokenRepository persistentTokenRepository() {
return new JPATokenRepositoryImpl(persistentLoginRepository); return new JPATokenRepositoryImpl(persistentLoginRepository);
} }
@Bean
public JWTAuthenticationFilter jwtAuthenticationFilter() {
return new JWTAuthenticationFilter(
jwtService, userDetailsService, jwtAuthenticationEntryPoint);
}
} }