Skip to content

Commit ddaeb93

Browse files
andanyoungandanyoung
committed
feat(AuthenticationHandler): AuthenticationHandler rename
1 parent 44dfa85 commit ddaeb93

10 files changed

Lines changed: 39 additions & 40 deletions

security-spring-boot-starter/src/main/java/com/admin4j/framework/security/AuthenticationResult.java renamed to security-spring-boot-starter/src/main/java/com/admin4j/framework/security/AuthenticationHandler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
import javax.servlet.http.HttpServletResponse;
99

1010
/**
11+
* 认证成功结果回调处理
12+
*
1113
* @author andanyang
1214
* @since 2023/5/31 17:57
1315
*/
14-
public interface AuthenticationResult {
16+
public interface AuthenticationHandler {
1517

1618
/**
1719
* 认证成功回调

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/configuration/SecurityConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
145145
if (actuatorFilter != null) {
146146
httpSecurity.addFilterBefore(actuatorFilter, UsernamePasswordAuthenticationFilter.class);
147147
}
148-
148+
149149
// 多渠道登录
150150
if (multiSecurityConfigurerAdapter != null) {
151151
httpSecurity.apply(multiSecurityConfigurerAdapter);

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/configuration/SecurityHandlerConfiguration.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.admin4j.framework.security.configuration;
22

3-
import com.admin4j.framework.security.AuthenticationResult;
3+
import com.admin4j.framework.security.AuthenticationHandler;
44
import com.admin4j.framework.security.UserTokenService;
55
import com.admin4j.framework.security.handler.*;
66
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -15,39 +15,39 @@
1515

1616
public class SecurityHandlerConfiguration {
1717
@Bean
18-
@ConditionalOnMissingBean({AuthenticationResult.class})
19-
public AuthenticationResult authenticationResult(UserTokenService userTokenService) {
20-
return new DefaultAuthenticationResult(userTokenService);
18+
@ConditionalOnMissingBean({AuthenticationHandler.class})
19+
public AuthenticationHandler authenticationResult(UserTokenService userTokenService) {
20+
return new DefaultAuthenticationHandler(userTokenService);
2121
}
2222

2323
@Bean
2424
@ConditionalOnMissingBean(AuthenticationEntryPoint.class)
25-
public AuthenticationEntryPoint authenticationEntryPoint(AuthenticationResult authenticationResult) {
26-
return new RestAuthenticationEntryPoint(authenticationResult);
25+
public AuthenticationEntryPoint authenticationEntryPoint(AuthenticationHandler authenticationHandler) {
26+
return new RestAuthenticationEntryPoint(authenticationHandler);
2727
}
2828

2929
@Bean
3030
@ConditionalOnMissingBean(AuthenticationFailureHandler.class)
31-
public AuthenticationFailureHandler authenticationFailureHandler(AuthenticationResult authenticationResult) {
32-
return new RestAuthenticationFailureHandler(authenticationResult);
31+
public AuthenticationFailureHandler authenticationFailureHandler(AuthenticationHandler authenticationHandler) {
32+
return new RestAuthenticationFailureHandler(authenticationHandler);
3333
}
3434

3535
@Bean
3636
@ConditionalOnMissingBean(AuthenticationSuccessHandler.class)
37-
public AuthenticationSuccessHandler authenticationSuccessHandler(AuthenticationResult authenticationResult) {
38-
return new RestAuthenticationSuccessHandler(authenticationResult);
37+
public AuthenticationSuccessHandler authenticationSuccessHandler(AuthenticationHandler authenticationHandler) {
38+
return new RestAuthenticationSuccessHandler(authenticationHandler);
3939
}
4040

4141
@Bean
4242
@ConditionalOnMissingBean(AccessDeniedHandler.class)
43-
public AccessDeniedHandler accessDeniedHandler(AuthenticationResult authenticationResult) {
44-
return new RestAccessDeniedHandler(authenticationResult);
43+
public AccessDeniedHandler accessDeniedHandler(AuthenticationHandler authenticationHandler) {
44+
return new RestAccessDeniedHandler(authenticationHandler);
4545
}
4646

4747
@Bean
4848
@ConditionalOnMissingBean(LogoutSuccessHandler.class)
49-
public LogoutSuccessHandler logoutSuccessHandler(AuthenticationResult authenticationResult) {
50-
return new RestLogoutSuccessHandler(authenticationResult);
49+
public LogoutSuccessHandler logoutSuccessHandler(AuthenticationHandler authenticationHandler) {
50+
return new RestLogoutSuccessHandler(authenticationHandler);
5151
}
5252

5353
@Bean

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/filter/JwtAuthenticationTokenFilter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.admin4j.common.pojo.AuthenticationUser;
44
import com.admin4j.common.util.UserContextUtil;
5-
import com.admin4j.framework.security.AuthenticationResult;
5+
import com.admin4j.framework.security.AuthenticationHandler;
66
import com.admin4j.framework.security.UserTokenService;
77
import com.admin4j.framework.security.exception.JwtTokenExpiredException;
88
import com.admin4j.framework.security.factory.AuthenticationUserFactory;
@@ -35,7 +35,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
3535
//@Autowired
3636
// UserDetailsService userDetailsService;
3737
@Autowired
38-
AuthenticationResult authenticationResult;
38+
AuthenticationHandler authenticationHandler;
3939

4040
@Override
4141
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
@@ -64,7 +64,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
6464
}
6565
} catch (Exception e) {
6666
log.error("authenticationEntryPoint {}", e.getMessage(), e);
67-
authenticationResult.authenticationEntryPoint(request, response, new JwtTokenExpiredException(e.getMessage(), e));
67+
authenticationHandler.authenticationEntryPoint(request, response, new JwtTokenExpiredException(e.getMessage(), e));
6868
return;
6969
}
7070

security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/DefaultAuthenticationResult.java renamed to security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/DefaultAuthenticationHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.admin4j.common.pojo.SimpleResponse;
77
import com.admin4j.common.util.ServletUtils;
88
import com.admin4j.common.util.UserContextUtil;
9-
import com.admin4j.framework.security.AuthenticationResult;
9+
import com.admin4j.framework.security.AuthenticationHandler;
1010
import com.admin4j.framework.security.UserTokenService;
1111
import com.admin4j.framework.security.event.AuthenticationSuccessEvent;
1212
import com.admin4j.framework.security.factory.AuthenticationUserFactory;
@@ -30,7 +30,7 @@
3030
*/
3131
@Slf4j
3232
@RequiredArgsConstructor
33-
public class DefaultAuthenticationResult implements AuthenticationResult {
33+
public class DefaultAuthenticationHandler implements AuthenticationHandler {
3434

3535

3636
protected static final IResponse FAIL_AUTH_FORBIDDEN = new SimpleResponse(ResponseEnum.FAIL_AUTH_FORBIDDEN);

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/RestAccessDeniedHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.admin4j.framework.security.handler;
22

3-
import com.admin4j.framework.security.AuthenticationResult;
3+
import com.admin4j.framework.security.AuthenticationHandler;
44
import lombok.RequiredArgsConstructor;
55
import org.springframework.security.access.AccessDeniedException;
66
import org.springframework.security.web.access.AccessDeniedHandler;
@@ -18,14 +18,14 @@
1818
@RequiredArgsConstructor
1919
public class RestAccessDeniedHandler implements AccessDeniedHandler {
2020

21-
final AuthenticationResult authenticationResult;
21+
final AuthenticationHandler authenticationHandler;
2222

2323
@Override
2424
public void handle(
2525
HttpServletRequest httpServletRequest, HttpServletResponse response, AccessDeniedException e)
2626
throws IOException, ServletException {
2727

2828

29-
authenticationResult.accessDeniedHandler(httpServletRequest, response, e);
29+
authenticationHandler.accessDeniedHandler(httpServletRequest, response, e);
3030
}
3131
}

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/RestAuthenticationEntryPoint.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.admin4j.framework.security.handler;
22

3-
import com.admin4j.framework.security.AuthenticationResult;
3+
import com.admin4j.framework.security.AuthenticationHandler;
44
import lombok.RequiredArgsConstructor;
55
import lombok.extern.slf4j.Slf4j;
66
import org.springframework.security.core.AuthenticationException;
@@ -19,8 +19,8 @@
1919
@Slf4j
2020
@RequiredArgsConstructor
2121
public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
22-
23-
private final AuthenticationResult authenticationResult;
22+
23+
private final AuthenticationHandler authenticationHandler;
2424

2525
@Override
2626
public void commence(
@@ -29,6 +29,6 @@ public void commence(
2929
AuthenticationException authException)
3030
throws IOException, ServletException {
3131

32-
authenticationResult.authenticationEntryPoint(request, response, authException);
32+
authenticationHandler.authenticationEntryPoint(request, response, authException);
3333
}
3434
}

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/RestAuthenticationFailureHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.admin4j.framework.security.handler;
22

3-
import com.admin4j.framework.security.AuthenticationResult;
3+
import com.admin4j.framework.security.AuthenticationHandler;
44
import lombok.RequiredArgsConstructor;
55
import org.springframework.security.core.AuthenticationException;
66
import org.springframework.security.web.authentication.AuthenticationFailureHandler;
@@ -17,10 +17,10 @@
1717
@RequiredArgsConstructor
1818
public class RestAuthenticationFailureHandler implements AuthenticationFailureHandler {
1919

20-
final AuthenticationResult authenticationResult;
20+
final AuthenticationHandler authenticationHandler;
2121

2222
@Override
2323
public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
24-
authenticationResult.onAuthenticationFailure(request, response, exception);
24+
authenticationHandler.onAuthenticationFailure(request, response, exception);
2525
}
2626
}

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/RestAuthenticationSuccessHandler.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.admin4j.framework.security.handler;
22

3-
import com.admin4j.framework.security.AuthenticationResult;
3+
import com.admin4j.framework.security.AuthenticationHandler;
44
import lombok.RequiredArgsConstructor;
55
import org.springframework.beans.BeansException;
66
import org.springframework.context.ApplicationContext;
@@ -19,21 +19,18 @@
1919
*/
2020
@RequiredArgsConstructor
2121
public class RestAuthenticationSuccessHandler implements AuthenticationSuccessHandler, ApplicationContextAware {
22+
final AuthenticationHandler authenticationHandler;
2223
private ApplicationContext applicationContext;
2324

2425
@Override
2526
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
2627
this.applicationContext = applicationContext;
2728
}
2829

29-
30-
final AuthenticationResult authenticationResult;
31-
32-
3330
@Override
3431
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
3532

3633

37-
authenticationResult.onAuthenticationSuccess(request, response, authentication);
34+
authenticationHandler.onAuthenticationSuccess(request, response, authentication);
3835
}
3936
}

‎security-spring-boot-starter/src/main/java/com/admin4j/framework/security/handler/RestLogoutSuccessHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.admin4j.framework.security.handler;
22

3-
import com.admin4j.framework.security.AuthenticationResult;
3+
import com.admin4j.framework.security.AuthenticationHandler;
44
import lombok.RequiredArgsConstructor;
55
import org.springframework.security.core.Authentication;
66
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
@@ -17,11 +17,11 @@
1717
@RequiredArgsConstructor
1818
public class RestLogoutSuccessHandler implements LogoutSuccessHandler {
1919

20-
final AuthenticationResult authenticationResult;
20+
final AuthenticationHandler authenticationHandler;
2121

2222
@Override
2323
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
2424

25-
authenticationResult.onLogoutSuccess(request, response, authentication);
25+
authenticationHandler.onLogoutSuccess(request, response, authentication);
2626
}
2727
}

0 commit comments

Comments
 (0)