Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public Optional<User> getUserBySocialAndSocialId(UserSocial social, String socia
* @param request 회원가입을 위한 추가 정보
*/
@Override
public void createUser(TempUserInfo tempUserInfo, UserSignUpRequest request) throws IOException {
public User createUser(TempUserInfo tempUserInfo, UserSignUpRequest request) throws IOException {

String thumbnailImage = "thumbnail";

Expand All @@ -123,6 +123,8 @@ public void createUser(TempUserInfo tempUserInfo, UserSignUpRequest request) thr
userAuditoriumRepository.save(userAuditorium);
}
}

return user;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public interface UserUseCase {
Optional<User> getUserBySocialAndSocialId(UserSocial social, String socialId);

// 사용자 생성
void createUser(TempUserInfo tempUserInfo, UserSignUpRequest request) throws IOException;
User createUser(TempUserInfo tempUserInfo, UserSignUpRequest request) throws IOException;

// redis, cookie - refreshToken 삭제 (로그아웃)
void logout(HttpServletRequest request, HttpServletResponse response);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.seeat.server.domain.user.application.dto.response.UserNicknameResponse;
import com.seeat.server.domain.user.application.usecase.UserUseCase;
import com.seeat.server.domain.user.application.dto.request.UserSignUpRequest;
import com.seeat.server.domain.user.domain.entity.User;
import com.seeat.server.domain.user.domain.entity.UserRole;
import com.seeat.server.domain.user.presentation.swagger.UserControllerSpec;
import com.seeat.server.global.response.ApiResponse;
Expand Down Expand Up @@ -39,6 +40,7 @@ public class UserController implements UserControllerSpec {
*/
@PostMapping()
public ApiResponse<Void> userSignUp(
HttpServletResponse response,
@RequestBody @Valid UserSignUpRequest request,
@RequestHeader("Temp-User-Key") String tempUserKey) throws IOException {

Expand All @@ -48,7 +50,12 @@ public ApiResponse<Void> userSignUp(

throw new CustomException(ErrorCode.NOT_TEMP_USER, null);
}
userService.createUser(tempUserInfo, request);
User user = userService.createUser(tempUserInfo, request);

// 토큰 발급
tokenService.generateTokensAndSetHeaders(response, user);

// 임시유저 정보 삭제
redisService.deleteValues(tempUserKey);

return ApiResponse.created();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.seeat.server.domain.user.application.dto.response.UserNicknameResponse;
import com.seeat.server.global.response.ApiResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
Expand All @@ -18,6 +19,7 @@ public interface UserControllerSpec {
/**
* 회원가입 API
*
* @param response 토큰을 헤더 및 쿠키에 설정하기 위한 HTTP 응답 객체
* @param request 추가 정보 요청값
* @param tempUserKey 임시유저정보
* @return 회원가입 완료 응답
Expand All @@ -28,6 +30,7 @@ public interface UserControllerSpec {
description = "최초 로그인 추가 회원가입입니다."
)
ApiResponse<Void> userSignUp(
@Parameter(hidden = true) HttpServletResponse response,
@RequestBody @Valid UserSignUpRequest request,
@RequestHeader String tempUserKey
) throws IOException;
Expand Down
Loading