From 69efc2c1ec6ac997bb2b57e00485582f51f8a4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Thanh=20Ho=C3=A0ng?= Date: Sun, 29 Aug 2021 12:26:35 +0700 Subject: [PATCH] Revert "Adding API docs using Swagger" --- backend/pom.xml | 19 +------------ .../vaccom/vcmgt/constant/AppConstant.java | 27 ------------------- .../vcmgt/dto/request/UserLoginRequest.java | 19 ------------- .../vcmgt/dto/response/UserLoginResponse.java | 22 --------------- .../vcmgt/security/JwtTokenProvider.java | 1 + .../vaccom/vcmgt/security/SecurityConfig.java | 6 ----- .../vcmgt/config/DisableSecurityConfig.java | 25 ----------------- 7 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 backend/src/main/java/org/vaccom/vcmgt/constant/AppConstant.java delete mode 100644 backend/src/main/java/org/vaccom/vcmgt/dto/request/UserLoginRequest.java delete mode 100644 backend/src/main/java/org/vaccom/vcmgt/dto/response/UserLoginResponse.java delete mode 100644 backend/src/test/java/org/vaccom/vcmgt/config/DisableSecurityConfig.java diff --git a/backend/pom.xml b/backend/pom.xml index 2f7345ee..25f84b12 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -170,25 +170,8 @@ org.codehaus.groovy groovy-console - - - - - - - - org.projectlombok - lombok - 1.18.20 - provided - + - - - org.springdoc - springdoc-openapi-ui - 1.5.10 - diff --git a/backend/src/main/java/org/vaccom/vcmgt/constant/AppConstant.java b/backend/src/main/java/org/vaccom/vcmgt/constant/AppConstant.java deleted file mode 100644 index 62bcd474..00000000 --- a/backend/src/main/java/org/vaccom/vcmgt/constant/AppConstant.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.vaccom.vcmgt.constant; - -import lombok.experimental.UtilityClass; - -import java.util.Locale; - -/** - * @author TrinhNX - * @since 8/27/2021 - */ -@UtilityClass -public class AppConstant { - - public static final Locale DEFAULT_LOCALE = new Locale("vi_VN"); - - public enum AuthorizationType { - BEARER - } - - public enum AuthorityType { - ADMIN, // Nguoi quan tri - OFFICER_REGION, // Can bo dia ban - OFFICER_CARE, // Can bo y te - USER, // Nguoi tiem chung - VISITOR // Khach vang lai - } -} diff --git a/backend/src/main/java/org/vaccom/vcmgt/dto/request/UserLoginRequest.java b/backend/src/main/java/org/vaccom/vcmgt/dto/request/UserLoginRequest.java deleted file mode 100644 index b2823b28..00000000 --- a/backend/src/main/java/org/vaccom/vcmgt/dto/request/UserLoginRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.vaccom.vcmgt.dto.request; - -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotEmpty; - -/** - * @author TrinhNX - * @since 8/27/2021 - */ -@Setter -@Getter -public class UserLoginRequest { - @NotEmpty - private String userName; - @NotEmpty - private String password; -} diff --git a/backend/src/main/java/org/vaccom/vcmgt/dto/response/UserLoginResponse.java b/backend/src/main/java/org/vaccom/vcmgt/dto/response/UserLoginResponse.java deleted file mode 100644 index ee87ef4d..00000000 --- a/backend/src/main/java/org/vaccom/vcmgt/dto/response/UserLoginResponse.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.vaccom.vcmgt.dto.response; - -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; -import org.vaccom.vcmgt.constant.AppConstant.AuthorizationType; - -/** - * @author TrinhNX - * @since 8/27/2021 - */ -@Setter -@Getter -@Builder -public class UserLoginResponse { - private long userId; - private String accessToken; - private long expiresIn; - private String roleName; - @Builder.Default - private AuthorizationType tokenType = AuthorizationType.BEARER; -} diff --git a/backend/src/main/java/org/vaccom/vcmgt/security/JwtTokenProvider.java b/backend/src/main/java/org/vaccom/vcmgt/security/JwtTokenProvider.java index 69ae1dd3..f3c715f1 100644 --- a/backend/src/main/java/org/vaccom/vcmgt/security/JwtTokenProvider.java +++ b/backend/src/main/java/org/vaccom/vcmgt/security/JwtTokenProvider.java @@ -9,6 +9,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; +@Service public interface JwtTokenProvider { public String generateToken(Authentication authentication, int exprireIn); diff --git a/backend/src/main/java/org/vaccom/vcmgt/security/SecurityConfig.java b/backend/src/main/java/org/vaccom/vcmgt/security/SecurityConfig.java index 423d3926..dee3c52e 100644 --- a/backend/src/main/java/org/vaccom/vcmgt/security/SecurityConfig.java +++ b/backend/src/main/java/org/vaccom/vcmgt/security/SecurityConfig.java @@ -8,7 +8,6 @@ import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; @@ -82,9 +81,4 @@ protected void configure(HttpSecurity http) throws Exception { http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class); } - @Override - public void configure(WebSecurity web) throws Exception { - // Ignore api docs link for swagger v3 - web.ignoring().antMatchers("/v3/api-docs/**", "/swagger-ui.html", "/swagger-ui/**"); - } } \ No newline at end of file diff --git a/backend/src/test/java/org/vaccom/vcmgt/config/DisableSecurityConfig.java b/backend/src/test/java/org/vaccom/vcmgt/config/DisableSecurityConfig.java deleted file mode 100644 index 51e72492..00000000 --- a/backend/src/test/java/org/vaccom/vcmgt/config/DisableSecurityConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.vaccom.vcmgt.config; - -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -/** - * Bypass the web security of main application - * - * @author TrinhNX - * @since 8/27/2021 - */ -@TestConfiguration -@Order(Ordered.HIGHEST_PRECEDENCE) -public class DisableSecurityConfig extends WebSecurityConfigurerAdapter { - @Override - protected void configure(HttpSecurity httpSecurity) throws Exception { - // Disable CSRF - httpSecurity.csrf().disable() - // Permit all requests without authentication - .authorizeRequests().anyRequest().permitAll(); - } -}