[REFACTOR] CORS preflight 요청 매칭 추가

eeos/src/main/java/com/blackcompany/eeos/auth/application/domain/converter/OauthMemberEntityConverter.java

@@ -1,7 +1,7 @@
 package com.blackcompany.eeos.auth.application.domain.converter;
 
 import com.blackcompany.eeos.auth.application.domain.OauthMemberModel;
-import com.blackcompany.eeos.auth.persistence.OAuthMemberEntity;
+import com.blackcompany.eeos.auth.persistence.oauth.OAuthMemberEntity;
 import com.blackcompany.eeos.common.support.converter.AbstractEntityConverter;
 import org.springframework.stereotype.Component;
 

eeos/src/main/java/com/blackcompany/eeos/auth/application/model/AccountEntityConverter.java

@@ -1,6 +1,6 @@
 package com.blackcompany.eeos.auth.application.model;
 
-import com.blackcompany.eeos.auth.persistence.AccountEntity;
+import com.blackcompany.eeos.auth.persistence.account.AccountEntity;
 import com.blackcompany.eeos.common.support.converter.AbstractEntityConverter;
 import org.springframework.stereotype.Component;
 

eeos/src/main/java/com/blackcompany/eeos/auth/application/model/AuthorityModel.java

@@ -12,5 +12,9 @@ public class AuthorityModel implements AbstractModel {
 
 	private final Long id;
 	private final Long memberId;
-	private final String name; // TODO: ROLE enum 으로 변경
+	private final Role role;
+
+	public static AuthorityModel create(Long memberId, Role role) {
+		return AuthorityModel.builder().role(role).memberId(memberId).build();
+	}
 }

eeos/src/main/java/com/blackcompany/eeos/auth/application/repository/OAuthMemberRepository.java

@@ -1,7 +1,7 @@
 package com.blackcompany.eeos.auth.application.repository;
 
 import com.blackcompany.eeos.auth.application.domain.OauthMemberModel;
