Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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 @@ -87,7 +87,7 @@ public ApiResponse<?> logout(

@Operation(summary = "회원 정보 조회", description =
"# 회원 정보 조회 API 입니다. \n" +
"현재는 jwt token을 구현하지 않아 pathvariable로 userId를 넣어주세요.추후 jwt token이 구현되면 수정하겠습니다."
"access token을 header에 입력해주세요."
)
@GetMapping("/info")
public ApiResponse<UserResponseDTO.User> getUserInfo(
Expand All @@ -100,7 +100,7 @@ public ApiResponse<UserResponseDTO.User> getUserInfo(

@Operation(summary = "회원 정보 수정", description =
"# 회원 정보 수정 API 입니다. \n" +
"현재는 jwt token을 구현하지 않아 pathvariable로 userId를 넣어주세요.추후 jwt token이 구현되면 수정하겠습니다."
"access token을 header에 입력해주세요."
)
@PatchMapping("/info")
public ApiResponse<UserResponseDTO.User> updateUserInfo(
Expand All @@ -114,8 +114,7 @@ public ApiResponse<UserResponseDTO.User> updateUserInfo(

@Operation(summary = "이메일로 회원 리스트 조회", description =
"# 유사한 이메일을 가진 회원을 최대 4명까지 조회하는 API 입니다. \n" +
"workspace에서 회원을 초대할 때 사용할 기능입니다. \n" +
"현재는 jwt token을 구현하지 않아 pathvariable로 userId를 넣어주세요.추후 jwt token이 구현되면 수정하겠습니다."
"workspace에서 회원을 초대할 때 사용할 기능입니다. \n"
)
@GetMapping("/search")
public ApiResponse<List<UserResponseDTO.User>> searchUsers(
Expand Down Expand Up @@ -153,4 +152,17 @@ public ApiResponse<UserResponseDTO.CheckOriginalPasswordResponse> checkOriginalP
) {
return ApiResponse.onSuccess(userCommandService.checkOriginalPassword(request, user));
}

@Operation(summary = "회원가입 후 로그인", description =
"# [v1.0 (2025-08-15)](https://www.notion.so/2505da7802c5808583b9d0b08087b8e5)" +
" 회원가입 후 로그인까지 진행하는 API입니다."
)
@PostMapping("/signup-and-login")
public ApiResponse<UserResponseDTO.LoginResponse> signUpAndLogin(
@RequestBody @Valid UserRequestDTO.SignUpRequest request
) {
UserResponseDTO.LoginResponse response = userCommandService.signupAndLogin(request);

return ApiResponse.onSuccess(response);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
private static final String[] whitelist = {
"/api/v1/users/signup",
"/api/v1/users/login",
"/api/v1/users/signup-and-login",
"/swagger-ui/**",
"/v3/**",
"/users/admin/**",
Expand All @@ -41,6 +42,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
"/api/v1/sns/oauth/callback",
"/api/v1/users/signup/same",
"/favicon.ico"

};
private final JwtUtils jwtUtils;
private final RedisTemplate<String, String> redisTemplate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ public interface UserCommandService {
UserResponseDTO.CheckEmailDuplicationResponse checkEmailDuplication(UserRequestDTO.CheckEmailDuplicationRequest request);

UserResponseDTO.CheckOriginalPasswordResponse checkOriginalPassword(UserRequestDTO.CheckOriginalPasswordRequest request, User user);

UserResponseDTO.LoginResponse signupAndLogin(UserRequestDTO.SignUpRequest request);
}
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,24 @@ public UserResponseDTO.CheckEmailDuplicationResponse checkEmailDuplication(UserR
public UserResponseDTO.CheckOriginalPasswordResponse checkOriginalPassword(UserRequestDTO.CheckOriginalPasswordRequest request, User user) {
return UserConverter.toCheckOriginalPassword(passwordEncoder.matches(request.getRequestPassword(), user.getPassword()));
}

@Override
public UserResponseDTO.LoginResponse signupAndLogin(UserRequestDTO.SignUpRequest request) {

String password = passwordEncoder.encode(request.getPassword());

User foundUser = userRepository.findByEmail(request.getEmail()).orElse(null);

if (foundUser != null) {
throw new MemberHandler(ErrorStatus.MEMBER_ALREADY_EXISTS);
} else {
User user = UserConverter.toUsers(request, password);
userRepository.save(user);

return login(UserRequestDTO.LoginRequest.builder()
.email(request.getEmail())
.password(request.getPassword())
.build());
}
}
}