From 6a1b4fe0c5347467ae1f7b8af52b84e4b21da82e Mon Sep 17 00:00:00 2001 From: geonhos Date: Thu, 23 May 2024 12:17:23 +0900 Subject: [PATCH] =?UTF-8?q?admin:=20app=20layer=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/admin/AdminActionLogAppService.java | 2 ++ ...ementAppService.java => AdminAppService.java} | 2 +- ...ervice.java => AuthenticationAppService.java} | 8 ++++---- ...Service.java => AuthorizationAppService.java} | 8 ++++---- ...TokenService.java => JwtTokenAppService.java} | 2 +- .../poc/admin/security/SecurityConfig.java | 16 ++++++++-------- .../CustomAuthenticationProvider.java | 6 +++--- .../CustomAuthorizationManager.java | 6 +++--- .../poc/admin/security/jwt/JwtTokenProvider.java | 6 +++--- .../AdminManagementRestController.java | 10 +++++----- ...ServiceTest.java => AdminAppServiceTest.java} | 5 ++--- 11 files changed, 36 insertions(+), 35 deletions(-) rename poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/{AdminManagementAppService.java => AdminAppService.java} (98%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/{AuthenticationService.java => AuthenticationAppService.java} (81%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/{AuthorizationService.java => AuthorizationAppService.java} (75%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/{JwtTokenService.java => JwtTokenAppService.java} (97%) rename poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/{AdminManagementAppServiceTest.java => AdminAppServiceTest.java} (95%) diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java index 0fa8c58..59259fd 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java @@ -9,9 +9,11 @@ import com.bpgroup.poc.admin.filter.AdminActionLogCreate; import com.bpgroup.poc.admin.filter.AdminActionLogUpdate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor +@Transactional public class AdminActionLogAppService { private final AdminActionLogService adminActionLogService; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java similarity index 98% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java index 70f4939..a18f7c2 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java @@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @Transactional -public class AdminManagementAppService { +public class AdminAppService { private final PasswordEncoder passwordEncoder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppService.java similarity index 81% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppService.java index 4f39b4e..46f80d9 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppService.java @@ -4,7 +4,7 @@ import com.bpgroup.poc.admin.app.authentication.exception.AdminNotFoundException import com.bpgroup.poc.admin.app.authentication.exception.DoNotHaveAnyMenuException; import com.bpgroup.poc.admin.app.authentication.exception.InvalidPasswordException; import com.bpgroup.poc.admin.domain.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.service.AdminService; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -12,14 +12,14 @@ import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor -public class AuthenticationService { +public class AuthenticationAppService { private final PasswordEncoder passwordEncoder; - private final AdminRepository adminRepository; + private final AdminService adminService; @Transactional public AuthenticationResult login(String username, String password) throws AdminNotFoundException, InvalidPasswordException, DoNotHaveAnyMenuException { - Admin findAdmin = adminRepository.findByLoginId(username).orElseThrow(() -> new AdminNotFoundException(username)); + Admin findAdmin = adminService.find(username).orElseThrow(() -> new AdminNotFoundException(username)); if (!passwordEncoder.matches(password, findAdmin.getPassword())) { throw new InvalidPasswordException(username); diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationAppService.java similarity index 75% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationAppService.java index b9e1683..7f6589a 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationAppService.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.app.authorization; import com.bpgroup.poc.admin.domain.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.service.AdminService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -13,12 +13,12 @@ import java.util.Optional; @Service @RequiredArgsConstructor @Transactional -public class AuthorizationService { +public class AuthorizationAppService { - private final AdminRepository adminRepository; + private final AdminService adminService; public boolean isAuthorized(String username, String requestUri) { - Optional findAdmin = adminRepository.findByLoginId(username); + Optional findAdmin = adminService.find(username); if (findAdmin.isEmpty()) { return false; } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenAppService.java similarity index 97% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenAppService.java index 5734c7d..23b4029 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenAppService.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @Transactional -public class JwtTokenService { +public class JwtTokenAppService { private final AdminService adminService; private final AdminTokenService adminTokenService; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java index be33e24..685dd59 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java @@ -1,11 +1,11 @@ package com.bpgroup.poc.admin.security; -import com.bpgroup.poc.admin.app.jwt.JwtTokenService; +import com.bpgroup.poc.admin.app.jwt.JwtTokenAppService; import com.bpgroup.poc.admin.security.authentication.*; -import com.bpgroup.poc.admin.app.authentication.AuthenticationService; +import com.bpgroup.poc.admin.app.authentication.AuthenticationAppService; import com.bpgroup.poc.admin.security.authorization.CustomAccessDeniedHandler; import com.bpgroup.poc.admin.security.authorization.CustomAuthorizationManager; -import com.bpgroup.poc.admin.app.authorization.AuthorizationService; +import com.bpgroup.poc.admin.app.authorization.AuthorizationAppService; import com.bpgroup.poc.admin.security.jwt.JwtTokenConstants; import com.bpgroup.poc.admin.security.jwt.JwtTokenProvider; import com.bpgroup.poc.admin.security.jwt.JwtTokenValidateFilter; @@ -36,9 +36,9 @@ public class SecurityConfig { private static final String LOGOUT_PATH = "/logout"; private static final String ERROR_PATH = "/error"; - private final AuthenticationService authenticationService; - private final AuthorizationService authorizationService; - private final JwtTokenService jwtTokenService; + private final AuthenticationAppService authenticationAppService; + private final AuthorizationAppService authorizationAppService; + private final JwtTokenAppService jwtTokenAppService; private final JwtTokenProvider jwtTokenProvider; @@ -73,7 +73,7 @@ public class SecurityConfig { .requestMatchers("/common/modal/**").permitAll() .requestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH).permitAll() .anyRequest() - .access(new CustomAuthorizationManager(authorizationService)) + .access(new CustomAuthorizationManager(authorizationAppService)) ); } @@ -101,7 +101,7 @@ public class SecurityConfig { @Bean public CustomAuthenticationProvider customAuthenticationProvider() { - return new CustomAuthenticationProvider(authenticationService); + return new CustomAuthenticationProvider(authenticationAppService); } @Bean diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java index ba1601c..570a382 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.security.authentication; import com.bpgroup.poc.admin.app.authentication.AuthenticationResult; -import com.bpgroup.poc.admin.app.authentication.AuthenticationService; +import com.bpgroup.poc.admin.app.authentication.AuthenticationAppService; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class CustomAuthenticationProvider implements AuthenticationProvider { - private final AuthenticationService authenticationService; + private final AuthenticationAppService authenticationAppService; @Transactional @Override @@ -21,7 +21,7 @@ public class CustomAuthenticationProvider implements AuthenticationProvider { String username = (String) authentication.getPrincipal(); String password = (String) authentication.getCredentials(); - AuthenticationResult authenticationResult = authenticationService.login(username, password); + AuthenticationResult authenticationResult = authenticationAppService.login(username, password); return buildAuthenticationToken(authenticationResult); } catch (Exception e) { diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authorization/CustomAuthorizationManager.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authorization/CustomAuthorizationManager.java index 49588e3..f22876c 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authorization/CustomAuthorizationManager.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authorization/CustomAuthorizationManager.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.security.authorization; -import com.bpgroup.poc.admin.app.authorization.AuthorizationService; +import com.bpgroup.poc.admin.app.authorization.AuthorizationAppService; import lombok.RequiredArgsConstructor; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; @@ -12,7 +12,7 @@ import java.util.function.Supplier; @RequiredArgsConstructor public class CustomAuthorizationManager implements AuthorizationManager { - private final AuthorizationService authorizationService; + private final AuthorizationAppService authorizationAppService; @Override public AuthorizationDecision check(Supplier authentication, RequestAuthorizationContext context) { @@ -21,7 +21,7 @@ public class CustomAuthorizationManager implements AuthorizationManager