Merge pull request #214 from JNU-econovation/feature/BE-79

[BE-79] feat : 로그인 실패 시 쿠키 삭제
JNU-econovation · Mar 9, 2024 · 767e611 · 767e611
2 parents 1b0626e + 5a0b024
commit 767e611
Show file tree

Hide file tree

Showing 27 changed files with 72 additions and 10 deletions.
diff --git a/.github/.DS_Store b/.github/.DS_Store
diff --git a/.gradle/7.6.1/checksums/checksums.lock b/.gradle/7.6.1/checksums/checksums.lock
diff --git a/.gradle/7.6.1/checksums/md5-checksums.bin b/.gradle/7.6.1/checksums/md5-checksums.bin
diff --git a/.gradle/7.6.1/checksums/sha1-checksums.bin b/.gradle/7.6.1/checksums/sha1-checksums.bin
diff --git a/.gradle/7.6.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.6.1/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/7.6.1/dependencies-accessors/gc.properties b/.gradle/7.6.1/dependencies-accessors/gc.properties
diff --git a/.gradle/7.6.1/executionHistory/executionHistory.bin b/.gradle/7.6.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.6.1/executionHistory/executionHistory.lock b/.gradle/7.6.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.6.1/fileChanges/last-build.bin b/.gradle/7.6.1/fileChanges/last-build.bin
diff --git a/.gradle/7.6.1/fileHashes/fileHashes.bin b/.gradle/7.6.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.6.1/fileHashes/fileHashes.lock b/.gradle/7.6.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.6.1/fileHashes/resourceHashesCache.bin b/.gradle/7.6.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/7.6.1/gc.properties b/.gradle/7.6.1/gc.properties
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
diff --git a/server/.gitignore b/server/.gitignore
@@ -0,0 +1,51 @@
+Recruit-Domain/HELP.md
+.gradle
+.gradle/**
+.server/.gradle/**
+.server/.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+.DS_Store
+./**/.DS_Store
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+server/.env
+.env
+.env.*
+
+*.xlsx
+/Recruit-Domain/src/main/generated/
+Recruit-Domain/src/main/generated/**/*.java
+
+# Ignore Gradle build output directory
+build
diff --git a/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/server/.gradle/buildOutputCleanup/cache.properties b/server/.gradle/buildOutputCleanup/cache.properties
diff --git a/server/.gradle/buildOutputCleanup/outputFiles.bin b/server/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/server/.gradle/file-system.probe b/server/.gradle/file-system.probe
diff --git a/server/.gradle/vcs-1/gc.properties b/server/.gradle/vcs-1/gc.properties
diff --git a/...Recruit-Api/src/main/java/com/econovation/recruit/api/user/controller/UserController.java b/...Recruit-Api/src/main/java/com/econovation/recruit/api/user/controller/UserController.java
@@ -57,14 +57,15 @@ public ResponseEntity<TokenResponse> issueToken() {
     @PostMapping("/login")
     public ResponseEntity<TokenResponse> login(
             @RequestBody LoginRequestDto loginRequestDto, HttpServletResponse response) {
-        TokenResponse tokenResponse = userLoginUseCase.execute(loginRequestDto);
+        TokenResponse tokenResponse = userLoginUseCase.execute(loginRequestDto, response);
         response.addHeader(
                 "Set-Cookie",
-                SecurityUtils.setCookie("refreshToken", tokenResponse.getRefreshToken())
+                SecurityUtils.logoutCookie("refreshToken", tokenResponse.getRefreshToken())
                         .toString());
         response.addHeader(
                 "Set-Cookie",
-                SecurityUtils.setCookie("accessToken", tokenResponse.getAccessToken()).toString());
+                SecurityUtils.logoutCookie("accessToken", tokenResponse.getAccessToken())
+                        .toString());
         return new ResponseEntity<>(tokenResponse, HttpStatus.OK);
     }
 

diff --git a/server/Recruit-Api/src/main/java/com/econovation/recruit/api/user/service/UserService.java b/server/Recruit-Api/src/main/java/com/econovation/recruit/api/user/service/UserService.java
@@ -13,6 +13,7 @@
 import com.econovation.recruitdomain.domains.interviewer.exception.InterviewerNotMatchException;
 import com.econovation.recruitdomain.out.InterviewerLoadPort;
 import com.econovation.recruitdomain.out.InterviewerRecordPort;
+import javax.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -28,11 +29,23 @@ public class UserService implements UserRegisterUseCase, UserLoginUseCase {
 
     @Override
     @Transactional
-    public TokenResponse execute(LoginRequestDto loginRequestDto) {
+    public TokenResponse execute(LoginRequestDto loginRequestDto, HttpServletResponse response) {
         Interviewer account =
                 interviewerLoadPort.loadInterviewerByEmail(loginRequestDto.getEmail());
         checkPassword(loginRequestDto.getPassword(), account.getPassword());
-        return jwtTokenProvider.createToken(account.getId(), account.getRole().name());
+        TokenResponse tokenResponse =
+                jwtTokenProvider.createToken(account.getId(), account.getRole().name());
+        response.addHeader(
+                "Set-Cookie",
+                com.econovation.recruit.utils.SecurityUtils.setCookie(
+                                "refreshToken", tokenResponse.getRefreshToken())
+                        .toString());
+        response.addHeader(
+                "Set-Cookie",
+                com.econovation.recruit.utils.SecurityUtils.setCookie(
+                                "accessToken", tokenResponse.getAccessToken())
+                        .toString());
+        return tokenResponse;
     }
 
     @Override

diff --git a/.../Recruit-Api/src/main/java/com/econovation/recruit/api/user/usecase/UserLoginUseCase.java b/.../Recruit-Api/src/main/java/com/econovation/recruit/api/user/usecase/UserLoginUseCase.java
@@ -3,10 +3,11 @@
 import com.econovation.recruitcommon.annotation.UseCase;
 import com.econovation.recruitcommon.dto.TokenResponse;
 import com.econovation.recruitdomain.domains.dto.LoginRequestDto;
+import javax.servlet.http.HttpServletResponse;
 
 @UseCase
 public interface UserLoginUseCase {
-    TokenResponse execute(LoginRequestDto loginRequestDto);
+    TokenResponse execute(LoginRequestDto loginRequestDto, HttpServletResponse response);
 
     TokenResponse refresh(String refreshToken);
 }