diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/WebSecurityConfig.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/WebSecurityConfig.java similarity index 89% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/WebSecurityConfig.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/WebSecurityConfig.java index 2d8205f..b5d1c29 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/WebSecurityConfig.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/WebSecurityConfig.java @@ -1,8 +1,8 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth; +package com.hakimfauzi23.boilerplatespringsecurity; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.AuthEntryPointJwt; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.AuthTokenFilter; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service.UserDetailsServiceImpl; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.AuthEntryPointJwt; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.AuthTokenFilter; +import com.hakimfauzi23.boilerplatespringsecurity.service.UserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/controllers/AuthController.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/controllers/AuthController.java similarity index 75% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/controllers/AuthController.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/controllers/AuthController.java index db247de..93c1d07 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/controllers/AuthController.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/controllers/AuthController.java @@ -1,21 +1,21 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.controllers; +package com.hakimfauzi23.boilerplatespringsecurity.controllers; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.ERole; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.RefreshToken; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.Role; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.User; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.request.LoginRequest; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.request.SignupRequest; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.request.TokenRefreshRequest; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.response.JwtResponse; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.response.MessageResponse; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.response.TokenRefreshResponse; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.JwtUtils; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.exception.TokenRefreshException; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository.RoleRepository; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository.UserRepository; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service.RefreshTokenService; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service.UserDetailsImpl; +import com.hakimfauzi23.boilerplatespringsecurity.data.ERole; +import com.hakimfauzi23.boilerplatespringsecurity.data.RefreshToken; +import com.hakimfauzi23.boilerplatespringsecurity.data.Role; +import com.hakimfauzi23.boilerplatespringsecurity.data.User; +import com.hakimfauzi23.boilerplatespringsecurity.data.payload.request.LoginRequest; +import com.hakimfauzi23.boilerplatespringsecurity.data.payload.request.SignupRequest; +import com.hakimfauzi23.boilerplatespringsecurity.data.payload.request.TokenRefreshRequest; +import com.hakimfauzi23.boilerplatespringsecurity.data.payload.response.JwtResponse; +import com.hakimfauzi23.boilerplatespringsecurity.data.payload.response.MessageResponse; +import com.hakimfauzi23.boilerplatespringsecurity.data.payload.response.TokenRefreshResponse; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.JwtUtils; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.exception.TokenRefreshException; +import com.hakimfauzi23.boilerplatespringsecurity.repository.RoleRepository; +import com.hakimfauzi23.boilerplatespringsecurity.repository.UserRepository; +import com.hakimfauzi23.boilerplatespringsecurity.service.RefreshTokenService; +import com.hakimfauzi23.boilerplatespringsecurity.service.UserDetailsImpl; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/controllers/TestController.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/controllers/TestController.java similarity index 91% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/controllers/TestController.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/controllers/TestController.java index 6b9b44e..0ad0917 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/controllers/TestController.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/controllers/TestController.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.controllers; +package com.hakimfauzi23.boilerplatespringsecurity.controllers; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.CrossOrigin; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/ERole.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/ERole.java new file mode 100644 index 0000000..91ae8ff --- /dev/null +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/ERole.java @@ -0,0 +1,6 @@ +package com.hakimfauzi23.boilerplatespringsecurity.data; + +public enum ERole { + ROLE_USER, + ROLE_ADMIN +} diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/RefreshToken.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/RefreshToken.java similarity index 94% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/RefreshToken.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/RefreshToken.java index ac2302a..9a21637 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/RefreshToken.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/RefreshToken.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data; +package com.hakimfauzi23.boilerplatespringsecurity.data; import jakarta.persistence.*; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/Role.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/Role.java similarity index 89% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/Role.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/Role.java index 4c7ff3c..60030cb 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/Role.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/Role.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data; +package com.hakimfauzi23.boilerplatespringsecurity.data; import jakarta.persistence.*; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/User.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/User.java similarity index 96% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/User.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/User.java index e0076c3..8dc05ff 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/User.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/User.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data; +package com.hakimfauzi23.boilerplatespringsecurity.data; import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/LoginRequest.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/LoginRequest.java similarity index 84% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/LoginRequest.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/LoginRequest.java index e7830c9..1f87562 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/LoginRequest.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/LoginRequest.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.request; +package com.hakimfauzi23.boilerplatespringsecurity.data.payload.request; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/SignupRequest.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/SignupRequest.java similarity index 92% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/SignupRequest.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/SignupRequest.java index 4c0cc59..951dc32 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/SignupRequest.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/SignupRequest.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.request; +package com.hakimfauzi23.boilerplatespringsecurity.data.payload.request; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/TokenRefreshRequest.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/TokenRefreshRequest.java similarity index 78% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/TokenRefreshRequest.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/TokenRefreshRequest.java index f40d824..dad4d36 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/request/TokenRefreshRequest.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/request/TokenRefreshRequest.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.request; +package com.hakimfauzi23.boilerplatespringsecurity.data.payload.request; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/JwtResponse.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/JwtResponse.java similarity index 94% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/JwtResponse.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/JwtResponse.java index d3a36d6..a99b6bb 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/JwtResponse.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/JwtResponse.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.response; +package com.hakimfauzi23.boilerplatespringsecurity.data.payload.response; import java.util.List; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/MessageResponse.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/MessageResponse.java similarity index 77% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/MessageResponse.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/MessageResponse.java index 4b19eee..27458ba 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/MessageResponse.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/MessageResponse.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.response; +package com.hakimfauzi23.boilerplatespringsecurity.data.payload.response; public class MessageResponse { private String message; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/TokenRefreshResponse.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/TokenRefreshResponse.java similarity index 90% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/TokenRefreshResponse.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/TokenRefreshResponse.java index d07da43..fe8e3fb 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/payload/response/TokenRefreshResponse.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/data/payload/response/TokenRefreshResponse.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.payload.response; +package com.hakimfauzi23.boilerplatespringsecurity.data.payload.response; public class TokenRefreshResponse { diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/AuthEntryPointJwt.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/AuthEntryPointJwt.java similarity index 95% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/AuthEntryPointJwt.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/AuthEntryPointJwt.java index bbca619..75bf137 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/AuthEntryPointJwt.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/AuthEntryPointJwt.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt; +package com.hakimfauzi23.boilerplatespringsecurity.jwt; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletException; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/AuthTokenFilter.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/AuthTokenFilter.java similarity index 93% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/AuthTokenFilter.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/AuthTokenFilter.java index f75246e..27d363f 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/AuthTokenFilter.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/AuthTokenFilter.java @@ -1,6 +1,6 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt; +package com.hakimfauzi23.boilerplatespringsecurity.jwt; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service.UserDetailsServiceImpl; +import com.hakimfauzi23.boilerplatespringsecurity.service.UserDetailsServiceImpl; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/JwtUtils.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/JwtUtils.java similarity index 84% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/JwtUtils.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/JwtUtils.java index ace13d6..a2950ff 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/JwtUtils.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/JwtUtils.java @@ -1,19 +1,14 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt; +package com.hakimfauzi23.boilerplatespringsecurity.jwt; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.User; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service.UserDetailsImpl; +import com.hakimfauzi23.boilerplatespringsecurity.service.UserDetailsImpl; import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseCookie; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import org.springframework.web.util.WebUtils; import java.security.Key; import java.util.Date; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/advice/TokenControllerAdvice.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/advice/TokenControllerAdvice.java similarity index 74% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/advice/TokenControllerAdvice.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/advice/TokenControllerAdvice.java index dddf453..6cad602 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/advice/TokenControllerAdvice.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/advice/TokenControllerAdvice.java @@ -1,7 +1,7 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.advice; +package com.hakimfauzi23.boilerplatespringsecurity.jwt.advice; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.exception.ErrorMessage; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.exception.TokenRefreshException; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.exception.ErrorMessage; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.exception.TokenRefreshException; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/exception/ErrorMessage.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/exception/ErrorMessage.java similarity index 89% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/exception/ErrorMessage.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/exception/ErrorMessage.java index 95524f4..270d622 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/exception/ErrorMessage.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/exception/ErrorMessage.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.exception; +package com.hakimfauzi23.boilerplatespringsecurity.jwt.exception; import java.util.Date; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/exception/TokenRefreshException.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/exception/TokenRefreshException.java similarity index 83% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/exception/TokenRefreshException.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/exception/TokenRefreshException.java index a91d7ac..4872cb3 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/jwt/exception/TokenRefreshException.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/jwt/exception/TokenRefreshException.java @@ -1,4 +1,4 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.exception; +package com.hakimfauzi23.boilerplatespringsecurity.jwt.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/ERole.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/ERole.java deleted file mode 100644 index a429fec..0000000 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/data/ERole.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data; - -public enum ERole { - ROLE_USER, - ROLE_ADMIN -} diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/RefreshTokenRepository.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/RefreshTokenRepository.java similarity index 63% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/RefreshTokenRepository.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/RefreshTokenRepository.java index 904cc59..6963766 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/RefreshTokenRepository.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/RefreshTokenRepository.java @@ -1,7 +1,7 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository; +package com.hakimfauzi23.boilerplatespringsecurity.repository; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.RefreshToken; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.User; +import com.hakimfauzi23.boilerplatespringsecurity.data.RefreshToken; +import com.hakimfauzi23.boilerplatespringsecurity.data.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/RoleRepository.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/RoleRepository.java similarity index 54% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/RoleRepository.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/RoleRepository.java index c1c499a..9a17d94 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/RoleRepository.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/RoleRepository.java @@ -1,7 +1,7 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository; +package com.hakimfauzi23.boilerplatespringsecurity.repository; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.ERole; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.Role; +import com.hakimfauzi23.boilerplatespringsecurity.data.ERole; +import com.hakimfauzi23.boilerplatespringsecurity.data.Role; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/UserRepository.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/UserRepository.java similarity index 71% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/UserRepository.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/UserRepository.java index 367efd9..97f6d0a 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/repository/UserRepository.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository; +package com.hakimfauzi23.boilerplatespringsecurity.repository; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.User; +import com.hakimfauzi23.boilerplatespringsecurity.data.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/RefreshTokenService.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/RefreshTokenService.java similarity index 78% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/RefreshTokenService.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/RefreshTokenService.java index 1e2d518..3f900f2 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/RefreshTokenService.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/RefreshTokenService.java @@ -1,9 +1,9 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service; +package com.hakimfauzi23.boilerplatespringsecurity.service; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.RefreshToken; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.jwt.exception.TokenRefreshException; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository.RefreshTokenRepository; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository.UserRepository; +import com.hakimfauzi23.boilerplatespringsecurity.data.RefreshToken; +import com.hakimfauzi23.boilerplatespringsecurity.jwt.exception.TokenRefreshException; +import com.hakimfauzi23.boilerplatespringsecurity.repository.RefreshTokenRepository; +import com.hakimfauzi23.boilerplatespringsecurity.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/UserDetailsImpl.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/UserDetailsImpl.java similarity index 94% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/UserDetailsImpl.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/UserDetailsImpl.java index 43ba26f..9a99735 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/UserDetailsImpl.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/UserDetailsImpl.java @@ -1,7 +1,7 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service; +package com.hakimfauzi23.boilerplatespringsecurity.service; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.User; +import com.hakimfauzi23.boilerplatespringsecurity.data.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/UserDetailsServiceImpl.java b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/UserDetailsServiceImpl.java similarity index 78% rename from src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/UserDetailsServiceImpl.java rename to src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/UserDetailsServiceImpl.java index e4b352e..32393f0 100644 --- a/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/modules/auth/service/UserDetailsServiceImpl.java +++ b/src/main/java/com/hakimfauzi23/boilerplatespringsecurity/service/UserDetailsServiceImpl.java @@ -1,7 +1,7 @@ -package com.hakimfauzi23.boilerplatespringsecurity.modules.auth.service; +package com.hakimfauzi23.boilerplatespringsecurity.service; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.data.User; -import com.hakimfauzi23.boilerplatespringsecurity.modules.auth.repository.UserRepository; +import com.hakimfauzi23.boilerplatespringsecurity.data.User; +import com.hakimfauzi23.boilerplatespringsecurity.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index aa90142..04c94a7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.datasource.url= jdbc:mysql://localhost:3306/testdb?useSSL=false -spring.datasource.username= root +spring.datasource.username=root spring.datasource.password= spring.jpa.hibernate.ddl-auto= update