Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.solidconnection.config.security;

import com.example.solidconnection.custom.security.provider.ExpiredTokenAuthenticationProvider;
import com.example.solidconnection.custom.security.provider.SiteUserAuthenticationProvider;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
Expand All @@ -13,13 +12,11 @@
public class AuthenticationManagerConfig {

private final SiteUserAuthenticationProvider siteUserAuthenticationProvider;
private final ExpiredTokenAuthenticationProvider expiredTokenAuthenticationProvider;

@Bean
public AuthenticationManager authenticationManager() {
return new ProviderManager(
siteUserAuthenticationProvider,
expiredTokenAuthenticationProvider
siteUserAuthenticationProvider
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.example.solidconnection.custom.resolver.AuthorizedUserResolver;
import com.example.solidconnection.custom.resolver.CustomPageableHandlerMethodArgumentResolver;
import com.example.solidconnection.custom.resolver.ExpiredTokenResolver;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
Expand All @@ -15,14 +14,12 @@
public class WebMvcConfig implements WebMvcConfigurer {

private final AuthorizedUserResolver authorizedUserResolver;
private final ExpiredTokenResolver expiredTokenResolver;
private final CustomPageableHandlerMethodArgumentResolver customPageableHandlerMethodArgumentResolver;

@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
resolvers.addAll(List.of(
authorizedUserResolver,
expiredTokenResolver,
customPageableHandlerMethodArgumentResolver
));
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.example.solidconnection.custom.security.filter;

import com.example.solidconnection.config.security.JwtProperties;
import com.example.solidconnection.custom.security.authentication.ExpiredTokenAuthentication;
import com.example.solidconnection.custom.security.authentication.JwtAuthentication;
import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication;
import jakarta.servlet.FilterChain;
Expand All @@ -18,15 +16,13 @@

import java.io.IOException;

import static com.example.solidconnection.util.JwtUtils.isExpired;
import static com.example.solidconnection.util.JwtUtils.parseTokenFromRequest;


@Component
@RequiredArgsConstructor
public class JwtAuthenticationFilter extends OncePerRequestFilter {

private final JwtProperties jwtProperties;
private final AuthenticationManager authenticationManager;

@Override
Expand All @@ -47,9 +43,6 @@ public void doFilterInternal(@NonNull HttpServletRequest request,
}

private JwtAuthentication createAuthentication(String token) {
if (isExpired(token, jwtProperties.secret())) {
return new ExpiredTokenAuthentication(token);
}
return new SiteUserAuthentication(token);
}
}

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/com/example/solidconnection/util/JwtUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component;

import java.util.Date;

import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_TOKEN;

@Component
Expand All @@ -35,30 +33,6 @@ public static String parseSubject(String token, String secretKey) {
throw new CustomException(INVALID_TOKEN);
}
}

public static String parseSubjectIgnoringExpiration(String token, String secretKey) {
try {
return parseClaims(token, secretKey).getSubject();
} catch (ExpiredJwtException e) {
return e.getClaims().getSubject();
} catch (Exception e) {
throw new CustomException(INVALID_TOKEN);
}
}

public static boolean isExpired(String token, String secretKey) {
try {
Date expiration = Jwts.parser()
.setSigningKey(secretKey)
.parseClaimsJws(token)
.getBody()
.getExpiration();
return expiration.before(new Date());
} catch (Exception e) {
return true;
}
}

public static Claims parseClaims(String token, String secretKey) throws ExpiredJwtException {
return Jwts.parser()
.setSigningKey(secretKey)
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading