Merge pull request #341 from woowacourse-teams/dev/be

woowacourse-teams · Aug 7, 2024 · a995dc0 · a995dc0
2 parents 0d3ca5b + 6169c8e
commit a995dc0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/backend/src/main/java/codezap/member/controller/MemberController.java b/backend/src/main/java/codezap/member/controller/MemberController.java
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import codezap.member.dto.LoginRequest;
+import codezap.member.dto.LoginResponse;
 import codezap.member.dto.MemberDto;
 import codezap.member.dto.SignupRequest;
 import codezap.member.service.MemberService;
@@ -48,7 +49,7 @@ public void checkUniqueUsername(@RequestParam String username) {
 
     @PostMapping("/login")
     @ResponseStatus(HttpStatus.OK)
-    public void login(@Valid @RequestBody LoginRequest request, HttpServletResponse response) {
+    public LoginResponse login(@Valid @RequestBody LoginRequest request, HttpServletResponse response) {
         MemberDto member = memberService.login(request);
         String basicAuth = HttpHeaders.encodeBasicAuth(member.email(), member.password(), StandardCharsets.UTF_8);
         ResponseCookie cookie = ResponseCookie.from(HttpHeaders.AUTHORIZATION, basicAuth)
@@ -59,6 +60,7 @@ public void login(@Valid @RequestBody LoginRequest request, HttpServletResponse
                 .httpOnly(true)
                 .build();
         response.setHeader(HttpHeaders.SET_COOKIE, cookie.toString());
+        return new LoginResponse(member.id(), member.username());
     }
 
     @GetMapping("/login/check")
@@ -67,7 +69,6 @@ public void checkLogin(HttpServletRequest request) {
         memberService.checkLogin(request.getCookies());
     }
 
-
     @PostMapping("/logout")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void logout(HttpServletResponse response) {

diff --git a/backend/src/main/java/codezap/member/controller/SpringDocMemberController.java b/backend/src/main/java/codezap/member/controller/SpringDocMemberController.java
@@ -8,6 +8,7 @@
 
 import codezap.global.swagger.error.ProblemDetailSchema;
 import codezap.member.dto.LoginRequest;
+import codezap.member.dto.LoginResponse;
 import codezap.member.dto.SignupRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.headers.Header;
@@ -297,7 +298,7 @@ public interface SpringDocMemberController {
                     }
             )
     )
-    void login(LoginRequest request, HttpServletResponse response);
+    LoginResponse login(LoginRequest request, HttpServletResponse response);
 
     @Operation(summary = "이메일 로그인 후 쿠키 인증")
     @ApiResponse(responseCode = "200", description = "쿠키 인증 성공")

diff --git a/backend/src/main/java/codezap/member/dto/LoginResponse.java b/backend/src/main/java/codezap/member/dto/LoginResponse.java
@@ -0,0 +1,7 @@
+package codezap.member.dto;
+
+public record LoginResponse(
+        long memberId,
+        String username
+) {
+}
diff --git a/backend/src/main/java/codezap/member/service/MemberService.java b/backend/src/main/java/codezap/member/service/MemberService.java
@@ -51,14 +51,4 @@ public void assertUniqueUsername(String username) {
             throw new CodeZapException(HttpStatus.CONFLICT, "사용자명이 이미 존재합니다.");
         }
     }
-
-    public void validateMemberId(MemberDto memberDto, Long memberId) {
-        if (!memberId.equals(memberDto.id())) {
-            throw new CodeZapException(HttpStatus.UNAUTHORIZED, "다른 사람의 템플릿은 확인할 수 없습니다.");
-        }
-
-        if (!memberRepository.existsById(memberId)) {
-            throw new CodeZapException(HttpStatus.UNAUTHORIZED, "로그인 정보가 잘못되었습니다.");
-        }
-    }
 }