Feature/member security #20

.github/workflows/build_test.yml

@@ -22,6 +22,7 @@ jobs:
       AWS_REGION: ${{ secrets.AWS_REGION }}
       AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
       AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
+      SPRING_JWT_TOKEN_VALIDITY: ${{ secrets.SPRING_JWT_TOKEN_VALIDITY }}
 
     permissions:
       pull-requests: write

build.gradle

@@ -27,8 +27,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    //implementation 'org.springframework.boot:spring-boot-starter-security'
-    //implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+//    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
     // https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-java
     implementation group: 'io.github.cdimascio', name: 'dotenv-java', version: '3.0.0'
     // https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-starter-webmvc-ui
@@ -39,6 +39,13 @@ dependencies {
     implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
     implementation 'com.sun.xml.bind:jaxb-impl:2.3.3'
 
+    // JSON Web Token (JWT) Core API
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+
+    // Implementation and JSON support (runtime dependencies)
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'com.mysql:mysql-connector-j'

src/main/java/com/seveneleven/devlens/domain/member/controller/memberController.java

@@ -0,0 +1,77 @@
+package com.seveneleven.devlens.domain.member.controller;
+
+import com.seveneleven.devlens.domain.member.dto.MemberJoinDto;
+import com.seveneleven.devlens.domain.member.dto.TokenDto;
+import com.seveneleven.devlens.domain.member.entity.Member;
+import com.seveneleven.devlens.domain.member.service.MemberService;
+import com.seveneleven.devlens.global.config.Annotation.AdminAuthorize;
+import com.seveneleven.devlens.global.config.Annotation.UserAuthorize;
+import com.seveneleven.devlens.global.config.JwtFilter;
+import com.seveneleven.devlens.global.config.TokenProvider;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.core.Authentication;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api")
+@AllArgsConstructor
+public class memberController {
+
+    private final TokenProvider tokenProvider;
+    private final AuthenticationManagerBuilder authenticationManagerBuilder;
+    private final MemberService memberService;
+
+    @PostMapping("/login")
+    public ResponseEntity<?> login(MemberJoinDto dto) {
+
+        Member member = memberService.getUserWithAuthorities(dto.getUserid()).get();
+
+        if (ObjectUtils.isEmpty(member)) {
+
+            UsernamePasswordAuthenticationToken authenticationToken =
+                    new UsernamePasswordAuthenticationToken(dto.getUserid(), dto.getPw());
+
+            // authenticate 메소드가 실행이 될 때 CustomUserDetailsService class의 loadUserByUsername 메소드가 실행
+            Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
+
+            // authentication 객체를 createToken 메소드를 통해서 JWT Token을 생성
+            String jwt = tokenProvider.createToken(authentication);
+
+            HttpHeaders httpHeaders = new HttpHeaders();
+            // response header에 jwt token에 넣어줌
+            httpHeaders.add(JwtFilter.AUTHORIZATION_HEADER, "Bearer " + jwt);
+
+            // tokenDto를 이용해 response body에도 넣어서 리턴
+            return new ResponseEntity<>(new TokenDto(jwt), httpHeaders, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+    }
+
+    @PostMapping("/join")
+    public ResponseEntity<String> join(@RequestBody MemberJoinDto dto) {
+        try {
+            // memberService.join(dto.getUserid(), dto.getPw());
+            return ResponseEntity.ok("join success");
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @GetMapping("/setting/admin")
+    @AdminAuthorize
+    public String adminSettingPage() {
+        return "admin_setting";
+    }
+
+    @GetMapping("/setting/user")
+    @UserAuthorize
+    public String userSettingPage() {
+        return "user_setting";
+    }
+}

src/main/java/com/seveneleven/devlens/domain/member/dto/MemberDto.java

@@ -0,0 +1,27 @@
+package com.seveneleven.devlens.domain.member.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MemberDto {
+
+    @NotBlank
+    @Size(min = 3, max = 50)
+    private String username;
+
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @NotBlank
+    @Size(min = 3, max = 100)
+    private String password;
+
+    @NotBlank
+    @Size(min = 3, max = 50)
+    private String nickname;
+}

src/main/java/com/seveneleven/devlens/domain/member/dto/MemberJoinDto.java

@@ -0,0 +1,12 @@
+package com.seveneleven.devlens.domain.member.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MemberJoinDto {
+
+    private String userid;
+    private String pw;
+}

src/main/java/com/seveneleven/devlens/domain/member/dto/TokenDto.java

@@ -0,0 +1,11 @@
+package com.seveneleven.devlens.domain.member.dto;
+
+import lombok.*;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class TokenDto {
+
+    private final String token;
+}

src/main/java/com/seveneleven/devlens/domain/member/entity/Member.java

@@ -1,18 +1,21 @@
 package com.seveneleven.devlens.domain.member.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.seveneleven.devlens.domain.member.constant.MemberStatus;
 import com.seveneleven.devlens.domain.member.constant.Role;
 import com.seveneleven.devlens.domain.member.constant.YN;
 import com.seveneleven.devlens.global.entity.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 @Table(name = "member")
 public class Member extends BaseEntity {
 
@@ -21,7 +24,7 @@ public class Member extends BaseEntity {
     @Column(name = "id")
     private Long id; // 회원 ID
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "company_id", nullable = false, referencedColumnName = "id")
     private Company company; // 회사 ID (연관관계)
 
@@ -40,7 +43,7 @@ public class Member extends BaseEntity {
 
     @Column(name = "profile_image_exists", nullable = false)
     @Enumerated(EnumType.STRING)
-    private YN profileImageExists; // 프로필 이미지 유무
+    private YN profileImageExists = YN.N; // 프로필 이미지 유무
 
     @Column(name = "name", nullable = false, length = 100)
     private String name; // 이름
@@ -62,15 +65,15 @@ public class Member extends BaseEntity {
 
 
     // 생성 메서드
-    public static Member createMember(String loginId, String password, Company companyId, Role role, String name, String email,
-                                      LocalDate birthDate, String phoneNumber, Long departmentId, Long positionId) {
+    public static Member createMember(String loginId, String password, Company company, Role role, String name, String email,
+                                      LocalDate birthDate, String phoneNumber, Long departmentId, Long positionId, PasswordEncoder pwdEncoder) {
         Member member = new Member();
         member.name         = name;
         member.role         = role;
         member.email        = email;
         member.loginId      = loginId;
-        member.password     = password;
-        member.company      = companyId;
+        member.password     = pwdEncoder.encode(password);
+        member.company      = company;
         member.birthDate    = birthDate;
         member.phoneNumber  = phoneNumber;
         member.positionId   = positionId;

src/main/java/com/seveneleven/devlens/domain/member/repository/MemberRepository.java

@@ -0,0 +1,16 @@
+package com.seveneleven.devlens.domain.member.repository;
+
+
+import com.seveneleven.devlens.domain.member.entity.Member;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+
+    Optional<Member> findByLoginId(String loginId);
+
+    @EntityGraph(attributePaths = {"role"})
+    Optional<Member> findOneWithAuthoritiesByLoginId(String loginId);
+}

src/main/java/com/seveneleven/devlens/domain/member/service/MemberService.java

@@ -0,0 +1,52 @@
+package com.seveneleven.devlens.domain.member.service;
+
+import com.seveneleven.devlens.domain.member.entity.Member;
+import com.seveneleven.devlens.domain.member.repository.MemberRepository;
+import com.seveneleven.devlens.global.util.security.SecurityUtil;
+import jakarta.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class MemberService {
+    @Autowired
+    PasswordEncoder passwordEncoder;
+    @Autowired
+    MemberRepository repository;
+    @Autowired
+    MemberRepository memberRepository;
+
+
+    public Optional<Member> findOne(String loginId) {
+        return repository.findByLoginId(loginId);
+    }
+
+//    public Long join(String userid, String pw) {
+//        Optional<Company> companyOptional = companyRepository.findById(1L);
+//
+//        Company company = companyOptional.orElseThrow(() ->
+//                new IllegalStateException("Company with ID 1L not found")
+//        );
+//
+//        Member member = Member.createMember(userid, pw, company, Role.USER, "박철수", "[email protected]", LocalDate.now(),"010-111-1111",1L,1L,passwordEncoder);
+//        repository.save(member);
+//
+//        return member.getId();
+//    }
+
+    // 유저,권한 정보를 가져오는 메소드
+    @Transactional
+    public Optional<Member> getUserWithAuthorities(String memberId) {
+        return memberRepository.findOneWithAuthoritiesByLoginId(memberId);
+    }
+
+    // 현재 securityContext에 저장된 username의 정보만 가져오는 메소드
+    @Transactional
+    public Optional<Member> getMyUserWithAuthorities() {
+        return SecurityUtil.getCurrentUsername()
+                .flatMap(memberRepository::findOneWithAuthoritiesByLoginId);
+    }
+}

src/main/java/com/seveneleven/devlens/domain/member/service/MyUserDetailsService.java

@@ -0,0 +1,29 @@
+package com.seveneleven.devlens.domain.member.service;
+
+import com.seveneleven.devlens.domain.member.entity.Member;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MyUserDetailsService implements UserDetailsService {
+    private final MemberService memberService;
+
+    public MyUserDetailsService(MemberService memberService) {
+        this.memberService = memberService;
+    }
+
+    @Override
+    public UserDetails loadUserByUsername(String insertedUserId){
+        Member member = memberService.findOne(insertedUserId)
+                .orElseThrow(() -> new UsernameNotFoundException("User with ID '" + insertedUserId + "' not found."));
+
+        return User.builder()
+                .username(member.getLoginId())
+                .password(member.getPassword())
+                .roles(member.getRole().toString())
+                .build();
+    }
+}

src/main/java/com/seveneleven/devlens/global/config/Annotation/AdminAuthorize.java

@@ -0,0 +1,14 @@
+package com.seveneleven.devlens.global.config.Annotation;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@PreAuthorize("hasAnyRole('ADMIN')")
+public @interface AdminAuthorize {
+}

src/main/java/com/seveneleven/devlens/global/config/Annotation/UserAuthorize.java

@@ -0,0 +1,14 @@
+package com.seveneleven.devlens.global.config.Annotation;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@PreAuthorize("hasAnyRole('USER')")
+public @interface UserAuthorize {
+}

src/main/java/com/seveneleven/devlens/global/config/JwtAccessDeniedHandler.java

@@ -0,0 +1,35 @@
+package com.seveneleven.devlens.global.config;
+
+import com.seveneleven.devlens.global.response.ErrorCode;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+/**
+ * 인증된 사용자가 필요한 권한 없이 보호된 리소스에 접근하려고 할 때 처리하는 클래스
+ *
+ * - Spring Security에서 권한 부족으로 인한 접근 거부 시 403 (Forbidden) 에러를 반환합니다.
+ */
+@Component
+public class JwtAccessDeniedHandler implements AccessDeniedHandler {
+
+    /**
+     * 권한이 없는 사용자가 요청을 보낼 때 호출됩니다.
+     *
+     * @param request               클라이언트 요청 (HttpServletRequest)
+     * @param response              서버 응답 (HttpServletResponse)
+     * @param accessDeniedException 발생한 접근 거부 예외 (AccessDeniedException)
+     * @throws IOException 입출력 예외 발생 시
+     */
+    @Override
+    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException)
+            throws IOException {
+        // 403 Forbidden 상태 코드 반환
+        response.sendError(ErrorCode.FORBIDDEN.getCode());
+    }
+}
+