-import com.blackcompany.eeos.auth.persistence.OAuthMemberEntity;
+import com.blackcompany.eeos.auth.persistence.oauth.OAuthMemberEntity;
 import java.util.Optional;
 
 public interface OAuthMemberRepository {

eeos/src/main/java/com/blackcompany/eeos/auth/application/repository/OauthVerificationStorage.java

@@ -1,7 +1,7 @@
 package com.blackcompany.eeos.auth.application.repository;
 
 import com.blackcompany.eeos.auth.application.domain.OauthMemberModel;
-import com.blackcompany.eeos.auth.persistence.OAuthInfo;
+import com.blackcompany.eeos.auth.persistence.oauth.OAuthInfo;
 import java.util.UUID;
 
 public interface OauthVerificationStorage {

eeos/src/main/java/com/blackcompany/eeos/auth/application/service/AuthFacadeService.java

@@ -4,6 +4,7 @@
 import com.blackcompany.eeos.auth.application.domain.TokenModel;
 import com.blackcompany.eeos.auth.application.dto.request.OAuthLoginRequestCommand;
 import com.blackcompany.eeos.auth.application.model.AuthorityModel;
+import com.blackcompany.eeos.auth.application.model.Role;
 import com.blackcompany.eeos.auth.application.repository.AuthorityRepository;
 import com.blackcompany.eeos.auth.application.support.AuthenticationTokenGenerator;
 import com.blackcompany.eeos.auth.application.usecase.LoginUsecase;
@@ -27,10 +28,7 @@ public TokenModel login(OAuthLoginRequestCommand command) {
 				oauthClientService.getOauthMember(command.oauthServerType(), command.code(), command.uri());
 		Long memberId = authService.authenticate(model);
 
-		Set<String> authorities =
-				authorityRepository.findByMemberId(memberId).stream()
-						.map(AuthorityModel::getName)
-						.collect(Collectors.toSet());
+		Set<String> authorities = getRoles(memberId);
 
 		return authenticationTokenGenerator.execute(memberId, authorities);
 	}
@@ -40,11 +38,15 @@ public TokenModel login(String loginId, String password) {
 		MemberModel model = authService.authenticate(loginId, password);
 		Long memberId = model.getMemberId();
 
-		Set<String> authorities =
-				authorityRepository.findByMemberId(memberId).stream()
-						.map(AuthorityModel::getName)
-						.collect(Collectors.toSet());
+		Set<String> authorities = getRoles(memberId);
 
 		return authenticationTokenGenerator.execute(memberId, authorities);
 	}
+
+	private Set<String> getRoles(Long memberId) {
+		return authorityRepository.findByMemberId(memberId).stream()
+				.map(AuthorityModel::getRole)
+				.map(Role::getRole)
+				.collect(Collectors.toSet());
+	}
 }

eeos/src/main/java/com/blackcompany/eeos/auth/application/service/AuthService.java

@@ -59,10 +59,7 @@ private OauthMemberModel signUpMember(final OauthMemberModel model) {
 						.build();
 		MemberModel savedMember = memberRepository.save(member);
 
-		AuthorityModel authorityModel =
-				AuthorityModel.builder().memberId(savedMember.getMemberId()).name(Role.USER.name()).build();
-
-		authorityRepository.save(authorityModel);
+		authorityRepository.save(AuthorityModel.create(savedMember.getMemberId(), Role.USER));
 
 		OauthMemberModel updatedModel = model.toBuilder().memberId(savedMember.getId()).build();
 		return oAuthMemberRepository.save(updatedModel);

eeos/src/main/java/com/blackcompany/eeos/auth/application/service/DeactivateMemberService.java

@@ -5,8 +5,8 @@
 import com.blackcompany.eeos.auth.application.repository.OAuthMemberRepository;
 import com.blackcompany.eeos.auth.application.usecase.LogOutUsecase;
 import com.blackcompany.eeos.auth.application.usecase.WithDrawUsecase;
-import com.blackcompany.eeos.auth.persistence.AccountJpaRepository;
 import com.blackcompany.eeos.auth.persistence.InvalidTokenRepository;
+import com.blackcompany.eeos.auth.persistence.account.AccountJpaRepository;
 import com.blackcompany.eeos.member.application.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;

eeos/src/main/java/com/blackcompany/eeos/auth/application/service/SignUpService.java

@@ -10,7 +10,7 @@
 import com.blackcompany.eeos.auth.application.repository.OauthVerificationStorage;
 import com.blackcompany.eeos.auth.application.support.AuthenticationTokenGenerator;
 import com.blackcompany.eeos.auth.application.usecase.OAuthSignUpUseCase;
-import com.blackcompany.eeos.auth.persistence.OAuthInfo;
+import com.blackcompany.eeos.auth.persistence.oauth.OAuthInfo;
 import com.blackcompany.eeos.member.application.model.ActiveStatus;
 import com.blackcompany.eeos.member.application.model.MemberModel;
 import com.blackcompany.eeos.member.application.repository.MemberRepository;
@@ -42,7 +42,7 @@ public TokenModel signUp(AdditionalInfoApplicationCommand command) {
 		MemberModel savedMember = memberRepository.save(memberModel);
 
 		saveOAuth(oAuthInfo.getOauthId(), savedMember.getMemberId());
-		saveAuthority(savedMember.getMemberId(), "ROLE_" + Role.USER.getRole());
+		saveAuthority(savedMember.getMemberId(), Role.USER);
 
 		// TODO: 일반 USER 권한인지 아닌지 계산해주는 도구 추가
 
@@ -56,8 +56,8 @@ private void saveOAuth(String oAuthId, Long memberId) {
 		oAuthMemberRepository.save(oauthMemberModel);
 	}
 
-	private void saveAuthority(Long memberId, String role) {
-		AuthorityModel authorityModel = AuthorityModel.builder().memberId(memberId).name(role).build();
+	private void saveAuthority(Long memberId, Role role) {
+		AuthorityModel authorityModel = AuthorityModel.builder().memberId(memberId).role(role).build();
 
 		authorityRepository.save(authorityModel);
 	}

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/AccountEntity.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/account/AccountEntity.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.account;
 
 import com.blackcompany.eeos.common.persistence.BaseEntity;
 import jakarta.persistence.Column;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/AccountJpaRepository.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/account/AccountJpaRepository.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.account;
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/AccountRepositoryImpl.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/account/AccountRepositoryImpl.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.account;
 
 import com.blackcompany.eeos.auth.application.exception.NotFoundAccountException;
 import com.blackcompany.eeos.auth.application.model.AccountModel;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/AuthorityEntity.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/authority/AuthorityEntity.java

@@ -1,8 +1,11 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.authority;
 
+import com.blackcompany.eeos.auth.application.model.Role;
 import com.blackcompany.eeos.common.persistence.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -35,6 +38,7 @@ public class AuthorityEntity extends BaseEntity {
 	@Column(nullable = false, name = NAME + "_member_id")
 	private Long memberId;
 
+	@Enumerated(EnumType.STRING)
 	@Column(nullable = false, name = NAME + "_role")
-	private String role;
+	private Role role;
 }

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/AuthorityJpaRepository.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/authority/AuthorityJpaRepository.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.authority;
 
 import java.util.Set;
 import org.springframework.data.jpa.repository.JpaRepository;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/AuthorityRepositoryImpl.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/authority/AuthorityRepositoryImpl.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.authority;
 
 import com.blackcompany.eeos.auth.application.model.AuthorityModel;
 import com.blackcompany.eeos.auth.application.repository.AuthorityRepository;
@@ -26,14 +26,14 @@ public Long save(AuthorityModel authorityModel) {
 	}
 
 	private AuthorityEntity toEntity(AuthorityModel model) {
-		return AuthorityEntity.builder().memberId(model.getMemberId()).role(model.getName()).build();
+		return AuthorityEntity.builder().memberId(model.getMemberId()).role(model.getRole()).build();
 	}
 
 	private AuthorityModel toModel(AuthorityEntity entity) {
 		return AuthorityModel.builder()
 				.id(entity.getId())
 				.memberId(entity.getMemberId())
-				.name(entity.getRole())
+				.role(entity.getRole())
 				.build();
 	}
 }

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/JpaOAuthMemberRepository.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/oauth/JpaOAuthMemberRepository.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.oauth;
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/OAuthInfo.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/oauth/OAuthInfo.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.oauth;
 
 import com.blackcompany.eeos.auth.application.domain.OauthServerType;
 import lombok.AllArgsConstructor;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/OAuthMemberEntity.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/oauth/OAuthMemberEntity.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.oauth;
 
 import com.blackcompany.eeos.common.persistence.BaseEntity;
 import jakarta.persistence.Column;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/OAuthMemberRepositoryImpl.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/oauth/OAuthMemberRepositoryImpl.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.oauth;
 
 import com.blackcompany.eeos.auth.application.domain.OauthMemberModel;
 import com.blackcompany.eeos.auth.application.domain.converter.OauthMemberEntityConverter;

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/OauthVerificationStorageImpl.java → eeos/src/main/java/com/blackcompany/eeos/auth/persistence/oauth/OauthVerificationStorageImpl.java

@@ -1,4 +1,4 @@
-package com.blackcompany.eeos.auth.persistence;
+package com.blackcompany.eeos.auth.persistence.oauth;
 
 import com.blackcompany.eeos.auth.application.domain.OauthMemberModel;
 import com.blackcompany.eeos.auth.application.repository.OauthVerificationStorage;

eeos/src/main/java/com/blackcompany/eeos/config/security/SecurityFilterChainConfig.java

@@ -48,6 +48,7 @@ SecurityFilterChain nonAuthenticated(HttpSecurity httpSecurity) throws Exception
 		httpSecurity.securityMatchers(
 				(matcher) -> {
 					matcher
+							.requestMatchers(HttpMethod.OPTIONS, "/**") // CORS Preflight 매칭
 							.requestMatchers("/api/auth/logout")
 							.requestMatchers("/api/auth/login/additional-info")
 							.requestMatchers(HttpMethod.POST, "/api/auth/login/**")

eeos/src/main/java/com/blackcompany/eeos/member/application/service/CreateAdminMemberService.java

@@ -6,8 +6,8 @@
 import com.blackcompany.eeos.auth.application.model.Role;
 import com.blackcompany.eeos.auth.application.repository.AuthorityRepository;
 import com.blackcompany.eeos.auth.application.repository.OAuthMemberRepository;
-import com.blackcompany.eeos.auth.persistence.AccountEntity;
-import com.blackcompany.eeos.auth.persistence.AccountJpaRepository;
+import com.blackcompany.eeos.auth.persistence.account.AccountEntity;
+import com.blackcompany.eeos.auth.persistence.account.AccountJpaRepository;
 import com.blackcompany.eeos.member.application.model.AdminInfo;
 import com.blackcompany.eeos.member.application.model.MemberModel;
 import com.blackcompany.eeos.member.application.repository.MemberRepository;
@@ -45,7 +45,7 @@ public Long create() {
 		MemberModel savedMember = memberRepository.save(createMember());
 
 		saveAccount(accountEntityConverter.toEntity(createAccount(savedMember.getId())));
-		saveAuthority(savedMember.getMemberId(), "ROLE_" + Role.ADMIN.getRole());
+		saveAuthority(savedMember.getMemberId(), Role.ADMIN);
 
 		return savedMember.getId();
 	}
@@ -79,10 +79,8 @@ private AccountModel createAccount(Long memberId) {
 				.build();
 	}
 
-	private void saveAuthority(Long memberId, String role) {
-		AuthorityModel authorityModel = AuthorityModel.builder().memberId(memberId).name(role).build();
-
-		authorityRepository.save(authorityModel);
+	private void saveAuthority(Long memberId, Role role) {
+		authorityRepository.save(AuthorityModel.create(memberId, role));
 	}
 
 	private boolean findAdminAccount() {

eeos/src/test/java/com/blackcompany/eeos/auth/fixture/FakeOauthMember.java

@@ -2,7 +2,7 @@
 
 import com.blackcompany.eeos.auth.application.domain.OauthMemberModel;
 import com.blackcompany.eeos.auth.application.domain.OauthServerType;
-import com.blackcompany.eeos.auth.persistence.OAuthMemberEntity;
+import com.blackcompany.eeos.auth.persistence.oauth.OAuthMemberEntity;
 
 public class FakeOauthMember {
 	public static OauthMemberModel oauthMemberModel(OauthServerType type, Long memberId) {