[2025.05.30] admin 로그인, initData 작업 중 (1)
This commit is contained in:
@@ -4,6 +4,9 @@ import app.module.core.config.adapters.web.security.domain.CorePrivilege;
|
||||
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortIn;
|
||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
@@ -24,6 +27,7 @@ import org.springframework.stereotype.Service;
|
||||
public class AdminDetailsService implements UserDetailsService {
|
||||
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
private final GetAdminPortIn getAdminPortIn;
|
||||
|
||||
@Value("${app.admin.password.validity.period.days}")
|
||||
private long passwordValidPeriodDays;
|
||||
@@ -31,23 +35,29 @@ public class AdminDetailsService implements UserDetailsService {
|
||||
@Override
|
||||
@Transactional
|
||||
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
||||
AdminView adminUser =
|
||||
adminViewPortIn
|
||||
.connect(username)
|
||||
|
||||
GetAdmin getAdmin =
|
||||
getAdminPortIn
|
||||
.operate(new GetAdminCmd(username))
|
||||
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
||||
|
||||
boolean accountLocked = Optional.ofNullable(adminUser.getAccountLocked()).orElse(false);
|
||||
boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false);
|
||||
// AdminView adminUser =
|
||||
// adminViewPortIn
|
||||
// .connect(username)
|
||||
// .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
||||
|
||||
boolean accountLocked = Optional.ofNullable(getAdmin.getAccountLocked()).orElse(false);
|
||||
boolean accountDisabled = Optional.ofNullable(getAdmin.getAccountDisabled()).orElse(false);
|
||||
|
||||
return new AdminUser(
|
||||
adminUser.getId(),
|
||||
adminUser.getPassword(),
|
||||
getAdmin.getId(),
|
||||
getAdmin.getPassword(),
|
||||
!accountDisabled,
|
||||
true,
|
||||
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
|
||||
isCredentialsNonExpired(getAdmin.getPasswordUpdatedAt()),
|
||||
!accountLocked,
|
||||
getAuthorities(adminUser.getRoles()),
|
||||
passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt()));
|
||||
getAuthorities(getAdmin.getRoles()),
|
||||
passwordValidPeriodDays - getDaysPassedFrom(getAdmin.getPasswordUpdatedAt()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user