From a0821d004d300341e9b7a4cd672e3e741b3b957d Mon Sep 17 00:00:00 2001 From: chominju02 Date: Fri, 22 Aug 2025 09:01:30 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=ED=8C=A8=ED=84=B4=20=EB=8C=80=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=ED=95=84=EC=88=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../life/mosu/mosuserver/global/annotation/PasswordPattern.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From e7433f31c3c6dced1fa86a4e134a4593ca65691c Mon Sep 17 00:00:00 2001 From: wlgns12370 Date: Fri, 22 Aug 2025 11:59:18 +0900 Subject: [PATCH 2/4] =?UTF-8?q?MOSU=20refactor:=20master=20=EC=97=94?= =?UTF-8?q?=EB=93=9C=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/life/mosu/mosuserver/global/filter/Whitelist.java | 3 --- 1 file changed, 3 deletions(-) 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), From 9daf01fd4a1f666346ba778168f34caeb6320c0c Mon Sep 17 00:00:00 2001 From: wlgns12370 Date: Sat, 23 Aug 2025 01:18:14 +0900 Subject: [PATCH 3/4] =?UTF-8?q?MOSU-352=20refactor:=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=9C=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EA=B7=9C?= =?UTF-8?q?=EC=B9=99=20Schema=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/auth/dto/request/SignUpAccountRequest.java | 2 +- .../presentation/user/dto/request/ChangePasswordRequest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From b7fc3d4a82e85b6803d855a80ad80329f9bcfbf7 Mon Sep 17 00:00:00 2001 From: wlgns12370 Date: Sat, 23 Aug 2025 02:16:13 +0900 Subject: [PATCH 4/4] =?UTF-8?q?MOSU-352=20fix:=20=EC=B9=B4=EC=B9=B4?= =?UTF-8?q?=EC=98=A4=20=EC=A4=91=EB=B3=B5=20=EC=9C=A0=EC=A0=80=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=B6=84=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oauth/OAuthUserPersistenceProcessor.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) 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(),