Skip to content
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.

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

fix: Warning messages removal during the build process #580

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
99 changes: 52 additions & 47 deletions src/main/java/com/lpvs/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.web.SecurityFilterChain;
Expand Down Expand Up @@ -73,53 +73,58 @@
*/
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http.cors()
.and()
.csrf()
.disable()
.headers()
.frameOptions()
.disable()
.and()
.logout()
.logoutRequestMatcher(new AntPathRequestMatcher("/oauth/logout"))
.logoutSuccessUrl(frontendMainPageUrl)
.invalidateHttpSession(true)
.clearAuthentication(true)
.and()
.authorizeRequests()
.anyRequest()
.permitAll()
.and()
.oauth2Login()
.successHandler(
new AuthenticationSuccessHandler() {
@Value("${frontend.main-page.url:}")
private String frontendMainPageUrl;
http.cors(
cors ->
cors.configurationSource(
request ->
new CorsConfiguration().applyPermitDefaultValues()))
.csrf(AbstractHttpConfigurer::disable)
Dismissed Show dismissed Hide dismissed
.headers(
headers ->
headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
.logout(
logout ->
logout.logoutRequestMatcher(
new AntPathRequestMatcher("/oauth/logout"))
.logoutSuccessUrl(frontendMainPageUrl)
.invalidateHttpSession(true)
.clearAuthentication(true))
.authorizeHttpRequests(authz -> authz.anyRequest().permitAll())
.oauth2Login(
login ->
login.successHandler(
new AuthenticationSuccessHandler() {
@Value("${frontend.main-page.url:}")
private String frontendMainPageUrl;

private String REDIRECT_URI = frontendMainPageUrl + "/login/callback";
private final String REDIRECT_URI =
frontendMainPageUrl + "/login/callback";

@Override
public void onAuthenticationSuccess(
HttpServletRequest request,
HttpServletResponse response,
Authentication authentication)
throws IOException, ServletException {
OAuth2User oAuth2User = (OAuth2User) authentication.getPrincipal();
System.out.println("oAuth2User = " + oAuth2User);

response.sendRedirect(
UriComponentsBuilder.fromUriString(REDIRECT_URI)
.queryParam("accessToken", "accessToken")
.queryParam("refreshToken", "refreshToken")
.build()
.encode(StandardCharsets.UTF_8)
.toUriString());
}
})
.defaultSuccessUrl(frontendMainPageUrl, true)
.userInfoEndpoint()
.userService(oAuthService);
@Override
public void onAuthenticationSuccess(
HttpServletRequest request,
HttpServletResponse response,
Authentication authentication)
throws IOException {
response.sendRedirect(
UriComponentsBuilder.fromUriString(
REDIRECT_URI)
.queryParam(
"accessToken",
"accessToken")
.queryParam(
"refreshToken",
"refreshToken")
.build()
.encode(
StandardCharsets
.UTF_8)
.toUriString());
}
})
.defaultSuccessUrl(frontendMainPageUrl, true)
.userInfoEndpoint(
userInfo -> userInfo.userService(oAuthService)));

return http.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
*/
@Component
@Slf4j
@SuppressWarnings("unchecked")
public class LPVSReportBuilder {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.verify;

@SuppressWarnings("unchecked")
public class LicensePreValidationServiceTest {

LicensePreValidationService licensePreValidationService;
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/lpvs/service/OAuthServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ public void testLoadUser() throws OAuth2AuthenticationException {
ClientRegistration.withRegistrationId("google")
.userInfoUri("https://example.com/userinfo")
.userNameAttributeName("email")
.authorizationGrantType(AuthorizationGrantType.PASSWORD)
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.clientId("id")
.tokenUri("https://example.com/tokenuri")
.redirectUri("https://example.com/redirecturi")
.authorizationUri("https://example.com/authorizationuri")
.build();
OAuth2UserRequest userRequest =
new OAuth2UserRequest(
Expand Down
Loading