From 81e3151ab171ba12ad94ec968d74dd594f2c989c Mon Sep 17 00:00:00 2001
From: twilight0620 <liuhuiling4@huawei.com>
Date: Fri, 15 Jul 2022 17:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89debug=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edgegallery/website/config/AuthentionSuccessFilter.java    | 1 +
 .../edgegallery/website/config/ClientApplicationContext.java   | 2 +-
 .../website/config/ClientWebSecurityConfigurer.java            | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java
index 9b1813c..c0166ad 100644
--- a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java
+++ b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java
@@ -21,6 +21,7 @@ import org.springframework.security.oauth2.provider.authentication.OAuth2Authent
 public class AuthentionSuccessFilter implements Filter {
     private static final Logger LOGGER = LoggerFactory.getLogger(OAuthClientController.class);
 
+
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
         throws IOException, ServletException {
diff --git a/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java b/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java
index 565b774..27c5442 100644
--- a/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java
+++ b/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java
@@ -12,7 +12,7 @@ public class ClientApplicationContext implements ApplicationContextAware {
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
+        ClientApplicationContext.applicationContext = applicationContext;
     }
 
     public static <T> T getBean(Class<T> clazz) {
diff --git a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java
index 8bd3103..7327caf 100644
--- a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java
+++ b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java
@@ -50,6 +50,7 @@ import org.springframework.security.oauth2.client.filter.OAuth2ClientAuthenticat
 import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.web.access.ExceptionTranslationFilter;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
@@ -95,7 +96,7 @@ public class ClientWebSecurityConfigurer extends WebSecurityConfigurerAdapter {
             .antMatchers(HttpMethod.GET, "/mecm-inventory/inventory/v1/mechosts").permitAll()
             .antMatchers(HttpMethod.GET, "/health").permitAll().antMatchers("/webssh").permitAll()
             .antMatchers("/wsserver/**").permitAll().anyRequest().authenticated().and()
-            .addFilterBefore(new AuthentionSuccessFilter(), BasicAuthenticationFilter.class).logout()
+            .addFilterBefore(new AuthentionSuccessFilter(), ExceptionTranslationFilter.class).logout()
             .addLogoutHandler(new LogoutHandler() {
                 @Override
                 public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-- 
Gitee