Merge pull request #98 from Tech-Harbor/Bezsmertnyi

Bezsmertnyi | JWT, Update Password, Architecture, Link

src/main/java/com/example/backend/config/cloudinary/CloudinaryConfig.java

@@ -1,7 +1,7 @@
 package com.example.backend.config.cloudinary;
 
 import com.cloudinary.Cloudinary;
-import com.example.backend.web.utils.props.CloudinaryProperties;
+import com.example.backend.utils.props.CloudinaryProperties;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/example/backend/config/graphql/GraphqlConfig.java

@@ -5,8 +5,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 
-import static com.example.backend.web.utils.Constants.LOCAL_TIME_DATE;
-import static com.example.backend.web.utils.Constants.LOCAL_TIME_DATE_SCALAR;
+import static com.example.backend.utils.Constants.LOCAL_TIME_DATE;
+import static com.example.backend.utils.Constants.LOCAL_TIME_DATE_SCALAR;
 
 @Configuration
 public class GraphqlConfig {

src/main/java/com/example/backend/config/graphql/LocalDateTimeScalarConfig.java

@@ -15,7 +15,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static com.example.backend.web.utils.Constants.DATE_FORMAT;
+import static com.example.backend.utils.Constants.DATE_FORMAT;
 
 
 public class LocalDateTimeScalarConfig implements Coercing<LocalDateTime, String> {

src/main/java/com/example/backend/mail/MailConfig.java

@@ -1,6 +1,6 @@
 package com.example.backend.mail;
 
-import com.example.backend.web.utils.props.MailProperties;
+import com.example.backend.utils.props.MailProperties;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/example/backend/mail/MailServiceImpl.java

@@ -15,7 +15,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static com.example.backend.web.utils.Constants.UTF_8;
+import static com.example.backend.utils.Constants.UTF_8;
 
 @Service
 @AllArgsConstructor
@@ -86,7 +86,7 @@ private String getNewPasswordContent(final UserEntity user) {
         Map<String, Object> model = new HashMap<>();
 
         model.put("username", user.getLastname());
-        model.put("jwt", jwtService.generateNewPasswordTokenAndActiveUser(user.getEmail()));
+        model.put("jwt", jwtService.generateNewPasswordTokenAndActiveUser(user.getPassword()));
 
         configuration.getTemplate("newPassword.ftlh").process(model, writer);
 

src/main/java/com/example/backend/security/ApplicationConfig.java

@@ -1,7 +1,7 @@
 package com.example.backend.security;
 
 import com.example.backend.security.service.details.MyUserDetailsService;
-import com.example.backend.security.utils.MyPasswordEncoder;
+import com.example.backend.utils.MyPasswordEncoder;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.context.annotation.Bean;

src/main/java/com/example/backend/security/SecurityConfig.java

@@ -4,7 +4,7 @@
 import com.example.backend.security.exception.AuthenticationEntryPointJwt;
 import com.example.backend.security.jwt.JwtAuthFilter;
 import com.example.backend.security.oauth.AuthGoogle;
-import com.example.backend.security.utils.CorsConfig;
+import com.example.backend.utils.CorsConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.context.annotation.Bean;

src/main/java/com/example/backend/security/controllers/AuthController.java

@@ -24,16 +24,18 @@
 
 @RestController
 @AllArgsConstructor
+@RequestMapping("/api")
 @Tag(name = "Authentication", description = "Authentication User and Update Password, personal office users")
 public class AuthController {
 
     private final AuthService authService;
 
-    private static final String SIGNUP_URI = "/api/auth/signup";
-    private static final String LOGIN_URI = "/api/auth/login";
-    private static final String FORM_CHANGE_PASSWORD_URI = "/api/auth/change-password";
-    private static final String REQUEST_EMAIL_UPDATE_PASSWORD = "/api/auth/request/email";
-    private static final String INFO = "/api/auth/accouth";
+    private static final String SIGNUP_URI = "/auth/signup";
+    private static final String LOGIN_URI = "/auth/login";
+    private static final String FORM_CHANGE_PASSWORD_URI = "/change-password";
+    private static final String REQUEST_EMAIL_UPDATE_PASSWORD = "/request/email";
+    private static final String ACTIVE_USER = "/active";
+    private static final String INFO = "/accouth";
 
     @PostMapping(SIGNUP_URI)
     @SecurityRequirement(name = "Bearer Authentication")
@@ -102,7 +104,7 @@ public void requestEmailUpdatePassword(@RequestBody @Validated final EmailReques
         authService.requestEmailUpdatePassword(emailRequest);
     }
 
-    @PostMapping()
+    @PostMapping(ACTIVE_USER)
     @Operation(summary = "Active User, JWT Token")
     @ApiResponses(value = {
             @ApiResponse(

src/main/java/com/example/backend/security/jwt/JwtAuthFilter.java

@@ -14,7 +14,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import static com.example.backend.web.utils.Constants.BEARER;
+import static com.example.backend.utils.Constants.BEARER;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 
 @Component

src/main/java/com/example/backend/security/oauth/AuthGoogle.java

@@ -1,11 +1,11 @@
 package com.example.backend.security.oauth;
 
 import com.example.backend.security.service.JwtService;
-import com.example.backend.security.utils.MyPasswordEncoder;
+import com.example.backend.utils.MyPasswordEncoder;
 import com.example.backend.web.User.UserEntity;
 import com.example.backend.web.User.UserService;
-import com.example.backend.web.User.utils.RegisterAuthStatus;
-import com.example.backend.web.User.utils.Role;
+import com.example.backend.utils.enums.RegisterAuthStatus;
+import com.example.backend.utils.enums.Role;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.example.backend.web.utils.Constants.DEPLOY_STORE;
+import static com.example.backend.utils.Constants.DEPLOY_STORE;
 
 @Component
 @RequiredArgsConstructor

src/main/java/com/example/backend/security/service/impl/AuthServiceImpl.java

@@ -9,11 +9,11 @@
 import com.example.backend.security.models.response.AuthResponse;
 import com.example.backend.security.service.AuthService;
 import com.example.backend.security.service.JwtService;
-import com.example.backend.security.utils.MyPasswordEncoder;
+import com.example.backend.utils.MyPasswordEncoder;
 import com.example.backend.web.User.UserEntity;
 import com.example.backend.web.User.UserService;
-import com.example.backend.web.User.utils.RegisterAuthStatus;
-import com.example.backend.web.User.utils.Role;
+import com.example.backend.utils.enums.RegisterAuthStatus;
+import com.example.backend.utils.enums.Role;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

src/main/java/com/example/backend/security/service/impl/JwtServiceImpl.java

@@ -1,11 +1,10 @@
 package com.example.backend.security.service.impl;
 
-import com.example.backend.web.utils.props.JwtProperties;
 import com.example.backend.security.service.JwtService;
 import com.example.backend.security.service.details.MyUserDetails;
+import com.example.backend.utils.props.JwtProperties;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 import lombok.RequiredArgsConstructor;
@@ -50,13 +49,14 @@ public String generateNewPasswordTokenAndActiveUser(final String email) {
         return generateJwtNewPasswordTokenAndActiveUser(email);
     }
 
-    private String generateJwtNewPasswordTokenAndActiveUser(final String email) {
+    private String generateJwtNewPasswordTokenAndActiveUser(final String userData) {
         return Jwts
                 .builder()
-                .subject(email)
+                .subject(userData)
                 .issuedAt(new Date(System.currentTimeMillis()))
-                .expiration(new Date(System.currentTimeMillis() + jwtProperties.getJwtNewPasswordExpiration()))
-                .signWith(getSignInKey(), SignatureAlgorithm.HS256)
+                .expiration(new Date(System.currentTimeMillis() +
+                        jwtProperties.getJwtNewPasswordExpirationAndActiveUser()))
+                .signWith(getSignInKey())
                 .compact();
     }
 
@@ -67,7 +67,7 @@ private String generateJwtAccessToken(final Map<String, Object> extraClaims, fin
                 .subject(authentication.getName())
                 .issuedAt(new Date(System.currentTimeMillis()))
                 .expiration(new Date(System.currentTimeMillis() + jwtProperties.getJwtAccessExpiration()))
-                .signWith(getSignInKey(), SignatureAlgorithm.HS256)
+                .signWith(getSignInKey())
                 .compact();
     }
 
@@ -77,7 +77,7 @@ private String generateJwtRefreshToken(final Map<String, Object> extraClaims, fi
                 .claims(extraClaims)
                 .subject(authentication.getName())
                 .expiration(new Date(System.currentTimeMillis() + jwtProperties.getJwtRefreshExpiration()))
-                .signWith(getSignInKey(), SignatureAlgorithm.HS256)
+                .signWith(getSignInKey())
                 .compact();
     }
 

src/main/java/com/example/backend/web/utils/Constants.java → src/main/java/com/example/backend/utils/Constants.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.utils;
+package com.example.backend.utils;
 
 import lombok.experimental.UtilityClass;
 

src/main/java/com/example/backend/security/utils/CorsConfig.java → src/main/java/com/example/backend/utils/CorsConfig.java

@@ -1,4 +1,4 @@
-package com.example.backend.security.utils;
+package com.example.backend.utils;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
@@ -8,7 +8,7 @@
 
 import java.util.Arrays;
 
-import static com.example.backend.web.utils.Constants.*;
+import static com.example.backend.utils.Constants.*;
 
 @Component
 public class CorsConfig {

src/main/java/com/example/backend/security/utils/MyPasswordEncoder.java → src/main/java/com/example/backend/utils/MyPasswordEncoder.java

@@ -1,4 +1,4 @@
-package com.example.backend.security.utils;
+package com.example.backend.utils;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

src/main/java/com/example/backend/web/utils/ValidationExceptionHandler.java → src/main/java/com/example/backend/utils/ValidationExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.utils;
+package com.example.backend.utils;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

src/main/java/com/example/backend/web/utils/WebIsNullFactory.java → src/main/java/com/example/backend/utils/WebIsNullFactory.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.utils;
+package com.example.backend.utils;
 
 
 import com.example.backend.web.Category.CategoryEntity;

src/main/java/com/example/backend/web/User/utils/RegisterAuthStatus.java → src/main/java/com/example/backend/utils/enums/RegisterAuthStatus.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.User.utils;
+package com.example.backend.utils.enums;
 
 public enum RegisterAuthStatus {
     GOOGLE, JWT

src/main/java/com/example/backend/utils/enums/Role.java

@@ -0,0 +1,5 @@
+package com.example.backend.utils.enums;
+
+public enum Role {
+    ADMIN, USER
+}

src/main/java/com/example/backend/utils/enums/Status.java

@@ -0,0 +1,5 @@
+package com.example.backend.utils.enums;
+
+public enum Status {
+    PENDING
+}

src/main/java/com/example/backend/web/utils/props/CloudinaryProperties.java → src/main/java/com/example/backend/utils/props/CloudinaryProperties.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.utils.props;
+package com.example.backend.utils.props;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/example/backend/web/utils/props/JwtProperties.java → src/main/java/com/example/backend/utils/props/JwtProperties.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.utils.props;
+package com.example.backend.utils.props;
 
 
 import lombok.Data;
@@ -12,5 +12,5 @@ public class JwtProperties {
     private String key;
     private long jwtAccessExpiration;
     private long jwtRefreshExpiration;
-    private long jwtNewPasswordExpiration;
+    private long jwtNewPasswordExpirationAndActiveUser;
 }

src/main/java/com/example/backend/web/utils/props/MailProperties.java → src/main/java/com/example/backend/utils/props/MailProperties.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.utils.props;
+package com.example.backend.utils.props;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/example/backend/web/Category/CategoryFactory.java

@@ -1,6 +1,6 @@
 package com.example.backend.web.Category;
 
-import com.example.backend.web.utils.WebIsNullFactory;
+import com.example.backend.utils.WebIsNullFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 

src/main/java/com/example/backend/web/File/ImageServiceImpl.java

@@ -1,6 +1,6 @@
 package com.example.backend.web.File;
 
-import com.example.backend.web.File.utils.FileUpload;
+import com.example.backend.web.File.upload.FileUpload;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;

src/main/java/com/example/backend/web/File/utils/FileUpload.java → src/main/java/com/example/backend/web/File/upload/FileUpload.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.File.utils;
+package com.example.backend.web.File.upload;
 
 import org.springframework.web.multipart.MultipartFile;
 

src/main/java/com/example/backend/web/File/utils/FileUploadImpl.java → src/main/java/com/example/backend/web/File/upload/FileUploadImpl.java

@@ -1,4 +1,4 @@
-package com.example.backend.web.File.utils;
+package com.example.backend.web.File.upload;
 
 import com.cloudinary.Cloudinary;
 import com.cloudinary.utils.ObjectUtils;

src/main/java/com/example/backend/web/Order/OrderDTO.java

@@ -2,6 +2,7 @@
 
 import com.example.backend.web.Product.ProductEntity;
 import com.example.backend.web.User.UserEntity;
+import com.example.backend.utils.enums.Status;
 import lombok.Builder;
 
 @Builder

src/main/java/com/example/backend/web/Order/OrderEntity.java

@@ -2,6 +2,7 @@
 
 import com.example.backend.web.Product.ProductEntity;
 import com.example.backend.web.User.UserEntity;
+import com.example.backend.utils.enums.Status;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/example/backend/web/User/UserDTO.java

@@ -1,8 +1,8 @@
 package com.example.backend.web.User;
 
 import com.example.backend.web.Product.ProductDTO;
-import com.example.backend.web.User.utils.RegisterAuthStatus;
-import com.example.backend.web.User.utils.Role;
+import com.example.backend.utils.enums.RegisterAuthStatus;
+import com.example.backend.utils.enums.Role;
 import lombok.Builder;
 
 import java.util.List;

src/main/java/com/example/backend/web/User/UserEntity.java

@@ -3,8 +3,8 @@
 import com.example.backend.web.Comment.CommentEntity;
 import com.example.backend.web.Order.OrderEntity;
 import com.example.backend.web.Product.ProductEntity;
-import com.example.backend.web.User.utils.RegisterAuthStatus;
-import com.example.backend.web.User.utils.Role;
+import com.example.backend.utils.enums.RegisterAuthStatus;
+import com.example.backend.utils.enums.Role;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/example/backend/web/User/UserFactory.java

@@ -1,6 +1,6 @@
 package com.example.backend.web.User;
 
-import com.example.backend.web.utils.WebIsNullFactory;
+import com.example.backend.utils.WebIsNullFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 

src/main/java/com/example/backend/web/exception/ExceptionController.java

@@ -14,7 +14,7 @@
 
 import java.time.LocalDateTime;
 
-import static com.example.backend.web.utils.Constants.PATH;
+import static com.example.backend.utils.Constants.PATH;
 
 @ControllerAdvice
 public class ExceptionController extends ResponseEntityExceptionHandler {

src/main/resources/application.yaml

@@ -61,4 +61,4 @@ jwt:
   key: ${JWT_KEY}
   jwtAccessExpiration: 604800000
   jwtRefreshExpiration: 2592000000
-  jwtNewPasswordExpiration: 900000
+  jwtNewPasswordExpirationAndActiveUser: 120000

src/main/resources/templates/newPassword.ftlh

@@ -30,7 +30,7 @@
             <div id="div">
                 <h1 style="text-align: center">Reset Password</h1>
                 <p>Для зміни пароля перейдіть за посиланням, ${username}!</p>
-                <a href="https://oranger.store/api/auth/change-password?jwt=${jwt}">Update Password</a>
+                <a href="https://oranger.store/auth/change-password?jwt=${jwt}">Update Password</a>
             </div>
         </div>
     </body>