Skip to content

Commit 16ba812

Browse files
committed
feat: 로그인 API 반환 수정
1 parent 795260d commit 16ba812

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

src/main/java/com/oronaminc/join/member/security/AuthController.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.oronaminc.join.member.security;
22

3+
import static com.oronaminc.join.member.util.MemberMapper.toSessionInfoResponse;
4+
35
import java.util.List;
46

57
import org.springframework.http.HttpStatus;
@@ -46,7 +48,7 @@ public class AuthController {
4648
)
4749
@PostMapping("/kakao")
4850
@ResponseStatus(HttpStatus.OK)
49-
public KakaoLoginResponse kakaoLogin(
51+
public SessionInfoResponse kakaoLogin(
5052
@RequestBody KakaoLoginRequest kakaoLoginRequest,
5153
HttpServletRequest request
5254
) {
@@ -64,7 +66,7 @@ public KakaoLoginResponse kakaoLogin(
6466

6567
request.getSession(true).setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context);
6668

67-
return new KakaoLoginResponse(memberDetails.getId());
69+
return toSessionInfoResponse(memberDetails);
6870
}
6971

7072
@Operation(
@@ -77,7 +79,7 @@ public KakaoLoginResponse kakaoLogin(
7779
)
7880
@PostMapping("/guest")
7981
@ResponseStatus(HttpStatus.CREATED)
80-
public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guestLoginRequest, HttpServletRequest request) {
82+
public SessionInfoResponse guestLogin(@RequestBody @Valid GuestLoginRequest guestLoginRequest, HttpServletRequest request) {
8183
MemberDetails guest = authService.loadGuest(guestLoginRequest);
8284

8385
Authentication authentication = new UsernamePasswordAuthenticationToken(
@@ -90,7 +92,7 @@ public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guest
9092

9193
request.getSession(true).setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context);
9294

93-
return new GuestLoginResponse(guest.getId());
95+
return toSessionInfoResponse(guest);
9496
}
9597

9698
@Operation(
@@ -106,12 +108,7 @@ public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guest
106108
@ResponseStatus(HttpStatus.OK)
107109
public SessionInfoResponse getSessionInfo(@AuthenticationPrincipal MemberDetails memberDetails) {
108110

109-
return new SessionInfoResponse(
110-
memberDetails.getId(),
111-
memberDetails.getName(),
112-
memberDetails.getNickname(),
113-
memberDetails.getRole()
114-
);
111+
return toSessionInfoResponse(memberDetails);
115112
}
116113

117114
@Operation(

src/main/java/com/oronaminc/join/member/util/MemberMapper.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.oronaminc.join.member.util;
22

3+
import com.oronaminc.join.member.dto.SessionInfoResponse;
34
import java.util.Map;
45

56
import com.oronaminc.join.member.domain.Member;
@@ -65,4 +66,13 @@ public static KakaoUserResponse toKakaoUserResponse(Map<String, Object> kakaoAcc
6566
.profileImageUrl((String) profile.get("profile_image_url"))
6667
.build();
6768
}
69+
70+
public static SessionInfoResponse toSessionInfoResponse(MemberDetails memberDetails) {
71+
return new SessionInfoResponse(
72+
memberDetails.getId(),
73+
memberDetails.getName(),
74+
memberDetails.getNickname(),
75+
memberDetails.getRole()
76+
);
77+
}
6878
}

0 commit comments

Comments
 (0)