old-portfolio/backend-hideyoshi.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from HideyoshiNakazone/main

Browse Source 
Fixes Infra Dispatcher
This commit is contained in:
Vitor Hideyoshi
2024-02-16 01:32:22 -03:00
committed by GitHub
parent 656034339a 1176547be8
commit 336b8491e8
43 changed files with 156 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-image.yml vendored
View File

@@ -36,7 +36,7 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Runs Infra-Hideyoshi.com Deployment Dispatcher
run: |
curl -X POST https://api.github.com/repos/HideyoshiNakazone/infra-hideyoshi.com/dispatches \
curl -X POST https://api.github.com/repos/HideyoshiSolutions/infra-hideyoshi.com/dispatches \
-H 'Accept: application/vnd.github.everest-preview+json' \
-u ${{ secrets.ACTIONS_KEY }} \
--data '{"event_type": "refresh-deployments", "client_payload": { "deployments": "backend-deployment" }}'

14
src/main/java/com/hideyoshi/backendportfolio/BackendPortfolioApplication.java
View File

@@ -9,13 +9,13 @@ import org.springframework.security.crypto.password.PasswordEncoder;
@SpringBootApplication
public class BackendPortfolioApplication {
public static void main(String[] args) {
SpringApplication.run(BackendPortfolioApplication.class, args);
}
public static void main(String[] args) {
SpringApplication.run(BackendPortfolioApplication.class, args);
}
@Bean
PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Bean
PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}

1
src/main/java/com/hideyoshi/backendportfolio/base/config/CorsConfig.java
View File

@@ -1,6 +1,5 @@
package com.hideyoshi.backendportfolio.base.config;
import antlr.actions.python.CodeLexer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

14
src/main/java/com/hideyoshi/backendportfolio/base/config/DefaultUserConfig.java
View File

