🔗 :: (#497) CurrentUser 리펙토링

.github/CODEOWNERS

@@ -1 +1 @@
-*.* @tedsoftj1123 @gilgeunwoo @alsdl0629
+*.* @tedsoftj1123 @geunoo @alsdl0629

jobis-infrastructure/src/main/java/team/retum/jobis/global/error/GlobalExceptionFilter.java

@@ -13,7 +13,6 @@
 import team.retum.jobis.event.exception.model.ExceptionEvent;
 import team.retum.jobis.global.error.exception.GlobalErrorCode;
 import team.retum.jobis.global.error.response.ErrorResponse;
-import team.retum.jobis.global.security.auth.CurrentUserHolder;
 import team.retum.jobis.global.util.LogUtil;
 
 import java.io.IOException;
@@ -39,8 +38,6 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                 eventPublisher.publishEvent(ExceptionEvent.builder().request(request).exception(e).build());
                 writeErrorResponse(response, GlobalErrorCode.INTERNAL_SERVER_ERROR);
             }
-        } finally {
-            CurrentUserHolder.clear();
         }
     }
 

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/SecurityAdapter.java

@@ -2,23 +2,24 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 import team.retum.jobis.common.spi.SecurityPort;
 import team.retum.jobis.domain.auth.model.Authority;
 import team.retum.jobis.domain.company.model.Company;
-import team.retum.jobis.domain.company.persistence.entity.CompanyEntity;
 import team.retum.jobis.domain.company.persistence.mapper.CompanyMapper;
 import team.retum.jobis.domain.student.model.Student;
-import team.retum.jobis.domain.student.persistence.entity.StudentEntity;
 import team.retum.jobis.domain.student.persistence.mapper.StudentMapper;
 import team.retum.jobis.domain.teacher.model.Teacher;
-import team.retum.jobis.domain.teacher.persistence.entity.TeacherEntity;
 import team.retum.jobis.domain.teacher.persistence.mapper.TeacherMapper;
 import team.retum.jobis.domain.user.model.User;
 import team.retum.jobis.domain.user.persistence.mapper.UserMapper;
 import team.retum.jobis.domain.user.persistence.repository.UserJpaRepository;
-import team.retum.jobis.global.security.auth.CurrentUserHolder;
+import team.retum.jobis.global.exception.InvalidTokenException;
+import team.retum.jobis.global.security.auth.company.CompanyDetails;
+import team.retum.jobis.global.security.auth.student.StudentDetails;
+import team.retum.jobis.global.security.auth.teacher.TeacherDetails;
 
 @RequiredArgsConstructor
 @Component
