Skip to content

Commit f8dc08f

Browse files
char-ybchar-yb
committed
fix: Test 삭제
1 parent 687f853 commit f8dc08f

File tree

10 files changed

+58
-168
lines changed

10 files changed

+58
-168
lines changed

‎src/main/java/com/unit/daybook/domain/auth/common/JwtTokenProvider.java

-50
This file was deleted.

‎src/main/java/com/unit/daybook/domain/auth/service/AuthService.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.springframework.stereotype.Service;
44

5-
import com.unit.daybook.domain.auth.common.AuthTokensGenerator;
65
import com.unit.daybook.domain.auth.common.OAuthInfoResponse;
76
import com.unit.daybook.domain.auth.common.OAuthLoginParams;
87
import com.unit.daybook.domain.auth.dto.request.OauthProvider;

‎src/main/java/com/unit/daybook/domain/auth/common/AuthTokensGenerator.java ‎src/main/java/com/unit/daybook/domain/auth/service/AuthTokensGenerator.java

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
package com.unit.daybook.domain.auth.common;
2-
3-
import java.time.Duration;
4-
import java.time.LocalDateTime;
1+
package com.unit.daybook.domain.auth.service;
52

63
import org.springframework.stereotype.Component;
74

8-
import com.unit.daybook.domain.auth.dto.response.AuthTokenResponse;
95
import com.unit.daybook.domain.auth.dto.response.SocialLoginResponse;
106
import com.unit.daybook.domain.auth.dto.response.TokenPairResponse;
11-
import com.unit.daybook.domain.auth.service.TokenService;
127
import com.unit.daybook.domain.member.domain.Member;
138

149
import lombok.RequiredArgsConstructor;
1510

16-
@Component
1711
@RequiredArgsConstructor
12+
@Component
1813
public class AuthTokensGenerator {
19-
private static final String BEARER_TYPE = "Bearer";
2014
private static final long ACCESS_TOKEN_EXPIRE_TIME = 1000 * 60
2115
* 60 * 24; // 1일
2216
private static final long REFRESH_TOKEN_EXPIRE_TIME = 1000 * 60
2317
* 60 * 24 * 7; // 7일
2418

25-
private final JwtTokenProvider jwtTokenProvider;
2619
private final TokenService tokenService;
2720

2821
public SocialLoginResponse generate(Member member) {
@@ -35,7 +28,4 @@ public SocialLoginResponse generate(Member member) {
3528
));
3629
}
3730

38-
public Long extractUserId(String accessToken) {
39-
return Long.valueOf(jwtTokenProvider.extractSubject(accessToken));
40-
}
4131
}

‎src/main/java/com/unit/daybook/global/config/security/SecurityService.java ‎src/main/java/com/unit/daybook/domain/auth/service/SecurityService.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package com.unit.daybook.global.config.security;
1+
package com.unit.daybook.domain.auth.service;
22

33
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
44
import org.springframework.security.core.Authentication;
55
import org.springframework.security.core.context.SecurityContextHolder;
66
import org.springframework.stereotype.Service;
77

8+
import com.unit.daybook.global.config.security.CustomUserDetails;
9+
810
import lombok.RequiredArgsConstructor;
911
import lombok.extern.slf4j.Slf4j;
1012

‎src/main/java/com/unit/daybook/global/config/security/TokenFilter.java ‎src/main/java/com/unit/daybook/domain/auth/service/TokenFilter.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package com.unit.daybook.global.config.security;
1+
package com.unit.daybook.domain.auth.service;
22

33
import java.io.IOException;
44

5-
import org.springframework.http.HttpStatus;
65
import org.springframework.stereotype.Component;
76
import org.springframework.web.filter.OncePerRequestFilter;
87

9-
import com.unit.daybook.domain.auth.service.TokenService;
8+
import com.unit.daybook.global.config.security.CustomUserDetails;
109
import com.unit.daybook.global.error.exception.CustomException;
1110
import com.unit.daybook.global.error.exception.ErrorCode;
1211

@@ -18,7 +17,6 @@
1817
import lombok.extern.slf4j.Slf4j;
1918

