diff --git a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java index b23be1f4a8e0d12fcc1edfc67a8ba7884879e84f..89c311f71ecfc238ddec198fc38f76960cd6f114 100644 --- a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java +++ b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java @@ -13,15 +13,12 @@ import org.edgegallery.website.controller.JwtServer; import org.edgegallery.website.controller.OAuthClientController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails; 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/ClientWebSecurityConfigurer.java b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java index 7327caf9082f644b60876275d663741399ed9eab..115f3f96eae4f8c1951e8162f33f163bfdd23dbb 100644 --- a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java +++ b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java @@ -96,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(), ExceptionTranslationFilter.class).logout() + .addFilterBefore(oauth2ClientAuthenticationProcessingFilter(), ExceptionTranslationFilter.class).logout() .addLogoutHandler(new LogoutHandler() { @Override public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, @@ -114,6 +114,7 @@ public class ClientWebSecurityConfigurer extends WebSecurityConfigurerAdapter { /** * oauth2ClientAuthenticationProcessingFilter. */ + @Bean public OAuth2ClientAuthenticationProcessingFilter oauth2ClientAuthenticationProcessingFilter() { LOGGER.info("oauth2ClientAuthenticationProcessingFilter in."); OAuth2ClientAuthenticationProcessingFilter filter = new OAuth2ClientAuthenticationProcessingFilter("/login");