Skip to content

Commit 88f4947

Browse files
authored
Merge pull request #353 from mosu-dev/refactor/mosu-352
MOSU-352 refactor: 비밀번호 패턴 대문자 필수 제거
2 parents e7433f3 + b7fc3d4 commit 88f4947

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,8 @@ public UserJpaEntity process(final OAuthUserInfo info) {
2323
return userRepository.findByPhoneNumber(
2424
PhoneNumberUtil.formatPhoneNumber(info.phoneNumber()))
2525
.map(existingUser -> {
26-
switch (existingUser.getProvider()) {
27-
case MOSU:
28-
if (existingUser.isPendingUser()) {
29-
throw new OAuthException("DUPLICATE");
30-
}
31-
break;
32-
case KAKAO:
33-
if (existingUser.isPendingUser()) {
34-
throw new OAuthException("KAKAO_DUPLICATE");
35-
}
36-
break;
26+
if (existingUser.isMosuUser()) {
27+
throw new OAuthException("DUPLICATE");
3728
}
3829
existingUser.updateOAuthUser(
3930
info.gender(),

src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.lang.annotation.RetentionPolicy;
1010
import java.lang.annotation.Target;
1111

12-
@Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*_/+=])[A-Za-z\\d!@#$%^&*_/+=]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.")
12+
@Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*_/+=])[A-Za-z\\d!@#$%^&*_/+=]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.")
1313
@NotBlank
1414
@Target({ElementType.FIELD, ElementType.PARAMETER})
1515
@Retention(RetentionPolicy.RUNTIME)

src/main/java/life/mosu/mosuserver/presentation/auth/dto/request/SignUpAccountRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public record SignUpAccountRequest(
2626
String id,
2727

2828
@Schema(
29-
description = "비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.",
29+
description = "비밀번호는 8~20자의 영문, 숫자, 특수문자를 모두 포함해야 합니다.",
3030
example = "Mosu!1234"
3131
)
3232
@PasswordPattern String password,

src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public record ChangePasswordRequest(
77
@Schema(
8-
description = "새로운 비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.",
8+
description = "새로운 비밀번호는 8~20자의 영문, 숫자, 특수문자를 모두 포함해야 합니다.",
99
example = "Mosu!1234"
1010
)
1111
@PasswordPattern

0 commit comments

Comments
 (0)