diff --git a/src/main/java/umc/spring/post/config/security/JwtTokenProvider.java b/src/main/java/umc/spring/post/config/security/JwtTokenProvider.java index d96c1f616ca505da13ca7449e793fd52348aed62..80a8a69ae3e39d90eb03f48d969a18109dfbf0b9 100644 --- a/src/main/java/umc/spring/post/config/security/JwtTokenProvider.java +++ b/src/main/java/umc/spring/post/config/security/JwtTokenProvider.java @@ -6,7 +6,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; @@ -24,7 +23,7 @@ public class JwtTokenProvider { this.secretKey = secretKey; } - public TokenInfo generateToken(Authentication authentication) { + public TokenInfo generateToken(Authentication authentication, Long id, String username) { System.out.println(authentication); String authorities = authentication.getAuthorities().stream() .map(GrantedAuthority::getAuthority) @@ -36,6 +35,8 @@ public class JwtTokenProvider { String accessToken = Jwts.builder() .setSubject(authentication.getName()) .claim("auth", authorities) + .claim("userId",id) + .claim("userName",username) .setExpiration(accessTokenExpiration) .signWith(SignatureAlgorithm.HS256, secretKey) .compact(); @@ -53,9 +54,10 @@ public class JwtTokenProvider { return tokenInfo; } + public Authentication getAuthentication(String accessToken) { Claims claims = parseClaims(accessToken); - System.out.println("log" + claims); + System.out.println(claims); if (claims.get("auth") == null) { throw new RuntimeException("권한 정보가 없는 토큰입니다."); } @@ -65,7 +67,7 @@ public class JwtTokenProvider { .map(SimpleGrantedAuthority::new) .collect(Collectors.toList()); - UserDetails principal = new User(claims.getSubject(), "", authorities); + UserDetails principal = new MyUser(claims.getSubject(), "", authorities,claims); return new UsernamePasswordAuthenticationToken(principal, "", authorities); } diff --git a/src/main/java/umc/spring/post/config/security/MyUser.java b/src/main/java/umc/spring/post/config/security/MyUser.java new file mode 100644 index 0000000000000000000000000000000000000000..1c1a8786389e136a5f577dcc6788a468152256b9 --- /dev/null +++ b/src/main/java/umc/spring/post/config/security/MyUser.java @@ -0,0 +1,35 @@ +package umc.spring.post.config.security; + +import io.jsonwebtoken.Claims; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.User; + +import java.util.Collection; + +public class MyUser extends User { + + Long userId; + String userName; + + public MyUser(String username, String password, Collection<? extends GrantedAuthority> authorities, Claims claims) { + super(username, password, authorities); + this.userId = (long) ((Integer) claims.get("userId")).intValue(); + this.userName = claims.get("userName").toString(); + } + + public MyUser(String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities, Claims claims) { + super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } +} diff --git a/src/main/java/umc/spring/post/config/security/SecurityUtil.java b/src/main/java/umc/spring/post/config/security/SecurityUtil.java index 65749306d4ad2006852d68573d805c8ebbea9ddd..fe26efe609113056cf5764e9fce6c271b691302f 100644 --- a/src/main/java/umc/spring/post/config/security/SecurityUtil.java +++ b/src/main/java/umc/spring/post/config/security/SecurityUtil.java @@ -1,22 +1,31 @@ package umc.spring.post.config.security; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Controller; import umc.spring.post.data.dto.UserInfoDto; +import umc.spring.post.data.entity.User; +import umc.spring.post.repository.UserRepository; + +import java.util.Objects; public class SecurityUtil { + public static UserInfoDto getCurrentMemberId() { final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null || authentication.getName() == null) { + System.out.println("2번"); throw new RuntimeException("No authentication information."); } - + MyUser myUser = (MyUser) authentication.getPrincipal(); UserInfoDto userInfoDto = new UserInfoDto(); + userInfoDto.setUserId(myUser.getUserId()); + userInfoDto.setUserName(myUser.getUserName()); userInfoDto.setLoginId(authentication.getName()); userInfoDto.setMemberRole(authentication.getAuthorities().stream().toList().get(0).toString().replaceAll("ROLE_", "")); - return userInfoDto; } } \ No newline at end of file diff --git a/src/main/java/umc/spring/post/controller/AuthController.java b/src/main/java/umc/spring/post/controller/AuthController.java index 08825081e16dc3e5f03e1af023c8d1fe7200663e..3389080927b07cf2409a842c202bb02912ac57d2 100644 --- a/src/main/java/umc/spring/post/controller/AuthController.java +++ b/src/main/java/umc/spring/post/controller/AuthController.java @@ -2,13 +2,19 @@ package umc.spring.post.controller; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; import umc.spring.post.config.security.TokenInfo; import umc.spring.post.data.dto.UserInfoDto; import umc.spring.post.data.dto.UserJoinDto; import umc.spring.post.data.dto.UserLoginDto; import umc.spring.post.service.AuthService; +import javax.management.AttributeNotFoundException; + @RestController @RequestMapping("/user") public class AuthController { @@ -30,7 +36,13 @@ public class AuthController { } @GetMapping("/info") + @ResponseStatus(HttpStatus.OK) public UserInfoDto info() { - return authService.info(); + try{ + return authService.info(); + } + catch(Exception e){ + throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "token not Found"); + } } } diff --git a/src/main/java/umc/spring/post/controller/PostController.java b/src/main/java/umc/spring/post/controller/PostController.java index ef71aec36276efc31c9238e8399fdbb2e7164457..b5332b63af7dae65c623dd604b57e49f14b02489 100644 --- a/src/main/java/umc/spring/post/controller/PostController.java +++ b/src/main/java/umc/spring/post/controller/PostController.java @@ -1,22 +1,16 @@ package umc.spring.post.controller; -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; import umc.spring.post.data.dto.CommentDto; import umc.spring.post.data.dto.PostDto; import umc.spring.post.data.dto.PostResDto; -import umc.spring.post.data.entity.Post; import umc.spring.post.service.PostService; import java.util.List; -import static org.springframework.data.jpa.domain.AbstractPersistable_.id; @RestController public class PostController { @@ -34,7 +28,12 @@ public class PostController { @ResponseStatus(HttpStatus.OK) @PostMapping("/post/upload") public void upload(@RequestBody PostDto postDto){ - postService.upload(postDto); + try{ + postService.upload(postDto); + } + catch(Exception e){ + throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "token not Found"); + } } @GetMapping("/post/{id}") diff --git a/src/main/java/umc/spring/post/data/dto/CommentResDto.java b/src/main/java/umc/spring/post/data/dto/CommentResDto.java index 18e0d6a33dd34d7041c051d6f0362450ed8fe492..ef005b5319526eee7d55e865baf06362f0b9c7b6 100644 --- a/src/main/java/umc/spring/post/data/dto/CommentResDto.java +++ b/src/main/java/umc/spring/post/data/dto/CommentResDto.java @@ -17,6 +17,7 @@ public class CommentResDto { private String author; private String text; private Date timestamp; + public static CommentResDto toDTO(Comment comment){ return CommentResDto.builder() diff --git a/src/main/java/umc/spring/post/data/dto/PostDto.java b/src/main/java/umc/spring/post/data/dto/PostDto.java index 0b08be568bc8be224e3e939e50be738546d99b4a..54b1fe684583231db4ab2752353fa3073defc5c4 100644 --- a/src/main/java/umc/spring/post/data/dto/PostDto.java +++ b/src/main/java/umc/spring/post/data/dto/PostDto.java @@ -6,9 +6,7 @@ import lombok.Setter; @Data public class PostDto { - Long userId; String title; - String author; String body; String image; int likeCount; diff --git a/src/main/java/umc/spring/post/data/dto/UserInfoDto.java b/src/main/java/umc/spring/post/data/dto/UserInfoDto.java index ee38d4eb83673e76a75fd3a2f869aafa6ed3c2b3..cc6e6c12ff579c4361718db4014b0f93986f1cf0 100644 --- a/src/main/java/umc/spring/post/data/dto/UserInfoDto.java +++ b/src/main/java/umc/spring/post/data/dto/UserInfoDto.java @@ -8,9 +8,8 @@ import lombok.*; @ToString @Builder public class UserInfoDto { - private Long id; + private Long userId; private String userName; private String loginId; private String memberRole; - } \ No newline at end of file diff --git a/src/main/java/umc/spring/post/data/entity/Like.java b/src/main/java/umc/spring/post/data/entity/Like.java new file mode 100644 index 0000000000000000000000000000000000000000..46d312a4b2dd6d40dbd97d7dccc0ba91241f3433 --- /dev/null +++ b/src/main/java/umc/spring/post/data/entity/Like.java @@ -0,0 +1,15 @@ +package umc.spring.post.data.entity; + +import jakarta.persistence.*; + +public class Like { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @ManyToOne + @JoinColumn(name = "user_id") + private Long userId; + @ManyToOne + @JoinColumn(name = "post_id") + private Long postId; +} diff --git a/src/main/java/umc/spring/post/data/entity/Post.java b/src/main/java/umc/spring/post/data/entity/Post.java index c3df9aa1cab46842779a100279057bfd8e814822..5fb5452a3f2059e18b996a47edcea589cfec75ed 100644 --- a/src/main/java/umc/spring/post/data/entity/Post.java +++ b/src/main/java/umc/spring/post/data/entity/Post.java @@ -46,4 +46,6 @@ public class Post{ orphanRemoval = true) private List<Comment> comments = new ArrayList<>(); + + } diff --git a/src/main/java/umc/spring/post/repository/LikeRepository.java b/src/main/java/umc/spring/post/repository/LikeRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..fca6e211738475803940d8163dcea386b1a8ef38 --- /dev/null +++ b/src/main/java/umc/spring/post/repository/LikeRepository.java @@ -0,0 +1,7 @@ +package umc.spring.post.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.post.data.entity.Like; + +public interface LikeRepository extends JpaRepository<Like,Long> { +} diff --git a/src/main/java/umc/spring/post/service/AuthServiceImpl.java b/src/main/java/umc/spring/post/service/AuthServiceImpl.java index cb5c1f42bd3cea725e3bbe4239326abdffcf8ea7..38a25092f0c69944a151875e1f4e01a2616bcca3 100644 --- a/src/main/java/umc/spring/post/service/AuthServiceImpl.java +++ b/src/main/java/umc/spring/post/service/AuthServiceImpl.java @@ -2,6 +2,7 @@ package umc.spring.post.service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -15,15 +16,17 @@ import org.springframework.stereotype.Service; import umc.spring.post.data.entity.User; import umc.spring.post.config.security.JwtTokenProvider; -import umc.spring.post.config.security.Role; -import umc.spring.post.config.security.SecurityUtil; import umc.spring.post.config.security.TokenInfo; import umc.spring.post.data.dto.UserInfoDto; import umc.spring.post.data.dto.UserJoinDto; import umc.spring.post.data.dto.UserLoginDto; import umc.spring.post.repository.UserRepository; -import java.util.Optional; + +import java.security.Principal; +import java.util.Objects; + +import static umc.spring.post.config.security.SecurityUtil.getCurrentMemberId; @Service @@ -52,11 +55,10 @@ public class AuthServiceImpl implements AuthService, UserDetailsService { if (!matches) throw new BadCredentialsException("아이디 혹은 비밀번호를 확인하세요."); Authentication authentication = new UsernamePasswordAuthenticationToken(user.getLoginId(), user.getPassword(), user.getAuthorities()); - - TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication); + TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication, user.getId(),user.getUsername()); tokenInfo.setEmail(user.getLoginId()); - tokenInfo.setMemberRole(user.getRole().toString()); + return tokenInfo; } @@ -71,13 +73,10 @@ public class AuthServiceImpl implements AuthService, UserDetailsService { @Override public UserInfoDto info() { - UserInfoDto userInfoDto = SecurityUtil.getCurrentMemberId(); - User user = userRepository.findByLoginId(userInfoDto.getLoginId()).orElseThrow(); - userInfoDto.setUserName(user.getUsername()); - userInfoDto.setId(user.getId()); - return userInfoDto; + return getCurrentMemberId(); } + @Override public UserDetails loadUserByUsername(String userId) throws UsernameNotFoundException { return userRepository.findByLoginId(userId) diff --git a/src/main/java/umc/spring/post/service/PostServiceImpl.java b/src/main/java/umc/spring/post/service/PostServiceImpl.java index 89b34d26663e077c7df8c812db1c740d241e26b1..74be361c24b8fc3c93445317f39d333db8f99943 100644 --- a/src/main/java/umc/spring/post/service/PostServiceImpl.java +++ b/src/main/java/umc/spring/post/service/PostServiceImpl.java @@ -1,11 +1,7 @@ package umc.spring.post.service; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; import umc.spring.post.config.security.SecurityUtil; import umc.spring.post.data.dto.CommentDto; @@ -14,13 +10,15 @@ import umc.spring.post.data.dto.PostResDto; import umc.spring.post.data.dto.UserInfoDto; import umc.spring.post.data.entity.Comment; import umc.spring.post.data.entity.Post; +import umc.spring.post.data.entity.User; import umc.spring.post.repository.CommentRepository; import umc.spring.post.repository.PostRepository; import umc.spring.post.repository.UserRepository; -import java.io.IOException; import java.util.*; +import static umc.spring.post.config.security.SecurityUtil.getCurrentMemberId; + @Service public class PostServiceImpl implements PostService{ @@ -30,23 +28,31 @@ public class PostServiceImpl implements PostService{ @Autowired private final CommentRepository commentRepository; - public PostServiceImpl(PostRepository postRepository, CommentRepository commentRepository) { + @Autowired + private final UserRepository userRepository; + + public PostServiceImpl(PostRepository postRepository, CommentRepository commentRepository, UserRepository userRepository) { this.postRepository = postRepository; this.commentRepository = commentRepository; + this.userRepository = userRepository; } @Override public void upload(PostDto postDto){ - UserInfoDto userInfoDto = SecurityUtil.getCurrentMemberId(); + + UserInfoDto userInfoDto = getCurrentMemberId(); Post post = new Post(); setPost(postDto, post); - post.setUserId(postDto.getUserId()); + post.setAuthor(userInfoDto.getUserName()); + post.setUserId(userInfoDto.getUserId()); post.setCreatedTime((new Date())); post.setModifiedTime(post.getCreatedTime()); + postRepository.save(post); } + @Override public List<PostResDto> getAllPost(){ List<Post> posts = postRepository.findAll(); @@ -67,6 +73,8 @@ public class PostServiceImpl implements PostService{ @Override public void likeCrew(Long id) { + UserInfoDto userInfoDto = getCurrentMemberId(); + Post post = postRepository.findById(id).orElseThrow(() -> new RuntimeException("id가 존재하지 않습니다.")); int likeCount = post.getLikeCount(); post.setLikeCount(++likeCount); @@ -80,7 +88,6 @@ public class PostServiceImpl implements PostService{ if(likeCount!=0){ post.setLikeCount(--likeCount); postRepository.save(post); - } } @@ -150,6 +157,8 @@ public class PostServiceImpl implements PostService{ post.getComments().add(comment); comment.setPost(post); + post.setAuthor(userInfoDto.getUserName()); + comment.setUserId(commentDto.getUserId()); comment.setTimestamp(new Date()); comment.setText(commentDto.getText()); @@ -161,7 +170,6 @@ public class PostServiceImpl implements PostService{ private static void setPost(PostDto postDto, Post post) { post.setTitle(postDto.getTitle()); post.setBody(postDto.getBody()); - post.setAuthor(postDto.getAuthor()); post.setLikeCount(postDto.getLikeCount()); post.setImage(postDto.getImage()); }