Merge pull request #55 from team-crews/fix/#54-fix-minor-bugs

배포 후 사소한 오류 및 리프레시 토큰 생성 로직 수정
team-crews · Aug 30, 2024 · 44590b4 · 44590b4
2 parents c96d01b + 55fa3dc
commit 44590b4
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 33 deletions.
diff --git a/src/main/java/com/server/crews/auth/application/AuthService.java b/src/main/java/com/server/crews/auth/application/AuthService.java
@@ -31,7 +31,7 @@ public AdminLoginResponse loginForAdmin(AdminLoginRequest request) {
         Administrator administrator = administratorRepository.findByClubName(clubName)
                 .orElseGet(() -> createAdmin(clubName, password));
         String accessToken = jwtTokenProvider.createAccessToken(Role.ADMIN, clubName);
-        return new AdminLoginResponse(administrator.getId(), accessToken);
+        return new AdminLoginResponse(administrator.getClubName(), accessToken);
     }
 
     private Administrator createAdmin(String clubName, String password) {
@@ -47,7 +47,7 @@ public ApplicantLoginResponse loginForApplicant(ApplicantLoginRequest request) {
         Applicant applicant = applicantRepository.findByEmail(email)
                 .orElseGet(() -> createApplicant(email, password));
         String accessToken = jwtTokenProvider.createAccessToken(Role.APPLICANT, email);
-        return new ApplicantLoginResponse(applicant.getId(), accessToken);
+        return new ApplicantLoginResponse(applicant.getEmail(), accessToken);
     }
 
     private Applicant createApplicant(String email, String password) {

diff --git a/src/main/java/com/server/crews/auth/application/RefreshTokenService.java b/src/main/java/com/server/crews/auth/application/RefreshTokenService.java
@@ -27,21 +27,24 @@ public RefreshTokenService(JwtTokenProvider jwtTokenProvider, RefreshTokenReposi
     }
 
     @Transactional
-    public RefreshTokenWithValidity createRefreshToken(Role role, Long id) {
-        String refreshToken = jwtTokenProvider.createRefreshToken(role, String.valueOf(id));
-        refreshTokenRepository.deleteByOwnerId(id);
-        refreshTokenRepository.save(new RefreshToken(refreshToken, id));
+    public RefreshTokenWithValidity createRefreshToken(Role role, String username) {
+        String refreshToken = jwtTokenProvider.createRefreshToken(role, username);
+        refreshTokenRepository.deleteByUsername(username);
+        refreshTokenRepository.save(new RefreshToken(username, refreshToken));
         return new RefreshTokenWithValidity(refreshTokenValidityInSecond, refreshToken);
     }
 
     public TokenRefreshResponse renew(String refreshToken) {
         jwtTokenProvider.validateRefreshToken(refreshToken);
-        refreshTokenRepository.findByToken(refreshToken)
-                .orElseThrow(() -> new CrewsException(ErrorCode.INVALID_REFRESH_TOKEN));
+        String username = jwtTokenProvider.getPayload(refreshToken);
+        RefreshToken savedRefreshToken = refreshTokenRepository.findByUsername(username)
+                .orElseThrow(() -> new CrewsException(ErrorCode.REFRESH_TOKEN_NOT_FOUND));
+        if (!savedRefreshToken.isSameToken(refreshToken)) {
+            throw new CrewsException(ErrorCode.INVALID_REFRESH_TOKEN);
+        }
 
-        String payload = jwtTokenProvider.getPayload(refreshToken);
         Role role = jwtTokenProvider.getRole(refreshToken);
-        String accessToken = jwtTokenProvider.createAccessToken(role, payload);
+        String accessToken = jwtTokenProvider.createAccessToken(role, username);
         return new TokenRefreshResponse(accessToken);
     }
 }
diff --git a/src/main/java/com/server/crews/auth/domain/RefreshToken.java b/src/main/java/com/server/crews/auth/domain/RefreshToken.java
@@ -2,29 +2,30 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @Entity
+@Table(name = "refresh_token")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class RefreshToken {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    @Column(name = "username")
+    private String username;
 
-    @Column(nullable = false)
+    @Column(nullable = false, name = "token")
     private String token;
 
-    @Column(nullable = false)
-    private Long ownerId;
-
-    public RefreshToken(final String token, final Long ownerId) {
+    public RefreshToken(String username, String token) {
+        this.username = username;
         this.token = token;
-        this.ownerId = ownerId;
+    }
+
+    public boolean isSameToken(String token) {
+        return this.token.equals(token);
     }
 }
diff --git a/src/main/java/com/server/crews/auth/dto/response/AdminLoginResponse.java b/src/main/java/com/server/crews/auth/dto/response/AdminLoginResponse.java
@@ -1,4 +1,4 @@
 package com.server.crews.auth.dto.response;
 
-public record AdminLoginResponse(Long adminId, String accessToken) {
+public record AdminLoginResponse(String username, String accessToken) {
 }
diff --git a/src/main/java/com/server/crews/auth/dto/response/ApplicantLoginResponse.java b/src/main/java/com/server/crews/auth/dto/response/ApplicantLoginResponse.java
@@ -1,4 +1,4 @@
 package com.server.crews.auth.dto.response;
 
-public record ApplicantLoginResponse(Long applicantId, String accessToken) {
+public record ApplicantLoginResponse(String username, String accessToken) {
 }
diff --git a/src/main/java/com/server/crews/auth/presentation/AuthController.java b/src/main/java/com/server/crews/auth/presentation/AuthController.java
@@ -34,7 +34,7 @@ public class AuthController {
     public ResponseEntity<AdminLoginResponse> loginForAdmin(@RequestBody AdminLoginRequest request) {
         AdminLoginResponse loginResponse = authService.loginForAdmin(request);
         RefreshTokenWithValidity refreshTokenWithValidity = refreshTokenService.createRefreshToken(Role.ADMIN,
-                loginResponse.adminId());
+                loginResponse.username());
         ResponseCookie cookie = refreshTokenWithValidity.toCookie();
         return ResponseEntity.status(HttpStatus.OK)
                 .header(HttpHeaders.SET_COOKIE, cookie.toString())
@@ -48,7 +48,7 @@ public ResponseEntity<AdminLoginResponse> loginForAdmin(@RequestBody AdminLoginR
     public ResponseEntity<ApplicantLoginResponse> loginForApplicant(@RequestBody ApplicantLoginRequest request) {
         ApplicantLoginResponse loginResponse = authService.loginForApplicant(request);
         RefreshTokenWithValidity refreshTokenWithValidity = refreshTokenService.createRefreshToken(Role.APPLICANT,
-                loginResponse.applicantId());
+                loginResponse.username());
         ResponseCookie cookie = refreshTokenWithValidity.toCookie();
         return ResponseEntity.status(HttpStatus.OK)
                 .header(HttpHeaders.SET_COOKIE, cookie.toString())

diff --git a/src/main/java/com/server/crews/auth/repository/RefreshTokenRepository.java b/src/main/java/com/server/crews/auth/repository/RefreshTokenRepository.java
@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RefreshTokenRepository extends JpaRepository<RefreshToken, String> {
-    void deleteByOwnerId(Long id);
+    void deleteByUsername(String username);
 
-    Optional<RefreshToken> findByToken(String token);
+    Optional<RefreshToken> findByUsername(String username);
 }
diff --git a/src/main/java/com/server/crews/global/exception/ErrorCode.java b/src/main/java/com/server/crews/global/exception/ErrorCode.java
@@ -25,6 +25,7 @@ public enum ErrorCode {
     INVALID_ACCESS_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 access token 입니다."),
     USER_NOT_FOUND(HttpStatus.UNAUTHORIZED, "존재하지 않는 사용자입니다."),
     UNAUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "권한이 없는 사용자입니다."),
+    REFRESH_TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "존재하지 않는 리프레시 토큰입니다."),
 
     RECRUITMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 모집 지원서 양식입니다."),
     APPLICATION_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 지원서입니다."),

diff --git a/src/main/java/com/server/crews/recruitment/application/RecruitmentService.java b/src/main/java/com/server/crews/recruitment/application/RecruitmentService.java
@@ -74,7 +74,8 @@ public RecruitmentStateInProgressResponse findRecruitmentStateInProgress(Long pu
         Recruitment recruitment = recruitmentRepository.findByPublisher(publisherId)
                 .orElseThrow(() -> new CrewsException(ErrorCode.RECRUITMENT_NOT_FOUND));
         int applicationCount = applicationRepository.countAllByRecruitment(recruitment);
-        return new RecruitmentStateInProgressResponse(applicationCount, recruitment.getDeadline());
+        return new RecruitmentStateInProgressResponse(applicationCount, recruitment.getDeadline(),
+                recruitment.getCode());
     }
 
     public Optional<RecruitmentDetailsResponse> findRecruitmentDetailsInReady(Long publisherId) {

diff --git a/...in/java/com/server/crews/recruitment/dto/response/RecruitmentStateInProgressResponse.java b/...in/java/com/server/crews/recruitment/dto/response/RecruitmentStateInProgressResponse.java
@@ -2,5 +2,5 @@
 
 import java.time.LocalDateTime;
 
-public record RecruitmentStateInProgressResponse(int applicationCount, LocalDateTime deadline) {
+public record RecruitmentStateInProgressResponse(int applicationCount, LocalDateTime deadline, String code) {
 }
diff --git a/src/main/resources/config b/src/main/resources/config
diff --git a/src/test/java/com/server/crews/auth/application/AuthServiceTest.java b/src/test/java/com/server/crews/auth/application/AuthServiceTest.java
@@ -44,7 +44,7 @@ void loginNotSignedUpAdmin() {
         AdminLoginResponse adminLoginResponse = authService.loginForAdmin(request);
 
         // then
-        Optional<Administrator> createdAdmin = administratorRepository.findById(adminLoginResponse.adminId());
+        Optional<Administrator> createdAdmin = administratorRepository.findByClubName(adminLoginResponse.username());
         assertSoftly(softAssertions -> {
             softAssertions.assertThat(createdAdmin).isNotEmpty();
             softAssertions.assertThat(adminLoginResponse.accessToken()).isNotNull();
@@ -62,7 +62,7 @@ void loginAdmin() {
         AdminLoginResponse adminLoginResponse = authService.loginForAdmin(request);
 
         // then
-        Optional<Administrator> createdAdmin = administratorRepository.findById(adminLoginResponse.adminId());
+        Optional<Administrator> createdAdmin = administratorRepository.findByClubName(adminLoginResponse.username());
         assertSoftly(softAssertions -> {
             softAssertions.assertThat(createdAdmin).isNotEmpty();
             softAssertions.assertThat(adminLoginResponse.accessToken()).isNotNull();
@@ -81,7 +81,7 @@ void loginNotSignedUpApplicant() {
         ApplicantLoginResponse applicantLoginResponse = authService.loginForApplicant(request);
 
         // then
-        Optional<Applicant> createdApplicant = applicantRepository.findById(applicantLoginResponse.applicantId());
+        Optional<Applicant> createdApplicant = applicantRepository.findByEmail(applicantLoginResponse.username());
         assertSoftly(softAssertions -> {
             softAssertions.assertThat(createdApplicant).isNotEmpty();
             softAssertions.assertThat(applicantLoginResponse.accessToken()).isNotNull();
@@ -99,7 +99,7 @@ void loginApplicant() {
         ApplicantLoginResponse applicantLoginResponse = authService.loginForApplicant(request);
 
         // then
-        Optional<Applicant> createdApplicant = applicantRepository.findById(applicantLoginResponse.applicantId());
+        Optional<Applicant> createdApplicant = applicantRepository.findByEmail(applicantLoginResponse.username());
         assertSoftly(softAssertions -> {
             softAssertions.assertThat(createdApplicant).isNotEmpty();
             softAssertions.assertThat(applicantLoginResponse.accessToken()).isNotNull();