Project update

- use PasswordEncoderFactories.createDelegatingPasswordEncoder() instead of new BCryptPasswordEncoder(); - rename WebSecurityConfig to SecurityConfig; - remove public keyword from Beans; - replace ZonedDateTime with Instant; - update README.

Author: Ivan Franchin

README.md

@@ -60,7 +60,7 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 
 ## Start Environment
 
-- In a terminal, make sure you are inside `springboot-react-jwt-token` root folder;
+- In a terminal, make sure you are inside the `springboot-react-jwt-token` root folder;
 
 - Run the following command to start docker compose containers:
  ```
@@ -71,7 +71,7 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 
 - **order-api**
 
- - Open a terminal and navigate to `springboot-react-jwt-token/order-api` folder;
+ - Open a terminal and navigate to the `springboot-react-jwt-token/order-api` folder;
 
  - Run the following `Maven` command to start the application:
  ```
@@ -80,7 +80,7 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 
 - **order-ui**
 
- - Open another terminal and navigate to `springboot-react-jwt-token/order-ui` folder;
+ - Open another terminal and navigate to the `springboot-react-jwt-token/order-ui` folder;
 
  - Run the command below if you are running the application for the first time:
  ```
@@ -215,7 +215,7 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 
 - **Automatic Endpoints Test**
 
- - Open a terminal and make sure you are in `springboot-react-jwt-token` root folder;
+ - Open a terminal and make sure you are in the `springboot-react-jwt-token` root folder;
 
  - Run the following script:
  ```
