refactor/ remove outh2OnlyFilterchain

Author: tape4

src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/annotation/OAuth2.java

@@ -1,5 +1,6 @@
 package org.fontory.fontorybe.authentication.application;
 
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.fontory.fontorybe.authentication.application.dto.ResponseCookies;
 import org.fontory.fontorybe.authentication.application.port.CookieUtils;
@@ -25,7 +26,7 @@ public class AuthService {
      * 새롭게 토큰 발급
      * 기존에 토큰이 존재한다면 제거, 기존 토큰이 존재할 필요 X
      */
-    public TokenResponse issueNewTokens(Member member) {
+    private TokenResponse issueNewTokens(Member member) {
         UserPrincipal user = UserPrincipal.from(member);
 
         String accessToken = jwtTokenProvider.generateAccessToken(user);
@@ -55,7 +56,8 @@ public ResponseCookies refreshAuthCookies(Long memberId, String providedRefreshT
         return issueAuthCookies(member);
     }
 
-    public void removeRefreshToken(Member member) {
+    public void clearAuthCookies(HttpServletResponse res, Member member) {
+        cookieUtils.clearAuthCookies(res);
         tokenStorage.removeRefreshToken(member);
     }
 }

src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/resolver/OAuth2InfoArgumentResolver.java

@@ -5,8 +5,8 @@
 import lombok.RequiredArgsConstructor;
 import org.fontory.fontorybe.authentication.adapter.inbound.annotation.Login;
 import org.fontory.fontorybe.authentication.application.port.CookieUtils;
-import org.fontory.fontorybe.authentication.application.port.JwtTokenProvider;
 import org.fontory.fontorybe.authentication.domain.UserPrincipal;
+import org.fontory.fontorybe.common.application.DevTokenInitializer;
 import org.fontory.fontorybe.font.service.dto.FontRequestProduceDto;
 import org.fontory.fontorybe.font.service.port.FontRequestProducer;
 import org.slf4j.MDC;
@@ -21,8 +21,8 @@
 @RestController
 @RequiredArgsConstructor
 public class DebugController {
+    private final DevTokenInitializer devTokenInitializer;
     private final FontRequestProducer fontRequestProducer;
-    private final JwtTokenProvider jwtTokenProvider;
     private final CookieUtils cookieUtils;
 
     @Value("${commit.hash}")
@@ -58,15 +58,18 @@ public String cookies(HttpServletRequest request) {
 
     @GetMapping("/debug/auth/me")
     public String me(
-            HttpServletRequest request,
             @Login UserPrincipal userPrincipal
     ) {
-//        if userprincipal null, exception in argument Resolver
         return String.valueOf(userPrincipal.getId());
     }
 
+    @GetMapping("/debug/login")
+    public void login(HttpServletResponse res) {
+        devTokenInitializer.issueTestAccessCookies(res);
+    }
+
     @GetMapping("/debug/logout")
-    public void me(HttpServletResponse res) {
-        cookieUtils.clearAuthCookies(res);
+    public void logout(HttpServletResponse res) {
+        devTokenInitializer.removeTestAccessCookies(res);
     }
 }

src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/security/JwtOnlyOAuth2RequireFilter.java

@@ -8,6 +8,7 @@
 import org.fontory.fontorybe.bookmark.domain.exception.BookmarkNotFoundException;
 import org.fontory.fontorybe.common.domain.BaseErrorResponse;
 import org.fontory.fontorybe.file.adapter.inbound.exception.FileUploadException;
+import org.fontory.fontorybe.file.adapter.inbound.exception.UnsupportedFileTypeException;
 import org.fontory.fontorybe.file.domain.exception.InvalidMultipartRequestException;
 import org.fontory.fontorybe.file.domain.exception.SingleFileRequiredException;
 import org.fontory.fontorybe.font.domain.exception.FontNotFoundException;
@@ -128,4 +129,10 @@ public BaseErrorResponse singleFileRequiredException(SingleFileRequiredException
     public BaseErrorResponse invalidMultipartRequest(InvalidMultipartRequestException e) {
         return new BaseErrorResponse(e.getMessage());
     }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(UnsupportedFileTypeException.class)
+    public BaseErrorResponse unsupportedFileType(UnsupportedFileTypeException e) {
+        return new BaseErrorResponse(e.getMessage());
+    }
 }

src/main/java/org/fontory/fontorybe/authentication/application/AuthService.java

@@ -3,10 +3,13 @@
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.transaction.Transactional;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.fontory.fontorybe.authentication.application.AuthService;
+import org.fontory.fontorybe.authentication.application.port.CookieUtils;
 import org.fontory.fontorybe.config.S3Config;
 import org.fontory.fontorybe.config.jwt.JwtProperties;
 import org.fontory.fontorybe.member.domain.Member;
@@ -15,9 +18,10 @@
 import org.fontory.fontorybe.provide.domain.Provide;
 import org.fontory.fontorybe.provide.infrastructure.entity.Provider;
 import org.fontory.fontorybe.provide.service.port.ProvideRepository;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseCookie;
 import org.springframework.stereotype.Component;
 
 import javax.crypto.SecretKey;
@@ -30,15 +34,20 @@
 @RequiredArgsConstructor
 public class DevTokenInitializer implements ApplicationListener<ContextRefreshedEvent> {
 
+    private final AuthService authService;
     private final JwtProperties props;
+    private final CookieUtils cookieUtils;
     private final ProvideRepository provideRepository;
     private final MemberRepository memberRepository;
     private final JwtProperties jwtProperties;
-
     // 고정된 발행 및 만료 시간
     private final Date issuedAt = new Date(1735689600000L);     // 2025-01-01T00:00:00Z
     private final Date expiration = new Date(1767225600000L);     // 2025-12-31T23:59:59Z
 
+    private String fixedTokenForProvide;
+    private String fixedTokenForAuthentication;
+    private Member testMember;
+
     @Getter
     private String fixedTokenForFontCreateServer;
 
@@ -85,15 +94,16 @@ public void initTokens() {
                 .build();
 
         Member savedMember = memberRepository.save(member);
+        testMember = savedMember;
 
-        String fixedTokenForProvide = Jwts.builder()
+        fixedTokenForProvide = Jwts.builder()
                 .setSubject(String.valueOf(savedProvide.getId()))
                 .setIssuedAt(issuedAt)
                 .setExpiration(expiration)
                 .signWith(provideSecretKey)
                 .compact();
 
-        String fixedTokenForAuthentication = Jwts.builder()
+        fixedTokenForAuthentication = Jwts.builder()
                 .setSubject(String.valueOf(savedMember.getId()))
                 .setIssuedAt(issuedAt)
                 .setExpiration(expiration)
@@ -111,4 +121,13 @@ public void initTokens() {
         log.info("Authentication JWT for development: {}", fixedTokenForAuthentication);
         log.info("FontCreateServer JWT: {}", fixedTokenForFontCreateServer);
     }
+
+    public void issueTestAccessCookies(HttpServletResponse response) {
+        ResponseCookie accessTokenCookie = cookieUtils.createAccessTokenCookie(fixedTokenForAuthentication);
+        response.addHeader(HttpHeaders.SET_COOKIE, accessTokenCookie.toString());
+    }
+
+    public void removeTestAccessCookies(HttpServletResponse response) {
+        authService.clearAuthCookies(response, testMember);
+    }
 }

src/main/java/org/fontory/fontorybe/common/adapter/inbound/DebugController.java

@@ -17,7 +17,7 @@ public class S3Config {
     private final Map<FileType, String> bucketMap = new EnumMap<>(FileType.class);
 
     @Getter
-    private static String defaultProfileImageUrl;
+    private static String defaultProfileImageUrl = "testUrl";
 
     @Value("${default.profile.url}")
     public void setDefaultProfileImageUrl(String defaultProfileImageUrl) {

src/main/java/org/fontory/fontorybe/common/adapter/inbound/GlobalExceptionHandler.java

@@ -6,7 +6,6 @@
 import org.fontory.fontorybe.authentication.adapter.inbound.CustomOauth2UserService;
 import org.fontory.fontorybe.authentication.adapter.inbound.security.JwtAuthenticationFilter;
 import org.fontory.fontorybe.authentication.adapter.inbound.security.JwtFontCreateServerFilter;
-import org.fontory.fontorybe.authentication.adapter.inbound.security.JwtOnlyOAuth2RequireFilter;
 import org.fontory.fontorybe.authentication.application.AuthService;
 import org.fontory.fontorybe.authentication.application.port.CookieUtils;
 import org.fontory.fontorybe.authentication.application.port.JwtTokenProvider;
@@ -27,6 +26,7 @@
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.access.ExceptionTranslationFilter;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.util.matcher.AndRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
@@ -115,41 +115,18 @@ public SecurityFilterChain fontCreateServerSecurityFilterChain(HttpSecurity http
     }
 
     /**
-     * 3. jwtOnlySecurityFilterChain
-     * 회원가입전 OAUTH2를 발급한 임시 토큰을 검증하기 위한 JwtOnlyProvideRequireFilter만 적용되는 컨트롤러
-     * 회원가입전 사진업로드(POST, "/files/profile-image"), 회원가입(POST, "/member")
-     */
-    @Bean
-    @Order(3)
-    public SecurityFilterChain jwtOnlySecurityFilterChain(HttpSecurity http) throws Exception {
-        return http
-                .securityMatcher(new OrRequestMatcher(
-                        new AntPathRequestMatcher("/member", HttpMethod.POST.name())
-                ))
-                .cors(cors -> cors.configurationSource(corsConfigurationSource))
-                .sessionManagement(AbstractHttpConfigurer::disable)
-                .csrf(CsrfConfigurer::disable)
-                .httpBasic(HttpBasicConfigurer::disable)
-                .formLogin(FormLoginConfigurer::disable)
-                .authorizeHttpRequests(auth -> auth.anyRequest().permitAll())
-                .addFilterBefore(new JwtOnlyOAuth2RequireFilter(jwtTokenProvider), UsernamePasswordAuthenticationFilter.class)
-                .build();
-    }
-
-    // 3. 기본 체인: 그 외의 모든 요청에 대해 JWT 인증 필터 적용
-
-    /**
-     * 4. defaultSecurityFilterChain
+     * 3. defaultSecurityFilterChain
      * 그 외의 모든 요청에 대해 JWT 인증 필터 적용
      */
     @Bean
-    @Order(4)
+    @Order(3)
     public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception {
         return http
-                .securityMatcher(new NegatedRequestMatcher(new OrRequestMatcher(
-                        new AntPathRequestMatcher("/files/profile-image", HttpMethod.POST.name()),
-                        new AntPathRequestMatcher("/member", HttpMethod.POST.name())
-                )))
+                .securityMatcher(
+                        new OrRequestMatcher(
+                                new NegatedRequestMatcher(new AntPathRequestMatcher("/debug/**")),
+                                new AntPathRequestMatcher("/debug/auth/me", HttpMethod.GET.name())
+                ))
                 .cors(cors -> cors.configurationSource(corsConfigurationSource))
                 .sessionManagement(AbstractHttpConfigurer::disable)
                 .csrf(CsrfConfigurer::disable)
@@ -166,7 +143,6 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws
                         // 그 외엔 인증 필요
                         .anyRequest().authenticated()
                 )
-//                .addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
                 .build();
     }
 

src/main/java/org/fontory/fontorybe/common/application/DevTokenInitializer.java

@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.fontory.fontorybe.authentication.adapter.inbound.resolver.LoginMemberArgumentResolver;
-import org.fontory.fontorybe.authentication.adapter.inbound.resolver.OAuth2InfoArgumentResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
@@ -20,13 +19,11 @@
 public class WebConfig implements WebMvcConfigurer {
 
     private final LoginMemberArgumentResolver loginMemberArgumentResolver;
-    private final OAuth2InfoArgumentResolver oAuth2InfoArgumentResolver;
     private final PerformanceInterceptor performanceInterceptor;
 
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         argumentResolvers.add(loginMemberArgumentResolver);
-        argumentResolvers.add(oAuth2InfoArgumentResolver);
     }
 
     @Override