refactor: 요청의 인증 정보를 컨트롤러에서 원하는 형태로 받을 수 있도록

src/main/java/com/example/solidconnection/application/controller/ApplicationController.java

@@ -5,6 +5,8 @@
 import com.example.solidconnection.application.dto.ApplyRequest;
 import com.example.solidconnection.application.service.ApplicationQueryService;
 import com.example.solidconnection.application.service.ApplicationSubmissionService;
+import com.example.solidconnection.custom.resolver.AuthorizedUser;
+import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -16,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.security.Principal;
-
 @RequiredArgsConstructor
 @RequestMapping("/application")
 @RestController
@@ -29,30 +29,33 @@ public class ApplicationController {
     // 지원서 제출하기 api
     @PostMapping()
     public ResponseEntity<ApplicationSubmissionResponse> apply(
-            Principal principal,
-            @Valid @RequestBody ApplyRequest applyRequest) {
-        boolean result = applicationSubmissionService.apply(principal.getName(), applyRequest);
+            @AuthorizedUser SiteUser siteUser,
+            @Valid @RequestBody ApplyRequest applyRequest
+    ) {
+        boolean result = applicationSubmissionService.apply(siteUser, applyRequest);
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(new ApplicationSubmissionResponse(result));
     }
 
     @GetMapping
     public ResponseEntity<ApplicationsResponse> getApplicants(
-            Principal principal,
+            @AuthorizedUser SiteUser siteUser,
             @RequestParam(required = false, defaultValue = "") String region,
-            @RequestParam(required = false, defaultValue = "") String keyword) {
-        applicationQueryService.validateSiteUserCanViewApplicants(principal.getName());
-        ApplicationsResponse result = applicationQueryService.getApplicants(principal.getName(), region, keyword);
+            @RequestParam(required = false, defaultValue = "") String keyword
+    ) {
+        applicationQueryService.validateSiteUserCanViewApplicants(siteUser);
+        ApplicationsResponse result = applicationQueryService.getApplicants(siteUser, region, keyword);
         return ResponseEntity
                 .ok(result);
     }
 
     @GetMapping("/competitors")
     public ResponseEntity<ApplicationsResponse> getApplicantsForUserCompetitors(
-            Principal principal) {
-        applicationQueryService.validateSiteUserCanViewApplicants(principal.getName());
-        ApplicationsResponse result = applicationQueryService.getApplicantsByUserApplications(principal.getName());
+            @AuthorizedUser SiteUser siteUser
+    ) {
+        applicationQueryService.validateSiteUserCanViewApplicants(siteUser);
+        ApplicationsResponse result = applicationQueryService.getApplicantsByUserApplications(siteUser);
         return ResponseEntity
                 .ok(result);
     }

src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java

@@ -8,7 +8,6 @@
 import com.example.solidconnection.cache.annotation.ThunderingHerdCaching;
 import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import com.example.solidconnection.type.VerifyStatus;
 import com.example.solidconnection.university.domain.University;
 import com.example.solidconnection.university.domain.UniversityInfoForApply;
@@ -34,7 +33,6 @@ public class ApplicationQueryService {
 
     private final ApplicationRepository applicationRepository;
     private final UniversityInfoForApplyRepository universityInfoForApplyRepository;
-    private final SiteUserRepository siteUserRepository;
     private final UniversityFilterRepositoryImpl universityFilterRepository;
 
     @Value("${university.term}")
@@ -49,9 +47,7 @@ public class ApplicationQueryService {
      * */
     @Transactional(readOnly = true)
     @ThunderingHerdCaching(key = "application:query:{1}:{2}", cacheManager = "customCacheManager", ttlSec = 86400)
-    public ApplicationsResponse getApplicants(String email, String regionCode, String keyword) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
-
+    public ApplicationsResponse getApplicants(SiteUser siteUser, String regionCode, String keyword) {
         // 국가와 키워드와 지역을 통해 대학을 필터링한다.
         List<University> universities
                 = universityFilterRepository.findByRegionCodeAndKeywords(regionCode, List.of(keyword));
@@ -64,9 +60,7 @@ public ApplicationsResponse getApplicants(String email, String regionCode, Strin
     }
 
     @Transactional(readOnly = true)
-    public ApplicationsResponse getApplicantsByUserApplications(String email) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
-
+    public ApplicationsResponse getApplicantsByUserApplications(SiteUser siteUser) {
         Application userLatestApplication = applicationRepository.getApplicationBySiteUserAndTerm(siteUser, term);
         List<University> userAppliedUniversities = Arrays.asList(
                         Optional.ofNullable(userLatestApplication.getFirstChoiceUniversity())
@@ -91,8 +85,7 @@ public ApplicationsResponse getApplicantsByUserApplications(String email) {
     // 학기별로 상태가 관리된다.
     // 금학기에 지원이력이 있는 사용자만 지원정보를 확인할 수 있도록 한다.
     @Transactional(readOnly = true)
-    public void validateSiteUserCanViewApplicants(String email) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
+    public void validateSiteUserCanViewApplicants(SiteUser siteUser) {
         VerifyStatus verifyStatus = applicationRepository.getApplicationBySiteUserAndTerm(siteUser, term).getVerifyStatus();
         if (verifyStatus != VerifyStatus.APPROVED) {
             throw new CustomException(APPLICATION_NOT_APPROVED);

src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java

@@ -38,7 +38,6 @@ public class ApplicationSubmissionService {
 
     private final ApplicationRepository applicationRepository;
     private final UniversityInfoForApplyRepository universityInfoForApplyRepository;
-    private final SiteUserRepository siteUserRepository;
     private final GpaScoreRepository gpaScoreRepository;
     private final LanguageTestScoreRepository languageTestScoreRepository;
 
@@ -48,8 +47,7 @@ public class ApplicationSubmissionService {
     // 학점 및 어학성적이 모두 유효한 경우에만 지원서 등록이 가능하다.
     // 기존에 있던 status field 우선 APRROVED로 입력시킨다.
     @Transactional
-    public boolean apply(String email, ApplyRequest applyRequest) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
+    public boolean apply(SiteUser siteUser, ApplyRequest applyRequest) {
         UniversityChoiceRequest universityChoiceRequest = applyRequest.universityChoiceRequest();
         validateUniversityChoices(universityChoiceRequest);
 

src/main/java/com/example/solidconnection/auth/controller/AuthController.java

@@ -8,6 +8,10 @@
 import com.example.solidconnection.auth.service.AuthService;
 import com.example.solidconnection.auth.service.SignInService;
 import com.example.solidconnection.auth.service.SignUpService;
+import com.example.solidconnection.custom.resolver.AuthorizedUser;
+import com.example.solidconnection.custom.resolver.ExpiredToken;
+import com.example.solidconnection.custom.security.authentication.ExpiredTokenAuthentication;
+import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -17,8 +21,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.security.Principal;
-
 @RequiredArgsConstructor
 @RequestMapping("/auth")
 @RestController
@@ -29,32 +31,42 @@ public class AuthController {
     private final SignInService signInService;
 
     @PostMapping("/kakao")
-    public ResponseEntity<KakaoOauthResponse> processKakaoOauth(@RequestBody KakaoCodeRequest kakaoCodeRequest) {
+    public ResponseEntity<KakaoOauthResponse> processKakaoOauth(
+            @RequestBody KakaoCodeRequest kakaoCodeRequest
+    ) {
         KakaoOauthResponse kakaoOauthResponse = signInService.signIn(kakaoCodeRequest);
         return ResponseEntity.ok(kakaoOauthResponse);
     }
 
     @PostMapping("/sign-up")
-    public ResponseEntity<SignUpResponse> signUp(@Valid @RequestBody SignUpRequest signUpRequest) {
+    public ResponseEntity<SignUpResponse> signUp(
+            @Valid @RequestBody SignUpRequest signUpRequest
+    ) {
         SignUpResponse signUpResponseDto = signUpService.signUp(signUpRequest);
         return ResponseEntity.ok(signUpResponseDto);
     }
 
     @PostMapping("/sign-out")
-    public ResponseEntity<Void> signOut(Principal principal) {
-        authService.signOut(principal.getName());
+    public ResponseEntity<Void> signOut(
+            @ExpiredToken ExpiredTokenAuthentication expiredToken
+    ) {
+        authService.signOut(expiredToken.getToken());
         return ResponseEntity.ok().build();
     }
 
     @PatchMapping("/quit")
-    public ResponseEntity<Void> quit(Principal principal) {
-        authService.quit(principal.getName());
+    public ResponseEntity<Void> quit(
+            @AuthorizedUser SiteUser siteUser
+    ) {
+        authService.quit(siteUser);
         return ResponseEntity.ok().build();
     }
 
     @PostMapping("/reissue")
-    public ResponseEntity<ReissueResponse> reissueToken(Principal principal) {
-        ReissueResponse reissueResponse = authService.reissue(principal.getName());
+    public ResponseEntity<ReissueResponse> reissueToken(
+            @ExpiredToken ExpiredTokenAuthentication expiredToken
+    ) {
+        ReissueResponse reissueResponse = authService.reissue(expiredToken.getSubject());
         return ResponseEntity.ok(reissueResponse);
     }
 }

src/main/java/com/example/solidconnection/auth/service/AuthService.java

@@ -4,7 +4,6 @@
 import com.example.solidconnection.auth.dto.ReissueResponse;
 import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -23,11 +22,8 @@
 @Service
 public class AuthService {
 
-    public static final String SIGN_OUT_VALUE = "signOut";
-
     private final RedisTemplate<String, String> redisTemplate;
     private final TokenProvider tokenProvider;
-    private final SiteUserRepository siteUserRepository;
 
     /*
      * 로그아웃 한다.
@@ -48,8 +44,7 @@ public void signOut(String accessToken) {
      * - e.g. 2024-01-01 18:00 탈퇴 시, 2024-01-02 00:00 가 탈퇴일이 된다.
      * */
     @Transactional
-    public void quit(String email) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
+    public void quit(SiteUser siteUser) {
         LocalDate tomorrow = LocalDate.now().plusDays(1);
         siteUser.setQuitedAt(tomorrow);
     }

src/main/java/com/example/solidconnection/auth/service/SignInService.java

@@ -7,12 +7,15 @@
 import com.example.solidconnection.auth.dto.kakao.KakaoOauthResponse;
 import com.example.solidconnection.auth.dto.kakao.KakaoUserInfoDto;
 import com.example.solidconnection.auth.domain.TokenType;
+import com.example.solidconnection.siteuser.domain.AuthType;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 @RequiredArgsConstructor
 @Service
 public class SignInService {
@@ -35,30 +38,30 @@ public class SignInService {
     public KakaoOauthResponse signIn(KakaoCodeRequest kakaoCodeRequest) {
         KakaoUserInfoDto kakaoUserInfoDto = kakaoOAuthClient.processOauth(kakaoCodeRequest.code());
         String email = kakaoUserInfoDto.kakaoAccountDto().email();
-        boolean isAlreadyRegistered = siteUserRepository.existsByEmail(email);
+        Optional<SiteUser> optionalSiteUser = siteUserRepository.findByEmailAndAuthType(email, AuthType.KAKAO);
 
-        if (isAlreadyRegistered) {
-            resetQuitedAt(email);
-            return getSignInInfo(email);
+        if (optionalSiteUser.isPresent()) {
+            SiteUser siteUser = optionalSiteUser.get();
+            resetQuitedAt(siteUser);
+            return getSignInInfo(siteUser);
         }
 
         return getFirstAccessInfo(kakaoUserInfoDto);
     }
 
     // 계적 복구 기한이 지난 회원은 자정마다 삭제된다. (UserRemovalScheduler 참고)
     // 따라서 DB 에서 조회되었다면 아직 기한이 지나지 않았다는 뜻이므로, 탈퇴 날짜를 초기화한다.
-    private void resetQuitedAt(String email) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
+    private void resetQuitedAt(SiteUser siteUser) {
         if (siteUser.getQuitedAt() == null) {
             return;
         }
 
         siteUser.setQuitedAt(null);
     }
 
-    private SignInResponse getSignInInfo(String email) {
-        String accessToken = tokenProvider.generateToken(email, TokenType.ACCESS);
-        String refreshToken = tokenProvider.generateToken(email, TokenType.REFRESH);
+    private SignInResponse getSignInInfo(SiteUser siteUser) {
+        String accessToken = tokenProvider.generateToken(siteUser, TokenType.ACCESS);
+        String refreshToken = tokenProvider.generateToken(siteUser, TokenType.REFRESH);
         tokenProvider.saveToken(refreshToken, TokenType.REFRESH);
         return new SignInResponse(true, accessToken, refreshToken);
     }

src/main/java/com/example/solidconnection/auth/service/SignUpService.java

@@ -10,6 +10,7 @@
 import com.example.solidconnection.repositories.InterestedCountyRepository;
 import com.example.solidconnection.repositories.InterestedRegionRepository;
 import com.example.solidconnection.repositories.RegionRepository;
+import com.example.solidconnection.siteuser.domain.AuthType;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import com.example.solidconnection.type.Role;
@@ -45,6 +46,7 @@ public class SignUpService {
      *   - 관심 국가와 지역은 site_user_id를 참조하므로, 사용자 저장 후 저장한다.
      * - 바로 로그인하도록 액세스 토큰과 리프레시 토큰을 발급한다.
      * */
+    // todo: 여러가지 가입 방법 적용해야 함
     @Transactional
     public SignUpResponse signUp(SignUpRequest signUpRequest) {
         // 검증
@@ -62,14 +64,14 @@ public SignUpResponse signUp(SignUpRequest signUpRequest) {
         saveInterestedCountry(signUpRequest, savedSiteUser);
 
         // 토큰 발급
-        String accessToken = tokenProvider.generateToken(email, TokenType.ACCESS);
-        String refreshToken = tokenProvider.generateToken(email, TokenType.REFRESH);
+        String accessToken = tokenProvider.generateToken(siteUser, TokenType.ACCESS);
+        String refreshToken = tokenProvider.generateToken(siteUser, TokenType.REFRESH);
         tokenProvider.saveToken(refreshToken, TokenType.REFRESH);
         return new SignUpResponse(accessToken, refreshToken);
     }
 
     private void validateUserNotDuplicated(String email) {
-        if (siteUserRepository.existsByEmail(email)) {
+        if (siteUserRepository.existsByEmailAndAuthType(email, AuthType.KAKAO)) {
             throw new CustomException(USER_ALREADY_EXISTED);
         }
     }

src/main/java/com/example/solidconnection/auth/service/TokenProvider.java

@@ -2,6 +2,7 @@
 
 import com.example.solidconnection.auth.domain.TokenType;
 import com.example.solidconnection.config.security.JwtProperties;
+import com.example.solidconnection.siteuser.domain.SiteUser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -12,8 +13,8 @@
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
-import static com.example.solidconnection.util.JwtUtils.parseSubjectIgnoringExpiration;
 import static com.example.solidconnection.util.JwtUtils.parseSubject;
+import static com.example.solidconnection.util.JwtUtils.parseSubjectIgnoringExpiration;
 
 @RequiredArgsConstructor
 @Component
@@ -22,8 +23,13 @@ public class TokenProvider {
     private final RedisTemplate<String, String> redisTemplate;
     private final JwtProperties jwtProperties;
 
-    public String generateToken(String email, TokenType tokenType) {
-        Claims claims = Jwts.claims().setSubject(email);
+    public String generateToken(SiteUser siteUser, TokenType tokenType) {
+        String subject = siteUser.getId().toString();
+        return generateToken(subject, tokenType);
+    }
+
+    public String generateToken(String string, TokenType tokenType) {
+        Claims claims = Jwts.claims().setSubject(string);
         Date now = new Date();
         Date expiredDate = new Date(now.getTime() + tokenType.getExpireTime());
         return Jwts.builder()