@@ -43,7 +44,8 @@ public String encodePassword(String password) {
 
     @Override
     public Authority getCurrentUserAuthority() {
-        return CurrentUserHolder.getCurrentUserAuthority();
+        UserDetails currentUser = (UserDetails) getCurrentUserDetails();
+        return Authority.valueOf(currentUser.getAuthorities().iterator().next().getAuthority());
     }
 
     @Override
@@ -53,23 +55,31 @@ public boolean isPasswordMatch(String rawPassword, String encodedPassword) {
 
     @Override
     public Company getCurrentCompany() {
-        return companyMapper.toDomain((CompanyEntity) CurrentUserHolder.getUser());
+        CompanyDetails companyDetails = (CompanyDetails) getCurrentUserDetails();
+        return companyMapper.toDomain(companyDetails.getCompany());
     }
 
     @Override
     public Student getCurrentStudent() {
-        return studentMapper.toDomain((StudentEntity) CurrentUserHolder.getUser());
+        StudentDetails studentDetails = (StudentDetails) getCurrentUserDetails();
+        return studentMapper.toDomain(studentDetails.getStudent());
     }
 
     @Override
     public Teacher getCurrentTeacher() {
-        return teacherMapper.toDomain((TeacherEntity) CurrentUserHolder.getUser());
+        TeacherDetails teacherDetails = (TeacherDetails) getCurrentUserDetails();
+        return teacherMapper.toDomain(teacherDetails.getTeacher());
     }
 
     @Override
     public User getCurrentUser() {
         Long currentUserId = Long.valueOf(SecurityContextHolder.getContext().getAuthentication().getName());
         return userJpaRepository.findById(currentUserId)
-                .map(userMapper::toDomain).get();
+                .map(userMapper::toDomain)
+                .orElseThrow(() -> InvalidTokenException.EXCEPTION);
+    }
+
+    private Object getCurrentUserDetails() {
+        return SecurityContextHolder.getContext().getAuthentication().getPrincipal();
     }
 }

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/auth/company/CompanyDetails.java

@@ -1,17 +1,21 @@
 package team.retum.jobis.global.security.auth.company;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import team.retum.jobis.domain.auth.model.Authority;
+import team.retum.jobis.domain.company.persistence.entity.CompanyEntity;
 
 import java.util.Collection;
 import java.util.Collections;
 
+@Getter
 @RequiredArgsConstructor
 public class CompanyDetails implements UserDetails {
-    private final Long companyId;
+
+    private final transient CompanyEntity company;
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
@@ -25,7 +29,7 @@ public String getPassword() {
 
     @Override
     public String getUsername() {
-        return companyId.toString();
+        return company.getId().toString();
     }
 
     @Override

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/auth/company/CompanyDetailsService.java

@@ -8,7 +8,6 @@
 import team.retum.jobis.domain.company.persistence.entity.CompanyEntity;
 import team.retum.jobis.domain.company.persistence.repository.CompanyJpaRepository;
 import team.retum.jobis.global.exception.InvalidTokenException;
-import team.retum.jobis.global.security.auth.CurrentUserHolder;
 
 @Component
 @RequiredArgsConstructor
@@ -21,8 +20,7 @@ public UserDetails loadUserByUsername(String companyId) throws UsernameNotFoundE
         CompanyEntity company = companyJpaRepository.findById(
                 Long.valueOf(companyId)
         ).orElseThrow(() -> InvalidTokenException.EXCEPTION);
-        CurrentUserHolder.setUser(company);
 
-        return new CompanyDetails(company.getId());
+        return new CompanyDetails(company);
     }
 }

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/auth/student/StudentDetails.java

@@ -1,17 +1,21 @@
 package team.retum.jobis.global.security.auth.student;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import team.retum.jobis.domain.auth.model.Authority;
+import team.retum.jobis.domain.student.persistence.entity.StudentEntity;
 
 import java.util.Collection;
 import java.util.Collections;
 
+@Getter
 @RequiredArgsConstructor
 public class StudentDetails implements UserDetails {
-    private final Long studentId;
+
+    private final transient StudentEntity student;
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
@@ -25,7 +29,7 @@ public String getPassword() {
 
     @Override
     public String getUsername() {
-        return studentId.toString();
+        return student.getId().toString();
     }
 
     @Override

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/auth/student/StudentDetailsService.java

@@ -8,7 +8,6 @@
 import team.retum.jobis.domain.student.persistence.entity.StudentEntity;
 import team.retum.jobis.domain.student.persistence.repository.StudentJpaRepository;
 import team.retum.jobis.global.exception.InvalidTokenException;
-import team.retum.jobis.global.security.auth.CurrentUserHolder;
 
 @Component
 @RequiredArgsConstructor
@@ -21,8 +20,7 @@ public UserDetails loadUserByUsername(String studentId) throws UsernameNotFoundE
         StudentEntity studentEntity = studentJpaRepository.findById(
                 Long.valueOf(studentId)
         ).orElseThrow(() -> InvalidTokenException.EXCEPTION);
-        CurrentUserHolder.setUser(studentEntity);
 
-        return new StudentDetails(studentEntity.getId());
+        return new StudentDetails(studentEntity);
     }
 }

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/auth/teacher/TeacherDetails.java

@@ -1,17 +1,21 @@
 package team.retum.jobis.global.security.auth.teacher;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import team.retum.jobis.domain.auth.model.Authority;
+import team.retum.jobis.domain.teacher.persistence.entity.TeacherEntity;
 
 import java.util.Collection;
 import java.util.Collections;
 
+@Getter
 @RequiredArgsConstructor
 public class TeacherDetails implements UserDetails {
-    private final Long teacherId;
+
+    private final transient TeacherEntity teacher;
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
@@ -25,7 +29,7 @@ public String getPassword() {
 
     @Override
     public String getUsername() {
-        return teacherId.toString();
+        return teacher.getId().toString();
     }
 
     @Override

jobis-infrastructure/src/main/java/team/retum/jobis/global/security/auth/teacher/TeacherDetailsService.java

@@ -8,7 +8,6 @@
 import team.retum.jobis.domain.teacher.persistence.entity.TeacherEntity;
 import team.retum.jobis.domain.teacher.persistence.repository.TeacherJpaRepository;
 import team.retum.jobis.global.exception.InvalidTokenException;
-import team.retum.jobis.global.security.auth.CurrentUserHolder;
 
 @Component
 @RequiredArgsConstructor
@@ -21,8 +20,7 @@ public UserDetails loadUserByUsername(String teacherId) throws UsernameNotFoundE
         TeacherEntity teacherEntity = teacherJpaRepository.findById(
                 Long.valueOf(teacherId)
         ).orElseThrow(() -> InvalidTokenException.EXCEPTION);
-        CurrentUserHolder.setUser(teacherEntity);
 
-        return new TeacherDetails(teacherEntity.getId());
+        return new TeacherDetails(teacherEntity);
     }
 }