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

Api-Release-v-0.0.2-15 #224

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Api-Release-v-0.0.2-15 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f65d15
:recycle: : 인증용 데이터 μ‚­μ œ (#222)
imenuuu Dec 11, 2023
210b837
:recycle: : 랜덀 λ‹‰λ„€μž„ x (#222)
imenuuu Dec 11, 2023
0f1604c
Merge pull request #223 from TEAMMatchDev/feature/issue-222
imenuuu Dec 11, 2023
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
9 changes: 0 additions & 9 deletions Match-Api/src/main/java/com/example/matchapi/user/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ CommonResponse<NaverAddressDto> getNaverAddress(@RequestBody UserReq.SocialLogin
@DisableSecurity
public CommonResponse<UserRes.Sms> checkSms(@RequestBody @Valid UserReq.Sms sms){
log.info("01-04 λΉ„νšŒμ› 문자인증 = " +sms.getPhone());
if(sms.getPhone().equals("01011111111")) return CommonResponse.onSuccess(new UserRes.Sms("111111"));
String number = smsHelper.sendSms(sms.getPhone());
return CommonResponse.onSuccess(new UserRes.Sms(number));
}
Expand All @@ -109,7 +108,6 @@ public CommonResponse<UserRes.UserToken> signUpUser(@RequestBody @Valid UserReq.
@PostMapping(value="/email")
@DisableSecurity
public CommonResponse<String> checkUserEmail(@RequestBody @Valid UserReq.UserEmail userEmail){
if(userEmail.getEmail().equals("[email protected]")) return CommonResponse.onSuccess("이메일 μ‚¬μš© κ°€λŠ₯");
log.info("01-05-01 μœ μ € νšŒμ›κ°€μž… 이메일 검증"+userEmail.getEmail());
authService.checkUserEmail(userEmail);
return CommonResponse.onSuccess("이메일 μ‚¬μš© κ°€λŠ₯");
Expand All @@ -121,7 +119,6 @@ public CommonResponse<String> checkUserEmail(@RequestBody @Valid UserReq.UserEma
@DisableSecurity
public CommonResponse<String> checkUserPhone(@RequestBody @Valid UserReq.UserPhone userPhone){
log.info("01-05-01 μœ μ € νšŒμ›κ°€μž… μ „ν™”λ²ˆν˜Έ 검증"+userPhone.getPhone());
if(userPhone.getPhone().equals("01011111111")) return CommonResponse.onSuccess("ν•Έλ“œν° μ‚¬μš©κ°€λŠ₯");
authService.checkUserPhone(userPhone);
return CommonResponse.onSuccess("ν•Έλ“œν° μ‚¬μš©κ°€λŠ₯");
}
Expand All @@ -141,7 +138,6 @@ public CommonResponse<UserRes.UserToken> logIn(@RequestBody @Valid UserReq.LogIn
@GetMapping("/email")
@DisableSecurity
public CommonResponse<String> emailAuth(@RequestParam String email){
if(email.equals("[email protected]")) return CommonResponse.onSuccess("이메일 μ‚¬μš© κ°€λŠ₯");
authService.sendEmailMessage(email);
return CommonResponse.onSuccess("메일 전솑 성곡");
}
Expand All @@ -151,8 +147,6 @@ public CommonResponse<String> emailAuth(@RequestParam String email){
@ApiErrorCodeExample(CodeAuthErrorCode.class)
@DisableSecurity
public CommonResponse<String> checkEmailAuth(@RequestBody UserReq.UserEmailAuth email){
if(email.getEmail().equals("[email protected]"))return CommonResponse.onSuccess("메일 인증 성곡");

authService.checkUserEmailAuth(email);
return CommonResponse.onSuccess("메일 인증 성곡");
}
Expand All @@ -172,8 +166,6 @@ public CommonResponse<String> checkPhone(@RequestParam String phone){
@ApiErrorCodeExample(CodeAuthErrorCode.class)
@DisableSecurity
public CommonResponse<String> checkEmailAuth(@RequestBody UserReq.UserPhoneAuth phone){
if(phone.getPhone().equals("01011111111")) return CommonResponse.onSuccess("ν•Έλ“œν° 인증 성곡");

authService.checkPhoneAuth(phone);
return CommonResponse.onSuccess("ν•Έλ“œν° 인증 성곡");
}
Expand All @@ -200,7 +192,6 @@ public CommonResponse<UserRes.UserToken> appleSignUp(@RequestBody @Valid UserReq
@ApiErrorCodeExample({UserSignUpErrorCode.class, SendEmailFindPassword.class})
@DisableSecurity
public CommonResponse<String> sendEmailPasswordFind(@RequestParam String email){
if(email.equals("[email protected]")) return CommonResponse.onSuccess("이메일 μ‚¬μš© κ°€λŠ₯");
authService.sendEmailPasswordFind(email);
return CommonResponse.onSuccess("메일 인증 성곡");
}
Expand Down
8 changes: 4 additions & 4 deletions Match-Api/src/main/java/com/example/matchapi/user/converter/UserConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public User convertToKakaoSignUpUser(KakaoUserInfoDto kakaoUserInfoDto, SocialTy
.birth(authHelper.birthConversion(kakaoUserInfoDto.getBirthYear(), kakaoUserInfoDto.getBirthDay()))
.gender(authHelper.genderConversion(kakaoUserInfoDto.getGender()))
.role(AuthorityEnum.ROLE_USER.getValue())
.nickname(userHelper.createRandomNickName())
.nickname(kakaoUserInfoDto.getName())
.serviceAlarm(ACTIVE)
.eventAlarm(ACTIVE)
.build();
Expand Down Expand Up @@ -87,7 +87,7 @@ public User convertToNaverSignUpUser(NaverUserInfoDto naverUserInfoDto, SocialTy
.birth(authHelper.birthConversion(naverUserInfoDto.getBirthyear(), naverUserInfoDto.getBirthday()))
.gender(authHelper.genderConversion(naverUserInfoDto.getGender()))
.role(AuthorityEnum.ROLE_USER.getValue())
.nickname(userHelper.createRandomNickName())
.nickname(naverUserInfoDto.getName())
.serviceAlarm(ACTIVE)
.eventAlarm(ACTIVE)
.build();
Expand All @@ -105,7 +105,7 @@ public User convertToSignUpUser(UserReq.SignUpUser signUpUser) {
.birth(authHelper.birthConversionToLocalDate(signUpUser.getBirthDate()))
.gender(signUpUser.getGender())
.role(AuthorityEnum.ROLE_USER.getValue())
.nickname(userHelper.createRandomNickName())
.nickname(signUpUser.getName())
.serviceAlarm(ACTIVE)
.eventAlarm(ACTIVE)
.build();
Expand Down Expand Up @@ -243,7 +243,7 @@ public User convertToAppleUserSignUp(UserReq.@Valid AppleSignUp appleSignUp) {
.socialId(appleSignUp.getSocialId())
.socialType(SocialType.APPLE)
.role(AuthorityEnum.ROLE_USER.getValue())
.nickname(userHelper.createRandomNickName())
.nickname(appleSignUp.getName())
.serviceAlarm(ACTIVE)
.eventAlarm(ACTIVE)
.gender(appleSignUp.getGender())
Expand Down
Loading