diff --git a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java index 0d6b906e..3056c07d 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java @@ -40,6 +40,7 @@ public class FrontDetailService implements UserDetailsService { .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password.")); return new FrontHouseholdUser( + getHousehold.getSeq(), getHousehold.getHouseholdNum(), getHousehold.getPassword(), true, diff --git a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java index 4937504d..a3dc23f6 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java @@ -8,9 +8,11 @@ import org.springframework.security.core.userdetails.User; @Getter public class FrontHouseholdUser extends User { + private Long householdSeq; private String ownerName; public FrontHouseholdUser( + Long householdSeq, String householdNum, String password, boolean enabled, @@ -27,6 +29,7 @@ public class FrontHouseholdUser extends User { credentialsNonExpired, accountNonLocked, authorities); + this.householdSeq = householdSeq; this.ownerName = ownerName; } } diff --git a/front/src/main/java/app/module/front/config/application/util/AuditUtil.java b/front/src/main/java/app/module/front/config/application/util/AuditUtil.java new file mode 100644 index 00000000..700aec6c --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/util/AuditUtil.java @@ -0,0 +1,22 @@ +package app.module.front.config.application.util; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; + +public class AuditUtil { + private AuditUtil() {} + + public static T create(T cmd) { + cmd.create(); + return cmd; + } + + public static T update(T cmd) { + cmd.update(); + return cmd; + } + + public static T delete(T cmd) { + cmd.delete(); + return cmd; + } +} diff --git a/front/src/main/java/app/module/front/config/application/util/AuthUtil.java b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java new file mode 100644 index 00000000..59d3fc2f --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java @@ -0,0 +1,28 @@ +package app.module.front.config.application.util; + +import app.module.core.config.adapters.web.security.domain.SocialUser; +import app.module.front.config.application.security.FrontHouseholdUser; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.oauth2.core.user.DefaultOAuth2User; +import org.springframework.stereotype.Component; + +@Component +public class AuthUtil { + public static Long getUserSeq() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null) { + return null; + } + + Object principal = authentication.getPrincipal(); + Long userseq = null; + + if (principal instanceof UserDetails) { + userseq = ((FrontHouseholdUser) principal).getHouseholdSeq(); + } + + return userseq; + } +}