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.

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

Feat/#25 회원가입 로직에서 닉네임 중복 검사 추가 #31

Merged
merged 4 commits into from
Jun 23, 2024
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
6 changes: 3 additions & 3 deletions src/main/java/com/pyro/yolog/domain/member/api/SignApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
public interface SignApi {
@Operation(
summary = "회원가입",
description = "사용자의 닉네임을 입력받아 회원가입을 진행합니다.",
description = "사용자의 닉네임을 입력받아 회원가입을 진행합니다. 중복된 닉네임이 입력되면 false를 반환합니다.",
security = {@SecurityRequirement(name = "access_token")},
tags = {"로그인"}
)
@ApiResponses(value = {
@ApiResponse(
responseCode = "200",
responseCode = "201",
description = "회원가입이 성공적으로 완료되었습니다."
)
})
void signUp(@RequestBody SignUpRequest dto);
boolean signUp(@RequestBody SignUpRequest dto);

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
public class SignController {
private final SignUpService signUpService;

@ResponseStatus(HttpStatus.OK)
@ResponseStatus(HttpStatus.CREATED)
@PostMapping("/oauth2/sign-up")
public void signUp(@RequestBody SignUpRequest request) {
signUpService.signUp(request);
public boolean signUp(@RequestBody SignUpRequest request) {
return signUpService.signUp(request);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ public class Member extends BaseTimeEntity {

public void signUp(SignUpRequest dto) {
this.nickname = dto.getNickname();
this.role = Role.USER;
this.role = Role.GUEST;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.pyro.yolog.domain.member.repository;

import com.pyro.yolog.domain.member.entity.Member;
import com.pyro.yolog.domain.member.entity.Role;
import com.pyro.yolog.domain.member.entity.SocialType;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
Expand All @@ -12,5 +13,8 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
Optional<Member> findByEmail(String email);

Optional<Member> findBySocialTypeAndOauthId(SocialType socialType, String oauthId);

boolean existsByNicknameAndRole(String nickname, Role role);
boolean existsByNickname(String nickname);
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import com.pyro.yolog.domain.member.dto.SignUpRequest;
import com.pyro.yolog.domain.member.entity.Member;
import com.pyro.yolog.domain.member.entity.Role;
import com.pyro.yolog.domain.member.query.AuthService;
import com.pyro.yolog.domain.member.repository.MemberRepository;
import com.pyro.yolog.global.jwt.refresh.service.RefreshTokenService;
import com.pyro.yolog.global.jwt.service.JwtService;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand All @@ -17,16 +18,19 @@ public class SignUpService {
private final AuthService authService;
private final RefreshTokenService refreshTokenService;
private final JwtService jwtService;
private final HttpServletRequest request;
private final HttpServletResponse response;
private final MemberRepository memberRepository;

@Transactional
public void signUp(SignUpRequest request) {
public boolean signUp(SignUpRequest request) {
if (memberRepository.existsByNickname(request.getNickname())) {
return false;
}
Member member = authService.getLoginUser();
member.signUp(request);

String refreshToken = jwtService.createRefreshToken();
jwtService.setRefreshTokenHeader(response, refreshToken);
refreshTokenService.updateToken(member.getEmail(), refreshToken);
return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public class SecurityConfig {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http
.formLogin(AbstractHttpConfigurer::disable) //FormLogin 사용 X
.httpBasic(AbstractHttpConfigurer::disable) //httpBasic 사용 X
.csrf(AbstractHttpConfigurer::disable) //csrf 보안 사용 X
.formLogin(AbstractHttpConfigurer::disable)
.httpBasic(AbstractHttpConfigurer::disable)
.csrf(AbstractHttpConfigurer::disable)
.headers(c -> c.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable).disable())
.sessionManagement(sessionManagement ->
sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Member toEntity(SocialType socialType, OAuth2UserInfo oauth2UserInfo) {
.email(oauth2UserInfo.getEmail())
.nickname(oauth2UserInfo.getNickname())
.imageUrl(oauth2UserInfo.getImageUrl())
.role(Role.USER)
.role(Role.GUEST)
.status(Status.ACTIVE)
.build();
}
Expand Down
Loading