Merge pull request #170 from GoToBILL/fix

feat: User 엔티티에 30일 이내 계정 복구 기능을 추가했습니다

Author: GoToBILL

src/main/java/com/example/cherrydan/common/entity/BaseTimeEntity.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -22,4 +23,8 @@ public abstract class BaseTimeEntity {
     @LastModifiedDate
     @Column(name = "updatedAt")
     private LocalDateTime updatedAt;
+    
+    @Setter
+    @Column(name = "deletedAt")
+    private LocalDateTime deletedAt;
 }

src/main/java/com/example/cherrydan/oauth/config/SecurityConfig.java

@@ -1,9 +1,6 @@
 package com.example.cherrydan.oauth.config;
 
 import com.example.cherrydan.oauth.security.jwt.JwtAuthenticationFilter;
-import com.example.cherrydan.oauth.security.oauth2.CustomOAuth2UserService;
-import com.example.cherrydan.oauth.security.oauth2.OAuth2AuthenticationFailureHandler;
-import com.example.cherrydan.oauth.security.oauth2.OAuth2AuthenticationSuccessHandler;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -24,9 +21,6 @@
 @RequiredArgsConstructor
 public class SecurityConfig {
 
-    private final CustomOAuth2UserService customOAuth2UserService;
-    private final OAuth2AuthenticationSuccessHandler oAuth2AuthenticationSuccessHandler;
-    private final OAuth2AuthenticationFailureHandler oAuth2AuthenticationFailureHandler;
     private final JwtAuthenticationFilter jwtAuthenticationFilter;
 
     @Bean
@@ -47,8 +41,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         // Apple 테스트 경로 허용
                         .requestMatchers("/api/auth/apple/**","/api/auth/naver/**","/api/auth/kakao/**","/api/auth/google/**").permitAll()
                         .requestMatchers("/apple-login-test.html").permitAll()
-                        // OAuth2 관련 경로
-                        .requestMatchers("/api/oauth2/**", "/api/login/oauth2/**").permitAll()
                         // 캠페인 관련 경로
                         .requestMatchers("/api/campaigns/**").permitAll()
                         // 공지사항/홈 광고 배너 관련 경로
@@ -59,13 +51,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         // 나머지는 인증 필요
                         .anyRequest().authenticated()
                 )
-                .oauth2Login(oauth2 -> oauth2
-                        .authorizationEndpoint(endpoint -> endpoint.baseUri("/api/oauth2/authorization"))
-                        .redirectionEndpoint(endpoint -> endpoint.baseUri("/api/login/oauth2/code/*"))
-                        .userInfoEndpoint(endpoint -> endpoint.userService(customOAuth2UserService))
-                        .successHandler(oAuth2AuthenticationSuccessHandler)
-                        .failureHandler(oAuth2AuthenticationFailureHandler)
-                )
                 // JWT 필터 추가
                 .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);