Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: 회원가입과 로그인 메소드 분리 #133

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Refactor: 회원가입과 로그인 메소드 분리 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/main/java/cotato/growingpain/auth/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,22 @@ public class AuthController {
private final AuthService authService;
private final ValidateService validateService;

@Operation(summary = "일반 로그인", description = "회원가입 및 로그인을 위한 메소드")
@Operation(summary = "회원가입", description = "회원가입을 위한 메소드")
@ApiResponse(content = @Content(schema = @Schema(implementation = LoginResponse.class)))
@PostMapping("/login/general")
@PostMapping("/join")
@ResponseStatus(HttpStatus.OK )
public Response<LoginResponse> joinAuth(@RequestBody @Valid LoginRequest request) {
log.info("[회원가입 컨트롤러]: {}", request.email());
return Response.createSuccess("회원가입 완료", authService.joinAuth(AuthProvider.GENERAL, request));
}

@Operation(summary = "일반 로그인", description = "일반 로그인을 위한 메소드")
@ApiResponse(content = @Content(schema = @Schema(implementation = LoginResponse.class)))
@PostMapping("/login/general")
@ResponseStatus(HttpStatus.OK )
public Response<LoginResponse> createLoginInfo(@RequestBody @Valid LoginRequest request) {
log.info("[일반 로그인 컨트롤러]: {}", request.email());
return Response.createSuccess("회원가입 및 로그인 완료", authService.createLoginInfo(AuthProvider.GENERAL, request));
return Response.createSuccess("일반 로그인 완료", authService.createLoginInfo(request));
}

@Operation(summary = "추가 정보 입력", description = "최초 로그인 (회원가입) 시 추가 정보를 입력하는 메소드")
Expand Down
53 changes: 25 additions & 28 deletions src/main/java/cotato/growingpain/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import cotato.growingpain.security.jwt.dto.request.ReissueRequest;
import cotato.growingpain.security.jwt.dto.response.ReissueResponse;
import cotato.growingpain.security.oauth.AuthProvider;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
Expand All @@ -43,47 +42,45 @@ public class AuthService {
private final BlackListRepository blackListRepository;

@Transactional
public LoginResponse createLoginInfo(AuthProvider authProvider, LoginRequest request) {
public LoginResponse joinAuth(AuthProvider authProvider, LoginRequest request){
// 신규 회원일 경우 회원가입 처리
validateService.checkPasswordPattern(request.password());
validateService.checkDuplicateEmail(request.email());

Optional<Member> existingMember = memberRepository.findByEmail(request.email());
log.info("[회원가입 서비스] 회원가입: {}", request.email());

if (existingMember.isPresent()) {
Member member = registerMember(authProvider, request.email(), request.password());

// 기존 회원이 존재하면 로그인 처리
Member member = existingMember.get();
if (!bCryptPasswordEncoder.matches(request.password(), member.getPassword())) {
throw new AppException(ErrorCode.WRONG_PASSWORD);
}
// 회원가입 성공 후 토큰 생성 및 반환
Token token = jwtTokenProvider.createToken(member.getId(), member.getEmail(), MemberRole.PENDING.getDescription());

log.info("[회원가입 서비스] 로그인: {}", request.email());
saveOrUpdateRefreshToken(member.getEmail(), token.getRefreshToken());

String role = (member.getMemberRole() == MemberRole.PENDING)
? MemberRole.PENDING.getDescription()
: MemberRole.MEMBER.getDescription();
return new LoginResponse(token, member.getId(), null, null, null);
}

Token token = jwtTokenProvider.createToken(member.getId(), member.getEmail(), role);
@Transactional
public LoginResponse createLoginInfo(LoginRequest request) {

// RefreshTokenEntity 저장 또는 업데이트
saveOrUpdateRefreshToken(member.getEmail(), token.getRefreshToken());
Member member = memberRepository.findByEmail(request.email())
.orElseThrow(() -> new AppException(ErrorCode.MEMBER_NOT_FOUND));

return new LoginResponse(token, member.getId(), member.getName(), member.getField(), member.getProfileImageUrl());
if (!bCryptPasswordEncoder.matches(request.password(), member.getPassword())) {
throw new AppException(ErrorCode.WRONG_PASSWORD);
}
else {
// 신규 회원일 경우 회원가입 처리
validateService.checkPasswordPattern(request.password());
validateService.checkDuplicateEmail(request.email());

log.info("[회원가입 서비스] 회원가입: {}", request.email());
log.info("[로그인 서비스] 로그인: {}", request.email());

Member member = registerMember(authProvider, request.email(), request.password());
String role = (member.getMemberRole() == MemberRole.PENDING)
? MemberRole.PENDING.getDescription()
: MemberRole.MEMBER.getDescription();

// 회원가입 성공 후 토큰 생성 및 반환
Token token = jwtTokenProvider.createToken(member.getId(), member.getEmail(), MemberRole.PENDING.getDescription());
Token token = jwtTokenProvider.createToken(member.getId(), member.getEmail(), role);

saveOrUpdateRefreshToken(member.getEmail(), token.getRefreshToken());
// RefreshTokenEntity 저장 또는 업데이트
saveOrUpdateRefreshToken(member.getEmail(), token.getRefreshToken());

return new LoginResponse(token, null, null, null, null);
}
return new LoginResponse(token, member.getId(), member.getName(), member.getField(), member.getProfileImageUrl());
}

private Member registerMember(AuthProvider authProvider, String email, String password) {
Expand Down