diff --git a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java index 83782f76..7104b594 100644 --- a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java +++ b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java @@ -23,17 +23,8 @@ public UserJpaEntity process(final OAuthUserInfo info) { return userRepository.findByPhoneNumber( PhoneNumberUtil.formatPhoneNumber(info.phoneNumber())) .map(existingUser -> { - switch (existingUser.getProvider()) { - case MOSU: - if (existingUser.isPendingUser()) { - throw new OAuthException("DUPLICATE"); - } - break; - case KAKAO: - if (existingUser.isPendingUser()) { - throw new OAuthException("KAKAO_DUPLICATE"); - } - break; + if (existingUser.isMosuUser()) { + throw new OAuthException("DUPLICATE"); } existingUser.updateOAuthUser( info.gender(), diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java b/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java index b2f88b96..664e3c25 100644 --- a/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java +++ b/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java @@ -9,7 +9,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*_/+=])[A-Za-z\\d!@#$%^&*_/+=]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.") +@Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*_/+=])[A-Za-z\\d!@#$%^&*_/+=]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.") @NotBlank @Target({ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java b/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java index ac0e7486..f205c74e 100644 --- a/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java +++ b/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java @@ -34,9 +34,6 @@ public enum Whitelist { OAUTH2("/api/v1/oauth2", WhitelistMethod.ALL), OAUTH("/api/v1/oauth", WhitelistMethod.ALL), - // 삭제 예정 - MASTER("/api/v1/master", WhitelistMethod.ALL), - // 조회만 가능한 PATH EVENT("/api/v1/event", WhitelistMethod.GET), FAQ("/api/v1/faq", WhitelistMethod.GET), diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/request/SignUpAccountRequest.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/request/SignUpAccountRequest.java index f5691ac1..f9770260 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/request/SignUpAccountRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/request/SignUpAccountRequest.java @@ -26,7 +26,7 @@ public record SignUpAccountRequest( String id, @Schema( - description = "비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.", + description = "비밀번호는 8~20자의 영문, 숫자, 특수문자를 모두 포함해야 합니다.", example = "Mosu!1234" ) @PasswordPattern String password, diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java index a3ac59b7..ea8d6f19 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java @@ -5,7 +5,7 @@ public record ChangePasswordRequest( @Schema( - description = "새로운 비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.", + description = "새로운 비밀번호는 8~20자의 영문, 숫자, 특수문자를 모두 포함해야 합니다.", example = "Mosu!1234" ) @PasswordPattern