Skip to content

Commit c0f79cc

Browse files
authored
refactor: 만료된 토큰 허용하는 코드 제거 (#308)
* refactor: 만료된 토큰도 허용하는 코드 삭제 * test: 만료된 토큰과 관련된 테스트 코드 삭제 * test: 삭제된 테스트와의 연관성 제거 - 삭제된 테스트 코드와 연관된 테스트 함수명, 구조 수정
1 parent 2373d04 commit c0f79cc

File tree

14 files changed

+17
-455
lines changed

14 files changed

+17
-455
lines changed

src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.example.solidconnection.config.security;
22

3-
import com.example.solidconnection.custom.security.provider.ExpiredTokenAuthenticationProvider;
43
import com.example.solidconnection.custom.security.provider.SiteUserAuthenticationProvider;
54
import lombok.RequiredArgsConstructor;
65
import org.springframework.context.annotation.Bean;
@@ -13,13 +12,11 @@
1312
public class AuthenticationManagerConfig {
1413

1514
private final SiteUserAuthenticationProvider siteUserAuthenticationProvider;
16-
private final ExpiredTokenAuthenticationProvider expiredTokenAuthenticationProvider;
1715

1816
@Bean
1917
public AuthenticationManager authenticationManager() {
2018
return new ProviderManager(
21-
siteUserAuthenticationProvider,
22-
expiredTokenAuthenticationProvider
19+
siteUserAuthenticationProvider
2320
);
2421
}
2522
}

src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.example.solidconnection.custom.resolver.AuthorizedUserResolver;
44
import com.example.solidconnection.custom.resolver.CustomPageableHandlerMethodArgumentResolver;
5-
import com.example.solidconnection.custom.resolver.ExpiredTokenResolver;
65
import lombok.RequiredArgsConstructor;
76
import org.springframework.context.annotation.Configuration;
87
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
@@ -15,14 +14,12 @@
1514
public class WebMvcConfig implements WebMvcConfigurer {
1615

1716
private final AuthorizedUserResolver authorizedUserResolver;
18-
private final ExpiredTokenResolver expiredTokenResolver;
1917
private final CustomPageableHandlerMethodArgumentResolver customPageableHandlerMethodArgumentResolver;
2018

2119
@Override
2220
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
2321
resolvers.addAll(List.of(
2422
authorizedUserResolver,
25-
expiredTokenResolver,
2623
customPageableHandlerMethodArgumentResolver
2724
));
2825
}

src/main/java/com/example/solidconnection/custom/exception/JwtExpiredTokenException.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/com/example/solidconnection/custom/resolver/ExpiredToken.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/com/example/solidconnection/custom/resolver/ExpiredTokenResolver.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/com/example/solidconnection/custom/security/authentication/ExpiredTokenAuthentication.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilter.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.example.solidconnection.custom.security.filter;
22

3-
import com.example.solidconnection.config.security.JwtProperties;
4-
import com.example.solidconnection.custom.security.authentication.ExpiredTokenAuthentication;
53
import com.example.solidconnection.custom.security.authentication.JwtAuthentication;
64
import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication;
75
import jakarta.servlet.FilterChain;
@@ -18,15 +16,13 @@
1816

1917
import java.io.IOException;
2018

21-
import static com.example.solidconnection.util.JwtUtils.isExpired;
2219
import static com.example.solidconnection.util.JwtUtils.parseTokenFromRequest;
2320

2421

2522
@Component
2623
@RequiredArgsConstructor
2724
public class JwtAuthenticationFilter extends OncePerRequestFilter {
2825

29-
private final JwtProperties jwtProperties;
3026
private final AuthenticationManager authenticationManager;
3127

3228
@Override
@@ -47,9 +43,6 @@ public void doFilterInternal(@NonNull HttpServletRequest request,
4743
}
4844

4945
private JwtAuthentication createAuthentication(String token) {
50-
if (isExpired(token, jwtProperties.secret())) {
51-
return new ExpiredTokenAuthentication(token);
52-
}
5346
return new SiteUserAuthentication(token);
5447
}
5548
}

src/main/java/com/example/solidconnection/custom/security/provider/ExpiredTokenAuthenticationProvider.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/com/example/solidconnection/util/JwtUtils.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import jakarta.servlet.http.HttpServletRequest;
88
import org.springframework.stereotype.Component;
99

10-
import java.util.Date;
11-
1210
import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_TOKEN;
1311

1412
@Component
@@ -35,30 +33,6 @@ public static String parseSubject(String token, String secretKey) {
3533
throw new CustomException(INVALID_TOKEN);
3634
}
3735
}
38-
39-
public static String parseSubjectIgnoringExpiration(String token, String secretKey) {
40-
try {
41-
return parseClaims(token, secretKey).getSubject();
42-
} catch (ExpiredJwtException e) {
43-
return e.getClaims().getSubject();
44-
} catch (Exception e) {
45-
throw new CustomException(INVALID_TOKEN);
46-
}
47-
}
48-
49-
public static boolean isExpired(String token, String secretKey) {
50-
try {
51-
Date expiration = Jwts.parser()
52-
.setSigningKey(secretKey)
53-
.parseClaimsJws(token)
54-
.getBody()
55-
.getExpiration();
56-
return expiration.before(new Date());
57-
} catch (Exception e) {
58-
return true;
59-
}
60-
}
61-
6236
public static Claims parseClaims(String token, String secretKey) throws ExpiredJwtException {
6337
return Jwts.parser()
6438
.setSigningKey(secretKey)

src/test/java/com/example/solidconnection/custom/resolver/ExpiredTokenResolverTest.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)