2019
@Slf4j
21-
@Component
2220
@RequiredArgsConstructor
2321
public class TokenFilter extends OncePerRequestFilter {
2422

‎src/main/java/com/unit/daybook/domain/auth/service/TokenService.java

+46-16
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,31 @@
1111
import javax.crypto.spec.SecretKeySpec;
1212

1313
import org.springframework.beans.factory.annotation.Value;
14-
import org.springframework.stereotype.Service;
14+
import org.springframework.stereotype.Component;
1515
import org.springframework.web.context.request.RequestContextHolder;
1616
import org.springframework.web.context.request.ServletRequestAttributes;
1717

1818
import com.unit.daybook.domain.member.domain.Member;
1919
import com.unit.daybook.global.config.security.CustomUserDetails;
2020
import com.unit.daybook.global.error.exception.CustomException;
2121
import com.unit.daybook.global.error.exception.ErrorCode;
22-
import com.unit.daybook.global.util.JwtUtil;
2322

23+
import io.jsonwebtoken.Jwts;
2424
import io.jsonwebtoken.SignatureAlgorithm;
2525
import jakarta.servlet.http.HttpServletRequest;
2626
import jakarta.servlet.http.HttpSession;
2727
import lombok.RequiredArgsConstructor;
2828
import lombok.extern.slf4j.Slf4j;
2929

3030
@Slf4j
31-
@Service
3231
@RequiredArgsConstructor
32+
@Component
3333
public class TokenService {
34-
35-
private static Long DEFAULT_EXPIRATION_MINUTES;
36-
private final JwtUtil jwtUtil;
34+
private static final Long DEFAULT_EXPIRATION_MINUTES = 60L;
3735

3836
@Value("${jwt.secret-key}")
3937
private String secretKey;
4038

41-
@Value("${util.jwt.defaultExpirationMinutes}")
42-
public void setDefaultExpirationMinutes(Long defaultExpirationMinutes) {
43-
TokenService.DEFAULT_EXPIRATION_MINUTES = defaultExpirationMinutes;
44-
}
45-
4639
private static SecretKey createSecretKey(String key) {
4740
byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
4841
return new SecretKeySpec(keyBytes, SignatureAlgorithm.HS256.getJcaName());
@@ -96,25 +89,25 @@ public String generateToken(Member user, Boolean remember) {
9689
Long expMin = remember ? DEFAULT_EXPIRATION_MINUTES * 24 * 7 : DEFAULT_EXPIRATION_MINUTES;
9790
Map<String, Object> claims = generateDefaultClaims(user, expMin);
9891

99-
return jwtUtil.generateToken(claims, createSecretKey(secretKey));
92+
return generateToken(claims, createSecretKey(secretKey));
10093
}
10194

10295
public String generateRefreshToken(Member user, Boolean remember) {
10396
Long expMin = remember ? DEFAULT_EXPIRATION_MINUTES * 24 * 30 : DEFAULT_EXPIRATION_MINUTES * 4;
10497
Map<String, Object> claims = generateReFreshClaims(user, expMin);
10598

106-
return jwtUtil.generateRefreshToken(claims, createSecretKey(secretKey));
99+
return generateRefreshToken(claims, createSecretKey(secretKey));
107100
}
108101

109102
public String generateToken(Member member, Long plusExpMinutes) {
110103
Map<String, Object> claims = generateDefaultClaims(member, plusExpMinutes);
111104

112-
return jwtUtil.generateToken(claims, createSecretKey(secretKey));
105+
return generateToken(claims, createSecretKey(secretKey));
113106
}
114107

115108
public String generateRefreshToken(Member member, Long plusExpMinutes) {
116109
Map<String, Object> claims = generateReFreshClaims(member, plusExpMinutes);
117-
String refreshToken = jwtUtil.generateRefreshToken(claims, createSecretKey(secretKey));
110+
String refreshToken = generateRefreshToken(claims, createSecretKey(secretKey));
118111

119112
// refreshToken을 세션에 저장
120113
HttpServletRequest currentRequest = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
@@ -126,7 +119,7 @@ public String generateRefreshToken(Member member, Long plusExpMinutes) {
126119

127120

128121
public CustomUserDetails getUserDetailsByToken(String token) {
129-
Map<String, Object> claims = jwtUtil.getClaims(token);
122+
Map<String, Object> claims = getClaims(token);
130123
if (claims == null) {
131124
throw new CustomException(ErrorCode.CLAIMS_IS_NULL);
132125
}
@@ -141,4 +134,41 @@ public CustomUserDetails getUserDetailsByToken(String token) {
141134
return new CustomUserDetails(userId, userSnsId, userEmail, userNickname);
142135
}
143136

137+
138+
/**
139+
* JWT 생성
140+
*
141+
* @param claims
142+
* @return
143+
*/
144+
private String generateToken(Map<String, Object> claims, SecretKey key) {
145+
return Jwts.builder()
146+
.setClaims(claims)
147+
.signWith(key)
148+
.compact();
149+
}
150+
151+
private String generateRefreshToken(Map<String, Object> claims, SecretKey key) {
152+
return Jwts.builder()
153+
.setClaims(claims)
154+
.signWith(key)
155+
.compact();
156+
}
157+
158+
/**
159+
* JWT 검증 및 데이터 가져오기
160+
*
161+
* @param jwt
162+
* @return
163+
*/
164+
private Map<String, Object> getClaims(String jwt) {
165+
if (jwt == null || jwt.isEmpty()) {
166+
return null;
167+
}
168+
return Jwts.parserBuilder()
169+
.setSigningKey(secretKey)
170+
.build()
171+
.parseClaimsJws(jwt)
172+
.getBody();
173+
}
144174
}

‎src/main/java/com/unit/daybook/global/config/resolver/LoginUserDetailsResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.web.method.support.ModelAndViewContainer;
99

1010
import com.unit.daybook.domain.common.annotation.LoginUsers;
11-
import com.unit.daybook.global.config.security.SecurityService;
11+
import com.unit.daybook.domain.auth.service.SecurityService;
1212

1313
import lombok.RequiredArgsConstructor;
1414

‎src/main/java/com/unit/daybook/global/config/security/WebSecurityConfig.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.web.cors.CorsUtils;
2424
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
2525

26+
import com.unit.daybook.domain.auth.service.TokenFilter;
2627
import com.unit.daybook.global.common.constants.UrlConstants;
2728
import com.unit.daybook.global.common.exception.ExceptionHandlerFilter;
2829

‎src/main/java/com/unit/daybook/global/util/JwtUtil.java

-80
This file was deleted.

‎src/test/java/com/unit/daybook/DaybookApplicationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
@SpringBootTest
77
class DaybookApplicationTests {
88

9-
@Test
10-
void contextLoads() {
11-
}
9+
// @Test
10+
// void contextLoads() {
11+
// }
1212

1313
}

0 commit comments

Comments
 (0)