@@ -31,13 +31,13 @@ public class DefaultUserConfig {
CommandLineRunner run(UserService userService, UserRepository userRepo) {
return args -> {
UserDTO defaultUser = UserDTO.builder()
.name(ADMIN_NAME)
.email(ADMIN_EMAIL)
.username(ADMIN_USERNAME)
.password(ADMIN_PASSWORD)
.provider(Provider.LOCAL)
.roles(new ArrayList<>())
.build();
.name(ADMIN_NAME)
.email(ADMIN_EMAIL)
.username(ADMIN_USERNAME)
.password(ADMIN_PASSWORD)
.provider(Provider.LOCAL)
.roles(new ArrayList<>())
.build();
if (!userRepo.findByUsername(defaultUser.getUsername()).isPresent()) {
defaultUser = userService.saveUser(defaultUser);

3
src/main/java/com/hideyoshi/backendportfolio/base/config/RestAuthenticationEntryPointConfig.java
View File

@@ -1,7 +1,6 @@
package com.hideyoshi.backendportfolio.base.config;
import com.hideyoshi.backendportfolio.util.exception.AuthenticationInvalidException;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -15,7 +14,7 @@ import javax.servlet.http.HttpServletResponse;
@Log4j2
@Component("restAuthenticationEntryPoint")
public class RestAuthenticationEntryPointConfig implements AuthenticationEntryPoint{
public class RestAuthenticationEntryPointConfig implements AuthenticationEntryPoint {
@Autowired
@Qualifier("handlerExceptionResolver")

29
src/main/java/com/hideyoshi/backendportfolio/base/security/config/SecurityConfig.java
View File

@@ -8,10 +8,8 @@ import com.hideyoshi.backendportfolio.base.security.service.AuthService;
import com.hideyoshi.backendportfolio.util.exception.AuthenticationInvalidException;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -24,7 +22,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.filter.ForwardedHeaderFilter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -69,31 +66,31 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
customAuthenticationFilter.setFilterProcessesUrl("/user/login");
http.authorizeRequests()
.antMatchers("/session/**").permitAll()
.and().authorizeRequests().antMatchers("/user/signup").permitAll()
.and().authorizeRequests().antMatchers("/user/oauth/**").permitAll()
.and().authorizeRequests().antMatchers("/user/login/**").permitAll()
.and().authorizeRequests().antMatchers("/**").hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
.antMatchers("/session/**").permitAll()
.and().authorizeRequests().antMatchers("/user/signup").permitAll()
.and().authorizeRequests().antMatchers("/user/oauth/**").permitAll()
.and().authorizeRequests().antMatchers("/user/login/**").permitAll()
.and().authorizeRequests().antMatchers("/**").hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
.and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
.and().addFilter(customAuthenticationFilter)
.and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
.and().addFilter(customAuthenticationFilter)
.addFilterBefore(new CustomAuthorizationFilter(this.authService), UsernamePasswordAuthenticationFilter.class);
.addFilterBefore(new CustomAuthorizationFilter(this.authService), UsernamePasswordAuthenticationFilter.class);
}
private void addOAuthSecurityToHttp(HttpSecurity http) throws Exception {
http.oauth2Login()
.authorizationEndpoint()
.authorizationRequestRepository(this.oAuthRequestRepository)
.and().successHandler(this::successHandler)
.failureHandler(this::failureHandler);
.authorizationEndpoint()
.authorizationRequestRepository(this.oAuthRequestRepository)
.and().successHandler(this::successHandler)
.failureHandler(this::failureHandler);
}
private void successHandler(HttpServletRequest request,
HttpServletResponse response,
Authentication authentication ) throws IOException {
Authentication authentication) throws IOException {
OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal();

10
src/main/java/com/hideyoshi/backendportfolio/base/security/filter/CustomAuthenticationFilter.java
View File

@@ -1,13 +1,9 @@
package com.hideyoshi.backendportfolio.base.security.filter;
import com.auth0.jwt.algorithms.Algorithm;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.hideyoshi.backendportfolio.base.config.RestAuthenticationEntryPointConfig;
import com.hideyoshi.backendportfolio.base.security.service.AuthService;
import com.hideyoshi.backendportfolio.base.user.model.TokenDTO;
import com.hideyoshi.backendportfolio.base.user.model.UserDTO;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -17,11 +13,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.HashMap;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@Log4j2
public class CustomAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
@@ -65,5 +57,5 @@ public class CustomAuthenticationFilter extends UsernamePasswordAuthenticationFi
);
}
}

13
src/main/java/com/hideyoshi/backendportfolio/base/security/filter/CustomAuthorizationFilter.java
View File

@@ -19,7 +19,13 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
public class CustomAuthorizationFilter extends OncePerRequestFilter {
public static String AUTHORIZATION_TYPE_STRING = "Bearer ";
private static final List<String> notProtectedPaths = Arrays.asList(
"/user/login",
"/user/signup",
"/user/login/refresh"
);
private static final String AUTHORIZATION_TYPE_STRING = "Bearer ";
private final AuthService authService;
@@ -62,11 +68,6 @@ public class CustomAuthorizationFilter extends OncePerRequestFilter {
}
private Boolean isPathNotProtected(String path) {
List<String> notProtectedPaths = Arrays.asList(
"/user/login"
);
return notProtectedPaths.contains(path);
}

2
src/main/java/com/hideyoshi/backendportfolio/base/security/interceptor/ConfigInterceptor.java
View File

@@ -7,7 +7,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Component
@RequiredArgsConstructor
public class ConfigInterceptor implements WebMvcConfigurer {
public class ConfigInterceptor implements WebMvcConfigurer {
private final UserResourceAccessInterceptor userResourceAccessInterceptor;

2
src/main/java/com/hideyoshi/backendportfolio/base/security/interceptor/UserResourceAccessInterceptor.java
View File

@@ -29,7 +29,7 @@ public class UserResourceAccessInterceptor implements HandlerInterceptor {
return true;
}
final UserResourceGuard annotation = ((HandlerMethod)handler)
final UserResourceGuard annotation = ((HandlerMethod) handler)
.getMethodAnnotation(UserResourceGuard.class);
if (Objects.nonNull(annotation)) {

1
src/main/java/com/hideyoshi/backendportfolio/base/security/model/AuthDTO.java
View File

@@ -10,7 +10,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.List;

1
src/main/java/com/hideyoshi/backendportfolio/base/security/oauth/mapper/GithubOAuthMap.java
View File

@@ -2,7 +2,6 @@ package com.hideyoshi.backendportfolio.base.security.oauth.mapper;
import com.hideyoshi.backendportfolio.base.user.entity.Provider;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.core.user.OAuth2User;
@AllArgsConstructor

1
src/main/java/com/hideyoshi/backendportfolio/base/security/oauth/mapper/GoogleOAuthMap.java
View File

@@ -2,7 +2,6 @@ package com.hideyoshi.backendportfolio.base.security.oauth.mapper;
import com.hideyoshi.backendportfolio.base.user.entity.Provider;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.core.user.OAuth2User;
@AllArgsConstructor

1
src/main/java/com/hideyoshi/backendportfolio/base/security/oauth/mapper/OAuthMap.java
View File

@@ -1,7 +1,6 @@
package com.hideyoshi.backendportfolio.base.security.oauth.mapper;
import com.hideyoshi.backendportfolio.base.user.entity.Provider;
import org.springframework.security.oauth2.core.user.OAuth2User;
public interface OAuthMap {

8
src/main/java/com/hideyoshi/backendportfolio/base/security/oauth/mapper/OAuthMapper.java
View File

@@ -19,10 +19,6 @@ public enum OAuthMapper {
this.provider = provider;
}
public Class getMap() {
return oAuthMap;
}
public static OAuthMapper byValue(String name) {
for (OAuthMapper e : values()) {
if (e.getProvider().getName().equals(name)) {
@@ -32,4 +28,8 @@ public enum OAuthMapper {
throw new IllegalArgumentException("Argument not valid.");
}
public Class getMap() {
return oAuthMap;
}
}

4
src/main/java/com/hideyoshi/backendportfolio/base/security/oauth/repo/OAuthRequestRepository.java
View File

@@ -29,8 +29,8 @@ public class OAuthRequestRepository implements AuthorizationRequestRepository<OA
String state = authorizationRequest.getState();
request.getSession().setAttribute(
String.format("state_%s", state),
authorizationRequest
String.format("state_%s", state),
authorizationRequest
);
}

2
src/main/java/com/hideyoshi/backendportfolio/base/security/service/AuthService.java
View File

@@ -19,7 +19,7 @@ public interface AuthService {
TokenDTO generateRefreshToken(@Valid UserDTO user, Algorithm algorithm, HttpServletRequest request);
HashMap<String,TokenDTO> generateTokens(@Valid UserDTO user, Algorithm algorithm, HttpServletRequest request);
HashMap<String, TokenDTO> generateTokens(@Valid UserDTO user, Algorithm algorithm, HttpServletRequest request);
UsernamePasswordAuthenticationToken verifyAccessToken(String authorizationHeader);

12
src/main/java/com/hideyoshi/backendportfolio/base/security/service/AuthServiceImpl.java
View File

@@ -45,21 +45,15 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
public class AuthServiceImpl implements AuthService {
private static final String AUTHORIZATION_TYPE_STRING = "Bearer ";
private final UserService userService;
private final StorageService storageService;
@Value("${com.hideyoshi.tokenSecret}")
private String TOKEN_SECRET;
@Value("${com.hideyoshi.accessTokenDuration}")
private Integer ACCESS_TOKEN_DURATION;
@Value("${com.hideyoshi.refreshTokenDuration}")
private Integer REFRESH_TOKEN_DURATION;
private static final String AUTHORIZATION_TYPE_STRING = "Bearer ";
private final UserService userService;
private final StorageService storageService;
@Autowired
@Qualifier("handlerExceptionResolver")
private HandlerExceptionResolver resolver;

8
src/main/java/com/hideyoshi/backendportfolio/base/session/api/SessionController.java
View File

@@ -2,12 +2,14 @@ package com.hideyoshi.backendportfolio.base.session.api;
import com.hideyoshi.backendportfolio.base.security.model.AuthDTO;
import com.hideyoshi.backendportfolio.base.session.service.SessionManagerService;
import com.hideyoshi.backendportfolio.base.user.model.UserDTO;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpSession;
@@ -24,7 +26,7 @@ public class SessionController {
return ResponseEntity.ok(this.sessionManagerService.validateSession(session));
}
@DeleteMapping(path="/destroy")
@DeleteMapping(path = "/destroy")
public ResponseEntity<Void> destroyCurrentSession(HttpSession session) {
this.sessionManagerService.destroySession(session);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);

1
src/main/java/com/hideyoshi/backendportfolio/base/session/service/SessionManagerServiceImpl.java
View File

@@ -1,7 +1,6 @@
package com.hideyoshi.backendportfolio.base.session.service;
import com.hideyoshi.backendportfolio.base.security.model.AuthDTO;
import com.hideyoshi.backendportfolio.base.user.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

8
src/main/java/com/hideyoshi/backendportfolio/base/user/entity/Provider.java
View File

@@ -14,10 +14,6 @@ public enum Provider {
this.name = name;
}
public String getName() {
return name;
}
public static Provider byValue(String name) {
for (Provider p : values()) {
if (p.getName().equals(name)) {
@@ -27,4 +23,8 @@ public enum Provider {
throw new IllegalArgumentException("Argument not valid.");
}
public String getName() {
return name;
}
}

8
src/main/java/com/hideyoshi/backendportfolio/base/user/entity/Role.java
View File

@@ -13,10 +13,6 @@ public enum Role {
this.description = description;
}
public String getDescription() {
return this.description;
}
public static Role byValue(String description) {
for (Role r : values()) {
if (r.getDescription().equals(description)) {
@@ -26,4 +22,8 @@ public enum Role {
throw new IllegalArgumentException("Argument not valid.");
}
public String getDescription() {
return this.description;
}
}

36
src/main/java/com/hideyoshi/backendportfolio/base/user/entity/User.java
View File

@@ -25,30 +25,30 @@ public class User {
private Long id;
@Column(
name = "name",
nullable = false
name = "name",
nullable = false
)
private String name;
@Column(
name = "email",
unique = true,
nullable = false
name = "email",
unique = true,
nullable = false
)
private String email;
@Column(
name = "username",
unique = true,
nullable = false
name = "username",
unique = true,
nullable = false
)
private String username;
@Column(
name = "password",
nullable = false
name = "password",
nullable = false
)
private String password;
@@ -59,17 +59,11 @@ public class User {
private String provider;
@Column(
name = "roles",
nullable = false
name = "roles",
nullable = false
)
private String roles;
public void setRoles(List<Role> roles) {
this.roles = roles.stream()
.map(role -> role.getDescription())
.collect(Collectors.joining("&"));
}
public List<Role> getRoles() {
List<Role> roles = new ArrayList<>();
if (Objects.nonNull(this.roles) && !this.roles.isEmpty()) {
@@ -80,4 +74,10 @@ public class User {
return roles;
}
public void setRoles(List<Role> roles) {
this.roles = roles.stream()
.map(role -> role.getDescription())
.collect(Collectors.joining("&"));
}
}

6
src/main/java/com/hideyoshi/backendportfolio/base/user/model/TokenDTO.java
View File

@@ -3,7 +3,9 @@ package com.hideyoshi.backendportfolio.base.user.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@@ -19,7 +21,7 @@ public class TokenDTO implements Serializable {
@NotNull(message = "Invalid AccessToken. Please Authenticate first.")
private String token;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expirationDate;
}

2
src/main/java/com/hideyoshi/backendportfolio/base/user/model/UserDTO.java
View File

@@ -50,7 +50,7 @@ public class UserDTO implements UserDetails {
@ValidPassword
private String password;
@Size(min=1)
@Size(min = 1)
private List<Role> roles;
private String profilePictureUrl;

1
src/main/java/com/hideyoshi/backendportfolio/base/user/repo/UserRepository.java
View File

@@ -9,5 +9,6 @@ import java.util.Optional;
@Repository
public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByUsername(String username);
Optional<User> findByEmail(String email);
}

10
src/main/java/com/hideyoshi/backendportfolio/base/user/service/UserServiceImpl.java
View File

@@ -31,7 +31,7 @@ public class UserServiceImpl implements UserService {
@Override
public UserDTO saveUser(@Valid UserDTO user) {
this.userRepo.findByUsername(user.getUsername()).ifPresent( userOnDB -> {
this.userRepo.findByUsername(user.getUsername()).ifPresent(userOnDB -> {
throw new BadRequestException(String.format("User %s already exists. Try another UserName.", userOnDB.getUsername()));
});
@@ -48,7 +48,7 @@ public class UserServiceImpl implements UserService {
@Override
public void alterUser(Long id, @Valid UserDTO user) {
this.userRepo.findById(id).ifPresentOrElse( userOnDB -> {
this.userRepo.findById(id).ifPresentOrElse(userOnDB -> {
User userToSave = user.toEntity();
userToSave.setId(userOnDB.getId());
userRepo.save(userToSave);
@@ -60,7 +60,7 @@ public class UserServiceImpl implements UserService {
@Override
public void deleteUser(Long id) {
this.userRepo.findById(id).ifPresentOrElse( userOnDB -> {
this.userRepo.findById(id).ifPresentOrElse(userOnDB -> {
this.userRepo.delete(userOnDB);
}, () -> {
throw new BadRequestException("User doesn't exist.");
@@ -124,8 +124,8 @@ public class UserServiceImpl implements UserService {
log.info(String.format("Fetching user: %s", username));
return new UserDTO(
userRepo.findByUsername(username)
.orElseThrow(() -> new BadRequestException("User Not Found. Please create an Account."))
userRepo.findByUsername(username)
.orElseThrow(() -> new BadRequestException("User Not Found. Please create an Account."))
);
}

21
src/main/java/com/hideyoshi/backendportfolio/healthChecker/api/HealthCheckerController.java Normal file
View File

@@ -0,0 +1,21 @@
package com.hideyoshi.backendportfolio.healthChecker.api;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Log4j2
@Controller
@RestController
@RequestMapping("/health")
public class HealthCheckerController {
@RequestMapping
public ResponseEntity<String> healthCheck() {
log.info("Health check requested");
return ResponseEntity.ok("Health check successful!");
}
}

2
src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnum.java
View File

@@ -19,7 +19,7 @@ public enum FileTypeEnum {
}
public static FileTypeEnum fromValue(String value) {
for (FileTypeEnum e: FileTypeEnum.values()) {
for (FileTypeEnum e : FileTypeEnum.values()) {
if (e.getFileExtension().equals(value)) {
return e;
}

4
src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/model/StorageServiceDownloadResponse.java
View File

@@ -2,7 +2,9 @@ package com.hideyoshi.backendportfolio.microservice.storageService.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor

4
src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/model/StorageServiceUploadResponse.java
View File

@@ -2,7 +2,9 @@ package com.hideyoshi.backendportfolio.microservice.storageService.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor

3
src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/service/StorageService.java
View File

@@ -1,7 +1,6 @@
package com.hideyoshi.backendportfolio.microservice.storageService.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.hideyoshi.backendportfolio.microservice.storageService.config.StorageServiceConfig;
import com.hideyoshi.backendportfolio.microservice.storageService.enums.FileTypeEnum;
@@ -10,8 +9,8 @@ import com.hideyoshi.backendportfolio.microservice.storageService.model.StorageS
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.impl.client.CloseableHttpClient;

2
src/main/java/com/hideyoshi/backendportfolio/util/exception/AuthenticationInvalidExceptionDetails.java
View File

@@ -2,7 +2,7 @@ package com.hideyoshi.backendportfolio.util.exception;
import java.time.LocalDateTime;
public class AuthenticationInvalidExceptionDetails extends ExceptionDetails{
public class AuthenticationInvalidExceptionDetails extends ExceptionDetails {
public AuthenticationInvalidExceptionDetails(
String title,

2
src/main/java/com/hideyoshi/backendportfolio/util/exception/BadRequestException.java
View File

@@ -4,7 +4,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(HttpStatus.BAD_REQUEST)
public class BadRequestException extends RuntimeException{
public class BadRequestException extends RuntimeException {
public BadRequestException(String message) {
super(message);
}

4
src/main/java/com/hideyoshi/backendportfolio/util/guard/UserResourceGuard.java
View File

@@ -2,8 +2,8 @@ package com.hideyoshi.backendportfolio.util.guard;
import java.lang.annotation.*;
@Target( ElementType.METHOD )
@Retention( RetentionPolicy.RUNTIME )
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface UserResourceGuard {

10
src/main/java/com/hideyoshi/backendportfolio/util/guard/UserResourceGuardEnum.java
View File

@@ -61,11 +61,6 @@ public enum UserResourceGuardEnum {
this.accessType = accessType;
}
public abstract Boolean hasAccess(
UserService userService,
ObjectMapper objectMapper,
HttpServletRequest request);
public static UserResourceGuardEnum byValue(String accessType) {
for (UserResourceGuardEnum o : values()) {
if (o.getAccessType().equals(accessType)) {
@@ -106,4 +101,9 @@ public enum UserResourceGuardEnum {
return true;
}
public abstract Boolean hasAccess(
UserService userService,
ObjectMapper objectMapper,
HttpServletRequest request);
}

2
src/main/java/com/hideyoshi/backendportfolio/util/validator/email/valid/EmailValidator.java
View File

@@ -18,7 +18,7 @@ public class EmailValidator implements ConstraintValidator<ValidEmail, String> {
}
@Override
public boolean isValid(String email, ConstraintValidatorContext context){
public boolean isValid(String email, ConstraintValidatorContext context) {
return (validateEmail(email));
}

2
src/main/java/com/hideyoshi/backendportfolio/util/validator/email/valid/ValidEmail.java
View File

@@ -1,7 +1,5 @@
package com.hideyoshi.backendportfolio.util.validator.email.valid;
import com.hideyoshi.backendportfolio.util.validator.email.valid.EmailValidator;
import javax.validation.Constraint;
import javax.validation.Payload;
import java.lang.annotation.Documented;

3
src/main/java/com/hideyoshi/backendportfolio/util/validator/password/PasswordValidator.java
View File

@@ -10,9 +10,8 @@ import java.util.regex.Pattern;
@RequiredArgsConstructor
public class PasswordValidator implements ConstraintValidator<ValidPassword, String> {
Provider provider;
private final String PASSWORD_PATTERN = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,}$";
Provider provider;
@Override
public void initialize(ValidPassword constraintAnnotation) {

7
src/test/java/com/hideyoshi/backendportfolio/BackendPortfolioApplicationTests.java
View File

@@ -2,13 +2,12 @@ package com.hideyoshi.backendportfolio;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.context.SpringBootTest;
@DataJpaTest
class BackendPortfolioApplicationTests {
@Test
void contextLoads() {
}
@Test
void contextLoads() {
}
}

2
src/test/java/com/hideyoshi/backendportfolio/base/user/repo/UserRepositoryTest.java
View File

@@ -38,7 +38,7 @@ class UserRepositoryTest {
}
@Test
void canFindsUserByUsername() {
void canFindsUserByUsername() {
// Given
User userSaved = this.entityManager.persist(this.createEntity());
this.underTest.findAll();

39
src/test/java/com/hideyoshi/backendportfolio/base/user/service/UserServiceImplTest.java
View File

@@ -1,6 +1,5 @@
package com.hideyoshi.backendportfolio.base.user.service;
import com.hideyoshi.backendportfolio.base.security.service.AuthService;
import com.hideyoshi.backendportfolio.base.user.entity.Provider;
import com.hideyoshi.backendportfolio.base.user.entity.Role;
import com.hideyoshi.backendportfolio.base.user.entity.User;
@@ -10,7 +9,10 @@ import com.hideyoshi.backendportfolio.util.exception.BadRequestException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.*;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.BDDMockito;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.security.core.userdetails.UserDetails;
@@ -24,12 +26,11 @@ import java.util.Optional;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
@DataJpaTest
@ExtendWith(MockitoExtension.class)
@DirtiesContext(classMode= DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
class UserServiceImplTest {
private UserServiceImpl underTest;
@@ -70,25 +71,25 @@ class UserServiceImplTest {
@Test
void canSaveOAuthUser() {
BDDMockito.when(userRepository.findByUsername(ArgumentMatchers.any(String.class)))
.thenReturn(Optional.ofNullable(null));
BDDMockito.when(userRepository.findByUsername(ArgumentMatchers.any(String.class)))
.thenReturn(Optional.ofNullable(null));
BDDMockito.when(userRepository.save(ArgumentMatchers.any(User.class)))
.thenReturn(createOAuthUser().toEntity());
BDDMockito.when(userRepository.save(ArgumentMatchers.any(User.class)))
.thenReturn(createOAuthUser().toEntity());
// Given
UserDTO user = this.createOAuthUser();
// Given
UserDTO user = this.createOAuthUser();
// When
UserDTO userSaved = this.underTest.saveUser(user);
// When
UserDTO userSaved = this.underTest.saveUser(user);
//Then
ArgumentCaptor<User> userArgumentCaptor = ArgumentCaptor.forClass(User.class);
//Then
ArgumentCaptor<User> userArgumentCaptor = ArgumentCaptor.forClass(User.class);
verify(userRepository).save(userArgumentCaptor.capture());
assertThat(userArgumentCaptor.getValue()).isEqualTo(user.toEntity());
assertThat(userArgumentCaptor.getValue().getPassword()).isEmpty();
assertThat(userSaved).isInstanceOf(UserDTO.class);
verify(userRepository).save(userArgumentCaptor.capture());
assertThat(userArgumentCaptor.getValue()).isEqualTo(user.toEntity());
assertThat(userArgumentCaptor.getValue().getPassword()).isEmpty();
assertThat(userSaved).isInstanceOf(UserDTO.class);
}
@Test
@@ -181,7 +182,7 @@ class UserServiceImplTest {
// Given
UserDTO userSaved = this.underTest.getUser(user.getUsername());
if (!Objects.nonNull(userSaved)) {
userSaved = this.underTest.saveUser(user);
userSaved = this.underTest.saveUser(user);
}
// When
this.underTest.addRoleToUser(userSaved.getId(), Role.USER.getDescription());

2
src/test/java/com/hideyoshi/backendportfolio/microservice/storageService/service/StorageServiceTest.java
View File

@@ -17,7 +17,7 @@ import java.io.IOException;
import static org.assertj.core.api.Assertions.assertThat;
@ExtendWith(MockitoExtension.class)
@DirtiesContext(classMode= DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class StorageServiceTest {
private StorageService storageService;