Merge pull request #17 from ymkmoon/style/constants

style: Constants 클래스명 변경

Author: ymkmoon

src/main/java/com/example/template/auth/AuthController.java

@@ -12,7 +12,7 @@
 import com.example.template.common.ApiResponse;
 import com.example.template.common.dto.AuthDto;
 import com.example.template.common.dto.AuthDto.SignInResponse;
-import com.example.template.constants.CommonConstants;
+import com.example.template.constants.AuthConstants;
 import com.example.template.constants.ResponseCode;
 import com.example.template.security.TokenProvider;
 
@@ -86,9 +86,8 @@ public ResponseEntity<ApiResponse<Object>> refreshToken(@RequestBody @Valid Auth
     	if(!registRefreshToken) {
     		return ApiResponse.error(ResponseCode.INVALUD_REFRESH_TOKEN);
     	}
-    	
+    	String uuid = tokenProvider.getUuidFromToken(refreshRequest.getRefreshToken(), AuthConstants.REFRESH_TOKEN.getTitle());
     	String accessToken = tokenProvider.validateRefreshToken(refreshRequest.getRefreshToken());
-    	String uuid = tokenProvider.getUuidFromToken(accessToken, CommonConstants.ACCESS_TOKEN.getTitle());
     	authService.saveAccessToken(uuid, accessToken);
 
     	AuthDto.SignInResponse response = AuthDto.SignInResponse.builder()

src/main/java/com/example/template/auth/AuthServiceImpl.java

@@ -13,7 +13,7 @@
 
 import com.example.template.admin.AdminRepository;
 import com.example.template.common.dto.AuthDto;
-import com.example.template.constants.CommonConstants;
+import com.example.template.constants.AuthConstants;
 import com.example.template.constants.ResponseCode;
 import com.example.template.exception.BusinessException;
 import com.example.template.model.entity.AdminEntity;
@@ -73,7 +73,7 @@ public UserDetails loadUserByUuid(String uuid) {
 
 	@Override
 	public AuthDto.RefreshResponse saveRefreshToken(AuthDto.SignInResponse token) {
-		String uuid = tokenProvider.getUuidFromToken(token.getRefreshToken(), CommonConstants.REFRESH_TOKEN.getTitle());
+		String uuid = tokenProvider.getUuidFromToken(token.getRefreshToken(), AuthConstants.REFRESH_TOKEN.getTitle());
 
 		AdminEntity admin = adminRepository.findById(uuid)
 				.orElseThrow(() -> new UsernameNotFoundException(ResponseCode.USER_NAME_NOT_FOUND.getDetail()));
@@ -105,7 +105,7 @@ public AuthDto.RefreshResponse saveRefreshToken(AuthDto.SignInResponse token) {
 	@Override
 	public boolean validateRegistRefreshToken(AuthDto.RefreshRequest refreshRequest) {
 		String refreshToken = refreshRequest.getRefreshToken();
-		String uuid = tokenProvider.getUuidFromToken(refreshToken, CommonConstants.REFRESH_TOKEN.getTitle());
+		String uuid = tokenProvider.getUuidFromToken(refreshToken, AuthConstants.REFRESH_TOKEN.getTitle());
 
 		AdminEntity admin = adminRepository.findById(uuid)
 				.orElseThrow(() -> new UsernameNotFoundException(ResponseCode.USER_NAME_NOT_FOUND.getDetail()));
@@ -117,7 +117,7 @@ public boolean validateRegistRefreshToken(AuthDto.RefreshRequest refreshRequest)
 
 	@Override
 	public void saveAccessToken(String username, String accessToken) {
-        long accessTokenExpireIn = tokenProvider.getExpiration(accessToken, CommonConstants.ACCESS_TOKEN.getTitle());
+        long accessTokenExpireIn = tokenProvider.getExpiration(accessToken, AuthConstants.ACCESS_TOKEN.getTitle());
 
 		// 기존 토큰 삭제
         if (redisService.hasAccessToken(username)) {

src/main/java/com/example/template/constants/CommonConstants.java renamed to src/main/java/com/example/template/constants/AuthConstants.java

@@ -13,15 +13,13 @@
  */
 @Getter
 @AllArgsConstructor
-public enum CommonConstants {
+public enum AuthConstants {
 
 	ACCESS_TOKEN("AccessToken"),
 	REFRESH_TOKEN("RefreshToken"),
 	ADMIN_UUID("uuid"),
 	ADMIN_ROLE("role"),
-	EMPTY("Empty"),
-	START_AT("startAt"),
-	END_AT("endAt")
+	
 	;
 
 	private final String title;

src/main/java/com/example/template/filter/JwtRequestFilter.java

@@ -12,7 +12,7 @@
 import org.springframework.web.util.ContentCachingRequestWrapper;
 
 import com.example.template.auth.AuthService;
-import com.example.template.constants.CommonConstants;
+import com.example.template.constants.AuthConstants;
 import com.example.template.constants.ResponseCode;
 import com.example.template.constants.SecurityConstants;
 import com.example.template.error.FailResponse;
@@ -53,7 +53,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         String accessToken = getAccessTokenFromRequestHeader(wrappedRequest);
 
     	try {
-    		String uuid = tokenProvider.getUuidFromToken(accessToken, CommonConstants.ACCESS_TOKEN.getTitle());
+    		String uuid = tokenProvider.getUuidFromToken(accessToken, AuthConstants.ACCESS_TOKEN.getTitle());
     		String storedToken = redisService.getAccessToken(uuid);
 
             // Redis에 저장된 토큰과 비교

src/main/java/com/example/template/security/TokenProvider.java

@@ -11,7 +11,7 @@
 
 import com.example.template.common.dto.AuthDto;
 import com.example.template.config.JwtConfig;
-import com.example.template.constants.CommonConstants;
+import com.example.template.constants.AuthConstants;
 import com.example.template.constants.ResponseCode;
 import com.example.template.exception.BusinessException;
 
@@ -39,7 +39,7 @@ public class TokenProvider {
      * @return 토큰을 디코딩 하여 조회 한 관리자의 uuid
      */
     public String getUuidFromToken(String token, String tokenType) {
-        return getCustomClaimFromToken(token, CommonConstants.ADMIN_UUID.getTitle(), tokenType);
+        return getCustomClaimFromToken(token, AuthConstants.ADMIN_UUID.getTitle(), tokenType);
     }
 
 
@@ -94,14 +94,13 @@ private boolean isTokenExpired(String token, String tokenType) {
     public AuthDto.SignInResponse generateToken(Authentication authentication) {
 
         Map<String, Object> claims = new HashMap<>();
-        claims.put(CommonConstants.ADMIN_UUID.getTitle(), authentication.getName());
+        claims.put(AuthConstants.ADMIN_UUID.getTitle(), authentication.getName());
 
         CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
-        claims.put("role", userDetails.getAuthorities().iterator().next().getAuthority()); // role
-//        claims.put("email", userDetails.getEmail()); // email
+        claims.put(AuthConstants.ADMIN_ROLE.getTitle(), userDetails.getAuthorities().iterator().next().getAuthority()); // role
 
-        String accessToken = doGenerateToken(claims, CommonConstants.ACCESS_TOKEN.getTitle());
-        String refreshToken = doGenerateToken(claims, CommonConstants.REFRESH_TOKEN.getTitle());
+        String accessToken = doGenerateToken(claims, AuthConstants.ACCESS_TOKEN.getTitle());
+        String refreshToken = doGenerateToken(claims, AuthConstants.REFRESH_TOKEN.getTitle());
 
         return AuthDto.SignInResponse.builder()
                 .accessToken(accessToken)
@@ -131,18 +130,18 @@ private String doGenerateToken(Map<String, Object> claims, String tokenType) {
      * @return 토큰 유효성 검증
      */
     public boolean validateAccessToken(String accessToken, UserDetails userDetails) {
-        final String uuid = getUuidFromToken(accessToken, CommonConstants.ACCESS_TOKEN.getTitle());
-        return (uuid.equals(userDetails.getUsername())) && !isTokenExpired(accessToken, CommonConstants.ACCESS_TOKEN.getTitle());
+        final String uuid = getUuidFromToken(accessToken, AuthConstants.ACCESS_TOKEN.getTitle());
+        return (uuid.equals(userDetails.getUsername())) && !isTokenExpired(accessToken, AuthConstants.ACCESS_TOKEN.getTitle());
     }
 
     /**
      * @param refreshToken
      * @return 토큰 유효성 검증
      */
     public String validateRefreshToken(String refreshToken) {
-        if (!isTokenExpired(refreshToken, CommonConstants.REFRESH_TOKEN.getTitle())) {
-            final Claims claims = getAllClaimsFromToken(refreshToken, CommonConstants.REFRESH_TOKEN.getTitle());
-            return doGenerateToken(claims, CommonConstants.ACCESS_TOKEN.getTitle());
+        if (!isTokenExpired(refreshToken, AuthConstants.REFRESH_TOKEN.getTitle())) {
+            final Claims claims = getAllClaimsFromToken(refreshToken, AuthConstants.REFRESH_TOKEN.getTitle());
+            return doGenerateToken(claims, AuthConstants.ACCESS_TOKEN.getTitle());
         }
         throw new BusinessException(ResponseCode.TOKEN_EXPIRED);
     }