diff --git a/src/main/java/com/devsuperior/bds03/config/AppConfig.java b/src/main/java/com/devsuperior/bds03/config/AppConfig.java index 94fbc6a7..0a23a8b6 100644 --- a/src/main/java/com/devsuperior/bds03/config/AppConfig.java +++ b/src/main/java/com/devsuperior/bds03/config/AppConfig.java @@ -10,8 +10,9 @@ @Configuration public class AppConfig { - @Value("${jwt.secret}") +@Value("${jwt.secret}") private String jwtSecret; + @Bean public BCryptPasswordEncoder passwordEncoder() { diff --git a/src/main/java/com/devsuperior/bds03/config/AuthorizationServerConfig.java b/src/main/java/com/devsuperior/bds03/config/AuthorizationServerConfig.java index 719aa7ad..e35a1b57 100644 --- a/src/main/java/com/devsuperior/bds03/config/AuthorizationServerConfig.java +++ b/src/main/java/com/devsuperior/bds03/config/AuthorizationServerConfig.java @@ -19,7 +19,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap @Value("${security.oauth2.client.client-id}") private String clientId; - + @Value("${security.oauth2.client.client-secret}") private String clientSecret; @@ -45,7 +45,8 @@ public void configure(AuthorizationServerSecurityConfigurer security) throws Exc @Override public void configure(ClientDetailsServiceConfigurer clients) throws Exception { - clients.inMemory() + + clients.inMemory() .withClient(clientId) .secret(passwordEncoder.encode(clientSecret)) .scopes("read", "write") @@ -55,9 +56,9 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception { @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { - endpoints.authenticationManager(authenticationManager) .tokenStore(tokenStore) .accessTokenConverter(accessTokenConverter); } + } diff --git a/src/main/java/com/devsuperior/bds03/config/ResourceServerConfig.java b/src/main/java/com/devsuperior/bds03/config/ResourceServerConfig.java index 920d1e2e..c822327a 100644 --- a/src/main/java/com/devsuperior/bds03/config/ResourceServerConfig.java +++ b/src/main/java/com/devsuperior/bds03/config/ResourceServerConfig.java @@ -34,7 +34,7 @@ public void configure(ResourceServerSecurityConfigurer resources) throws Excepti @Override public void configure(HttpSecurity http) throws Exception { - // H2 + // H2 if (Arrays.asList(env.getActiveProfiles()).contains("test")) { http.headers().frameOptions().disable(); } @@ -44,4 +44,5 @@ public void configure(HttpSecurity http) throws Exception { .antMatchers(HttpMethod.GET, OPERATOR_GET).hasAnyRole("OPERATOR", "ADMIN") .anyRequest().hasAnyRole("ADMIN"); } + } diff --git a/src/main/java/com/devsuperior/bds03/config/WebSecurityConfig.java b/src/main/java/com/devsuperior/bds03/config/WebSecurityConfig.java index 1dbc233d..54b398ac 100644 --- a/src/main/java/com/devsuperior/bds03/config/WebSecurityConfig.java +++ b/src/main/java/com/devsuperior/bds03/config/WebSecurityConfig.java @@ -24,6 +24,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder); + } @Override @@ -36,4 +37,5 @@ public void configure(WebSecurity web) throws Exception { protected AuthenticationManager authenticationManager() throws Exception { return super.authenticationManager(); } + } diff --git a/src/main/java/com/devsuperior/bds03/controllers/exceptions/FieldMessage.java b/src/main/java/com/devsuperior/bds03/controllers/exceptions/FieldMessage.java index 24ac5248..8fe1dba7 100644 --- a/src/main/java/com/devsuperior/bds03/controllers/exceptions/FieldMessage.java +++ b/src/main/java/com/devsuperior/bds03/controllers/exceptions/FieldMessage.java @@ -3,6 +3,7 @@ import java.io.Serializable; public class FieldMessage implements Serializable { + private static final long serialVersionUID = 1L; private String fieldName; diff --git a/src/main/java/com/devsuperior/bds03/controllers/exceptions/ResourceExceptionHandler.java b/src/main/java/com/devsuperior/bds03/controllers/exceptions/ResourceExceptionHandler.java index e8dc4cb5..8511d48e 100644 --- a/src/main/java/com/devsuperior/bds03/controllers/exceptions/ResourceExceptionHandler.java +++ b/src/main/java/com/devsuperior/bds03/controllers/exceptions/ResourceExceptionHandler.java @@ -13,7 +13,6 @@ @ControllerAdvice public class ResourceExceptionHandler { - @ExceptionHandler(MethodArgumentNotValidException.class) public ResponseEntity validation(MethodArgumentNotValidException e, HttpServletRequest request) { HttpStatus status = HttpStatus.UNPROCESSABLE_ENTITY; @@ -30,4 +29,5 @@ public ResponseEntity validation(MethodArgumentNotValidExceptio return ResponseEntity.status(status).body(err); } + } diff --git a/src/main/java/com/devsuperior/bds03/controllers/exceptions/StandardError.java b/src/main/java/com/devsuperior/bds03/controllers/exceptions/StandardError.java index 5c55f2df..7895bfe7 100644 --- a/src/main/java/com/devsuperior/bds03/controllers/exceptions/StandardError.java +++ b/src/main/java/com/devsuperior/bds03/controllers/exceptions/StandardError.java @@ -14,11 +14,9 @@ public class StandardError implements Serializable { public StandardError() { } - public Instant getTimestamp() { return timestamp; } - public void setTimestamp(Instant timestamp) { this.timestamp = timestamp; } diff --git a/src/main/java/com/devsuperior/bds03/dto/EmployeeDTO.java b/src/main/java/com/devsuperior/bds03/dto/EmployeeDTO.java index 1e844190..c5823a70 100644 --- a/src/main/java/com/devsuperior/bds03/dto/EmployeeDTO.java +++ b/src/main/java/com/devsuperior/bds03/dto/EmployeeDTO.java @@ -20,6 +20,7 @@ public class EmployeeDTO implements Serializable { private String email; @NotNull(message = "Campo requerido") + private Long departmentId; public EmployeeDTO() { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a219debf..f6779e36 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -7,3 +7,4 @@ security.oauth2.client.client-secret=${CLIENT_SECRET:myclientsecret} jwt.secret=${JWT_SECRET:MY-JWT-SECRET} jwt.duration=${JWT_DURATION:86400} + diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index dcf151a0..ffdbe6b7 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,6 +1,7 @@ INSERT INTO tb_user (email, password) VALUES ('ana@gmail.com', '$2a$10$eACCYoNOHEqXve8aIWT8Nu3PkMXWBaOxJ9aORUYzfMQCbVBIhZ8tG'); INSERT INTO tb_user (email, password) VALUES ('bob@gmail.com', '$2a$10$eACCYoNOHEqXve8aIWT8Nu3PkMXWBaOxJ9aORUYzfMQCbVBIhZ8tG'); + INSERT INTO tb_role (authority) VALUES ('ROLE_OPERATOR'); INSERT INTO tb_role (authority) VALUES ('ROLE_ADMIN');