@@ -274,14 +274,14 @@ On [ivangfr.github.io](https://ivangfr.github.io), I have compiled my Proof-of-C
 
 - To stop `order-api` and `order-ui`, go to the terminals where they are running and press `Ctrl+C`;
 
-- To stop and remove docker compose containers, network and volumes, go to a terminal and, inside: `springboot-react-jwt-token` root folder, run the command below
+- To stop and remove docker compose containers, network and volumes, go to a terminal and, inside the `springboot-react-jwt-token` root folder, run the command below:
  ```
  docker compose down -v
  ```
 
 ## How to upgrade order-ui dependencies to latest version
 
-- In a terminal, make sure you are in `springboot-react-jwt-token/order-ui` folder;
+- In a terminal, make sure you are in the `springboot-react-jwt-token/order-ui` folder;
 
 - Run the following commands:
  ```

order-api/src/main/java/com/ivanfranchin/orderapi/config/ErrorAttributesConfig.java

@@ -14,7 +14,7 @@
 public class ErrorAttributesConfig {
 
  @Bean
- public ErrorAttributes errorAttributes() {
+ ErrorAttributes errorAttributes() {
  return new DefaultErrorAttributes() {
  @Override
  public Map<String, Object> getErrorAttributes(WebRequest webRequest, ErrorAttributeOptions options) {

order-api/src/main/java/com/ivanfranchin/orderapi/config/SwaggerConfig.java

@@ -15,7 +15,7 @@ public class SwaggerConfig {
  private String applicationName;
 
  @Bean
- public OpenAPI customOpenAPI() {
+ OpenAPI customOpenAPI() {
  return new OpenAPI()
  .components(
  new Components().addSecuritySchemes(BEARER_KEY_SECURITY_SCHEME,

order-api/src/main/java/com/ivanfranchin/orderapi/model/Order.java

@@ -10,7 +10,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 
 @Data
 @NoArgsConstructor
@@ -27,14 +27,14 @@ public class Order {
  @JoinColumn(name = "user_id")
  private User user;
 
- private ZonedDateTime createdAt;
+ private Instant createdAt;
 
  public Order(String description) {
  this.description = description;
  }
 
  @PrePersist
  public void onPrePersist() {
- createdAt = ZonedDateTime.now();
+ createdAt = Instant.now();
  }
 }

order-api/src/main/java/com/ivanfranchin/orderapi/rest/AuthController.java

@@ -6,7 +6,7 @@
 import com.ivanfranchin.orderapi.rest.dto.LoginRequest;
 import com.ivanfranchin.orderapi.rest.dto.SignUpRequest;
 import com.ivanfranchin.orderapi.security.TokenProvider;
-import com.ivanfranchin.orderapi.security.WebSecurityConfig;
+import com.ivanfranchin.orderapi.security.SecurityConfig;
 import com.ivanfranchin.orderapi.service.UserService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -64,7 +64,7 @@ private User mapSignUpRequestToUser(SignUpRequest signUpRequest) {
  user.setPassword(passwordEncoder.encode(signUpRequest.getPassword()));
  user.setName(signUpRequest.getName());
  user.setEmail(signUpRequest.getEmail());
- user.setRole(WebSecurityConfig.USER);
+ user.setRole(SecurityConfig.USER);
  return user;
  }
 }

order-api/src/main/java/com/ivanfranchin/orderapi/rest/dto/OrderDto.java

@@ -1,8 +1,8 @@
 package com.ivanfranchin.orderapi.rest.dto;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 
-public record OrderDto(String id, String description, OrderDto.UserDto user, ZonedDateTime createdAt) {
+public record OrderDto(String id, String description, OrderDto.UserDto user, Instant createdAt) {
 
  public record UserDto(String username) {
  }

order-api/src/main/java/com/ivanfranchin/orderapi/rest/dto/UserDto.java

@@ -1,10 +1,10 @@
 package com.ivanfranchin.orderapi.rest.dto;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.List;
 
 public record UserDto(Long id, String username, String name, String email, String role, List<OrderDto> orders) {
 
- public record OrderDto(String id, String description, ZonedDateTime createdAt) {
+ public record OrderDto(String id, String description, Instant createdAt) {
  }
 }

order-api/src/main/java/com/ivanfranchin/orderapi/runner/DatabaseInitializer.java

@@ -1,7 +1,7 @@
 package com.ivanfranchin.orderapi.runner;
 
 import com.ivanfranchin.orderapi.model.User;
-import com.ivanfranchin.orderapi.security.WebSecurityConfig;
+import com.ivanfranchin.orderapi.security.SecurityConfig;
 import com.ivanfranchin.orderapi.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +33,7 @@ public void run(String... args) {
  }
 
  private static final List<User> USERS = Arrays.asList(
- new User("admin", "admin", "Admin", "admin@mycompany.com", WebSecurityConfig.ADMIN),
- new User("user", "user", "User", "user@mycompany.com", WebSecurityConfig.USER)
+ new User("admin", "admin", "Admin", "admin@mycompany.com", SecurityConfig.ADMIN),
+ new User("user", "user", "User", "user@mycompany.com", SecurityConfig.USER)
  );
 }

order-api/src/main/java/com/ivanfranchin/orderapi/security/CorsConfig.java

@@ -13,7 +13,7 @@
 public class CorsConfig {
 
  @Bean
- public CorsConfigurationSource corsConfigurationSource(@Value("${app.cors.allowed-origins}") List<String> allowedOrigins) {
+ CorsConfigurationSource corsConfigurationSource(@Value("${app.cors.allowed-origins}") List<String> allowedOrigins) {
  CorsConfiguration configuration = new CorsConfiguration();
  configuration.setAllowCredentials(true);
  configuration.setAllowedOrigins(allowedOrigins);

order-api/src/main/java/com/ivanfranchin/orderapi/security/CustomUserDetails.java

@@ -15,24 +15,4 @@ public class CustomUserDetails implements UserDetails {
  private String name;
  private String email;
  private Collection<? extends GrantedAuthority> authorities;
-
- @Override
- public boolean isAccountNonExpired() {
- return true;
- }
-
- @Override
- public boolean isAccountNonLocked() {
- return true;
- }
-
- @Override
- public boolean isCredentialsNonExpired() {
- return true;
- }
-
- @Override
- public boolean isEnabled() {
- return true;
- }
 }