front 로그인 작업 중 (2)
This commit is contained in:
@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
|
||||
@RequiredArgsConstructor
|
||||
public class FrontDetailService implements UserDetailsService {
|
||||
|
||||
private final FindUserPortIn findUserPortIn;
|
||||
private final GetHouseholdPortIn getHouseholdPortIn;
|
||||
@Value("${app.front.password.validity.period.days}")
|
||||
private long passwordValidPeriodDays;
|
||||
@@ -40,24 +39,16 @@ public class FrontDetailService implements UserDetailsService {
|
||||
.operate(new GetHouseholdCmd(username))
|
||||
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
||||
|
||||
FindUser findUser =
|
||||
findUserPortIn
|
||||
.operate(new FindUserCmd(username))
|
||||
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
||||
|
||||
boolean accountLocked = Optional.ofNullable(findUser.getAccountLocked()).orElse(false);
|
||||
boolean accountDisabled = Optional.ofNullable(findUser.getAccountDisabled()).orElse(false);
|
||||
|
||||
return new FrontUser(
|
||||
findUser.getId(),
|
||||
findUser.getPassword(),
|
||||
!accountDisabled,
|
||||
return new FrontHouseholdUser(
|
||||
getHousehold.getHouseholdNum(),
|
||||
getHousehold.getPassword(),
|
||||
true,
|
||||
true,
|
||||
!accountLocked,
|
||||
getAuthorities(findUser.getRoles()),
|
||||
findUser.getNickname(),
|
||||
passwordValidPeriodDays - getDaysPassedFrom(findUser.getPasswordUpdatedAt()));
|
||||
true,
|
||||
true,
|
||||
getAuthorities(getHousehold.getRoles()),
|
||||
getHousehold.getOwnerName()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package app.module.front.config.application.security;
|
||||
|
||||
import java.util.Collection;
|
||||
import lombok.Getter;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.userdetails.User;
|
||||
|
||||
@Getter
|
||||
public class FrontHouseholdUser extends User {
|
||||
|
||||
private String ownerName;
|
||||
|
||||
public FrontHouseholdUser(
|
||||
String householdNum,
|
||||
String password,
|
||||
boolean enabled,
|
||||
boolean accountNonExpired,
|
||||
boolean credentialsNonExpired,
|
||||
boolean accountNonLocked,
|
||||
Collection<? extends GrantedAuthority> authorities,
|
||||
String ownerName) {
|
||||
super(
|
||||
householdNum,
|
||||
password,
|
||||
enabled,
|
||||
accountNonExpired,
|
||||
credentialsNonExpired,
|
||||
accountNonLocked,
|
||||
authorities);
|
||||
this.ownerName = ownerName;
|
||||
}
|
||||
}
|
||||
@@ -91,7 +91,10 @@ public class FrontSecurityConfig {
|
||||
.rememberMe(
|
||||
remMe ->
|
||||
remMe
|
||||
.tokenValiditySeconds(1209600)
|
||||
// 자동 로그인 영구 유지 (로그아웃 시까지 유지)
|
||||
// Integer.MAX_VALUE ≒ 68년 유효
|
||||
// 단, 쿠키 삭제되면 무효됨
|
||||
.tokenValiditySeconds(Integer.MAX_VALUE)
|
||||
.userDetailsService(frontDetailService)
|
||||
.tokenRepository(persistentTokenRepository()))
|
||||
.logout(
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package app.module.front.usecase.household.updateFrontHousehold.adapters.web;
|
||||
|
||||
import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortIn;
|
||||
import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import app.module.front.usecase.household.updateFrontHousehold.adapters.web.model.UpdateFrontHouseholdReqVO;
|
||||
import app.module.front.usecase.household.updateFrontHousehold.adapters.web.model.UpdateFrontHouseholdResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class UpdateFrontHouseholdController {
|
||||
private final UpdateFrontHouseholdPortIn updateFrontHouseholdPortIn;
|
||||
|
||||
@PatchMapping(path = "/api/front/household/update")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid UpdateFrontHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult);
|
||||
}
|
||||
|
||||
updateFrontHouseholdPortIn.operate(new UpdateFrontHouseholdCmd(
|
||||
reqVO.getId(),
|
||||
reqVO.getHouseholdNum(),
|
||||
reqVO.getOwnerName(),
|
||||
reqVO.getOwnerAge(),
|
||||
reqVO.getTel(),
|
||||
reqVO.getPhone(),
|
||||
reqVO.getRegion(),
|
||||
reqVO.getCity(),
|
||||
reqVO.getAddressDetail()
|
||||
));
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateFrontHouseholdReqVO {
|
||||
private Long id;
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private Integer ownerAge;
|
||||
private String tel;
|
||||
private String phone;
|
||||
private String region;
|
||||
private String city;
|
||||
private String addressDetail;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateFrontHouseholdResVO {
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package app.module.front.usecase.user.updateUserUI.adapters.web;
|
||||
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
|
||||
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
|
||||
import app.module.core.usecase.user.findUser.ports.FindUserPortIn;
|
||||
import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd;
|
||||
import app.module.front.usecase.user.updateUserUI.adapters.web.model.UpdateUserUIReqVO;
|
||||
@@ -14,13 +16,13 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@RequiredArgsConstructor
|
||||
class UpdateUserUIController {
|
||||
|
||||
private final FindUserPortIn findUserPortIn;
|
||||
private final GetHouseholdPortIn getHouseholdPortIn;
|
||||
|
||||
@GetMapping(path = "/user/info")
|
||||
String operate(Model model, @ModelAttribute("reqVO") UpdateUserUIReqVO reqVO) {
|
||||
|
||||
model.addAttribute("userInfo",
|
||||
findUserPortIn.operate(new FindUserCmd(CommonUtil.getLoginUsername())).orElseThrow());
|
||||
getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow());
|
||||
|
||||
return "user/info";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user