From 4747c1659e74eae5f8c9d818e9f94697ae4f08ac Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:12:51 +0900 Subject: [PATCH 01/49] feat: auth controller --- .../auth/controller/AuthController.java | 55 +++++++++++++++++++ .../gdscys/cokepoke/auth/domain/JwtCode.java | 2 + .../cokepoke/auth/domain/TokenInfo.java | 2 + .../cokepoke/auth/dto/LoginRequest.java | 2 + .../cokepoke/auth/jwt/JwtAuthFilter.java | 2 + .../cokepoke/auth/jwt/JwtTokenProvider.java | 2 + .../configuration/QueryDslConfig.java | 2 + .../configuration/SecurityConfig.java | 2 + .../cokepoke/configuration/SwaggerConfig.java | 2 + .../cokepoke/exception/ErrorResponse.java | 2 + .../exception/GlobalExceptionHandler.java | 2 + .../member/controller/MemberController.java | 2 + .../gdscys/cokepoke/member/domain/Member.java | 2 + .../cokepoke/member/domain/RefreshToken.java | 2 + .../cokepoke/member/dto/MemberResponse.java | 2 + .../cokepoke/member/dto/SignupRequest.java | 2 + .../member/dto/UpdateMemberRequest.java | 2 + .../member/repository/MemberRepository.java | 2 + .../repository/RefreshTokenRepository.java | 2 + .../service/CustomUserDetailsService.java | 2 + .../member/service/IMemberService.java | 2 + .../member/service/MemberService.java | 2 + .../declaration/PasswordMatches.java | 2 + .../validation/declaration/ValidEmail.java | 2 + .../implementation/EmailValidator.java | 2 + .../PasswordMatchesValidator.java | 2 + 26 files changed, 105 insertions(+) create mode 100644 src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java create mode 100644 src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java create mode 100644 src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java create mode 100644 src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java create mode 100644 src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java create mode 100644 src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/domain/Member.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java create mode 100644 src/main/java/com/gdscys/cokepoke/member/service/MemberService.java create mode 100644 src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java create mode 100644 src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java create mode 100644 src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java create mode 100644 src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java diff --git a/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java b/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java new file mode 100644 index 0000000..fdc5341 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java @@ -0,0 +1,55 @@ +package com.gdscys.cokepoke.auth.controller; + +import com.gdscys.cokepoke.auth.domain.TokenInfo; +import com.gdscys.cokepoke.auth.dto.LoginRequest; +import com.gdscys.cokepoke.member.service.CustomUserDetailsService; +import com.gdscys.cokepoke.member.domain.Member; +import com.gdscys.cokepoke.member.dto.SignupRequest; +import com.gdscys.cokepoke.member.dto.MemberResponse; +import javax.validation.Valid; + +import com.gdscys.cokepoke.member.service.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseCookie; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import static org.springframework.http.HttpHeaders.SET_COOKIE; + +@Controller +@RequestMapping("/auth") +@RequiredArgsConstructor +public class AuthController { + private final CustomUserDetailsService customUserDetailsService; + private final MemberService memberService; + + @PostMapping("/signup") + public ResponseEntity signup(@RequestBody @Valid SignupRequest request) { + Member member = memberService.saveMember(request.getEmail(), request.getUsername(), request.getPassword()); + return ResponseEntity.status(HttpStatus.CREATED) + .body(MemberResponse.of(member)); + } + + @PostMapping(value = "/login", + consumes = "application/json", + produces = "application/json" + ) + public ResponseEntity login(@RequestBody LoginRequest loginRequest) { + TokenInfo tokenInfo = memberService.login(loginRequest.getEmail(), loginRequest.getPassword()); + return ResponseEntity.ok() + .header(SET_COOKIE, generateCookie("accessToken", tokenInfo.getAccessToken()).toString()) + .header(SET_COOKIE, generateCookie("refreshToken", tokenInfo.getRefreshToken()).toString()) + .body(tokenInfo); + } + + private ResponseCookie generateCookie(String from, String token) { + return ResponseCookie.from(from, token) + .httpOnly(true) // false로 하면 클라이언트도 쿠키로 접근할 수 있기 때문에 보안상 조치 + .path("/") + .build(); + } +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java b/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java new file mode 100644 index 0000000..02437c1 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.auth.domain;public class JwtCode { +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java b/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java new file mode 100644 index 0000000..9a5ee10 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.auth.domain;public class TokenInfo { +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java b/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java new file mode 100644 index 0000000..96eebbc --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.auth.dto;public class LoginRequest { +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java new file mode 100644 index 0000000..52cb169 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.auth.jwt;public class JwtAuthFilter { +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java new file mode 100644 index 0000000..398bf66 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.auth.jwt;public class JwtTokenProvider { +} diff --git a/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java new file mode 100644 index 0000000..5031f90 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.configuration;public class QueryDslConfig { +} diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java new file mode 100644 index 0000000..8d3e7af --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.configuration;public class SecurityConfig { +} diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java new file mode 100644 index 0000000..17d6af7 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.configuration;public class SwaggerConfig { +} diff --git a/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java b/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java new file mode 100644 index 0000000..6dd90b4 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.exception;public class ErrorResponse { +} diff --git a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..0003910 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.exception;public class GlobalExceptionHandler { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java b/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java new file mode 100644 index 0000000..8e4261d --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.controller;public class MemberController { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java new file mode 100644 index 0000000..fc1536c --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.domain;public class Member { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java b/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java new file mode 100644 index 0000000..679a8ae --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.domain;public class RefreshToken { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java b/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java new file mode 100644 index 0000000..13fc630 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.dto;public class MemberRespons { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java b/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java new file mode 100644 index 0000000..7867aa9 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.dto;public class SignupRequest { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java b/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java new file mode 100644 index 0000000..ce41def --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.dto;public class UpdateMemberRequest { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java b/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java new file mode 100644 index 0000000..af59c4d --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.repository;public interface MemberRepository { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java b/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java new file mode 100644 index 0000000..ef4a865 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.repository;public class RefreshTokenRepository { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java b/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java new file mode 100644 index 0000000..912ba1e --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.service;public class CustomUserDetailsService { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java new file mode 100644 index 0000000..d54bbcd --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.service;public class IMemberService { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java new file mode 100644 index 0000000..b05bb13 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.member.service;public class MemberService { +} diff --git a/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java b/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java new file mode 100644 index 0000000..2bd99a8 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.validation.declaration;public class PasswordMatches { +} diff --git a/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java b/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java new file mode 100644 index 0000000..1231bf1 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.validation.declaration;public class ValidEmail { +} diff --git a/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java b/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java new file mode 100644 index 0000000..7ac8552 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.validation.implementation;public class EmailValidator { +} diff --git a/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java b/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java new file mode 100644 index 0000000..02f3961 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.validation.implementation;public class PasswordMatchesValidator { +} From 7e65b88e2bd92838eb27445ce33492f4ded515ab Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:13:03 +0900 Subject: [PATCH 02/49] feat: jwt code --- src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java b/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java index 02437c1..36cd105 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java +++ b/src/main/java/com/gdscys/cokepoke/auth/domain/JwtCode.java @@ -1,2 +1,5 @@ -package com.gdscys.cokepoke.auth.domain;public class JwtCode { -} +package com.gdscys.cokepoke.auth.domain; + +public enum JwtCode { + ACCESS,EXPIRED,DENIED +} \ No newline at end of file From dfbcbc2908b6ae6eb31a614112aceb4be4868b5a Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:13:15 +0900 Subject: [PATCH 03/49] feat: token info --- .../gdscys/cokepoke/auth/domain/TokenInfo.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java b/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java index 9a5ee10..6183c72 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java +++ b/src/main/java/com/gdscys/cokepoke/auth/domain/TokenInfo.java @@ -1,2 +1,16 @@ -package com.gdscys.cokepoke.auth.domain;public class TokenInfo { +package com.gdscys.cokepoke.auth.domain; + +import lombok.Getter; + +@Getter +public class TokenInfo { + private String accessToken; + private String refreshToken; + + protected TokenInfo() {} + + public TokenInfo(String accessToken, String refreshToken) { + this.accessToken = accessToken; + this.refreshToken = refreshToken; + } } From 2e4aae7eba58cd4715f310c4a6b4040abdac2bf2 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:13:23 +0900 Subject: [PATCH 04/49] feat: login request --- .../gdscys/cokepoke/auth/dto/LoginRequest.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java b/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java index 96eebbc..aa0053a 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java +++ b/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java @@ -1,2 +1,16 @@ -package com.gdscys.cokepoke.auth.dto;public class LoginRequest { -} +package com.gdscys.cokepoke.auth.dto; + +import lombok.Getter; + +@Getter +public class LoginRequest { + private String email; + private String password; + + protected LoginRequest() {} + + public LoginRequest(String email, String password) { + this.email = email; + this.password = password; + } +} \ No newline at end of file From 63295b78d6359cf0230af66bdb899917c6d5bf0b Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:13:38 +0900 Subject: [PATCH 05/49] feat: jwt auth filter --- .../cokepoke/auth/jwt/JwtAuthFilter.java | 103 +++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java index 52cb169..d21571b 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java @@ -1,2 +1,103 @@ -package com.gdscys.cokepoke.auth.jwt;public class JwtAuthFilter { +package com.gdscys.cokepoke.auth.jwt; + +import com.gdscys.cokepoke.auth.domain.JwtCode; +import com.gdscys.cokepoke.auth.domain.TokenInfo; +import com.gdscys.cokepoke.member.repository.RefreshTokenRepository; +import com.gdscys.cokepoke.member.domain.RefreshToken; +import io.jsonwebtoken.Claims; +import javax.servlet.*; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Optional; + +@Slf4j +@RequiredArgsConstructor +public class JwtAuthFilter extends OncePerRequestFilter { + + private final JwtTokenProvider jwtTokenProvider; + private final RefreshTokenRepository refreshTokenRepository; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + Optional accessToken = extractTokenFromCookie(request, "accessToken"); + Optional refreshToken = extractTokenFromCookie(request, "refreshToken"); + + // 유효한 토큰인지 확인합니다. + if (accessToken.isPresent() && jwtTokenProvider.validateToken(accessToken.get()) == JwtCode.ACCESS) { + // 토큰이 유효하면 토큰으로부터 유저 정보를 받아옵니다. + Authentication authentication = jwtTokenProvider.getAuthentication(accessToken.get()); + // SecurityContext 에 Authentication 객체를 저장합니다. + SecurityContextHolder.getContext().setAuthentication(authentication); + } else if (accessToken.isPresent() && jwtTokenProvider.validateToken(accessToken.get()) == JwtCode.EXPIRED) { + log.info("Access token expired"); + + // refresh token 검증 + if (refreshToken.isPresent() && jwtTokenProvider.validateToken(refreshToken.get()) == JwtCode.ACCESS) { + + Optional savedToken = refreshTokenRepository.findByRefreshToken(refreshToken.get()); + + Claims claims = jwtTokenProvider.parseClaims(accessToken.get()); + + if (savedToken.isPresent() && claims.get("email").equals(savedToken.get().getMember().getEmail())) { + // accessToken 으로 부터 Authentication 객체 추출 + Authentication authentication = jwtTokenProvider.getAuthentication(accessToken.get()); + + // email 을 추출하여 accessToken, refreshToken 생성 + TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication, savedToken.get().getMember().getEmail()); + + // 인증 객체 설정 + SecurityContextHolder.getContext().setAuthentication(authentication); + + // refreshToken 업데이트 + savedToken.get().setRefreshToken(tokenInfo.getRefreshToken()); + refreshTokenRepository.save(savedToken.get()); + + response.addCookie(jwtTokenProvider.generateCookie("refreshToken", tokenInfo.getRefreshToken())); + response.addCookie(jwtTokenProvider.generateCookie("accessToken", tokenInfo.getAccessToken())); + + log.info("Reissue access token"); + } + } + } + + filterChain.doFilter(request, response); + } + + private Optional extractTokenFromCookie(HttpServletRequest request, String cookieName) { + + if (request.getCookies() == null || request.getCookies().length == 0) return Optional.empty(); + + return Arrays.stream(request.getCookies()) + .sequential() + .filter(cookie -> cookie.getName().equals(cookieName)) + .map(Cookie::getValue) + .findFirst(); + } + + @Override + protected boolean shouldNotFilter(HttpServletRequest request) { + // request 에서 요청 path 추출 + String path = request.getServletPath(); + + // filter 에서 제외한 url 목록 + String[] excludedPaths = { "/auth/login", "/auth/signUp"}; + + for (String excludedPath : excludedPaths) { + if (path.startsWith(excludedPath)) { + return true; + } + } + + return false; + } + } From 8d3bed610497d4e83759cd03f3c8eadb89339197 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:13:54 +0900 Subject: [PATCH 06/49] feat: jwt token provider --- .../cokepoke/auth/jwt/JwtTokenProvider.java | 120 +++++++++++++++++- 1 file changed, 119 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java index 398bf66..6e586ff 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java @@ -1,2 +1,120 @@ -package com.gdscys.cokepoke.auth.jwt;public class JwtTokenProvider { +package com.gdscys.cokepoke.auth.jwt; + +import com.gdscys.cokepoke.auth.domain.JwtCode; +import com.gdscys.cokepoke.auth.domain.TokenInfo; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import javax.servlet.http.Cookie; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +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; + +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; +import java.sql.Date; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collection; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class JwtTokenProvider { + + private final Key key; + + public JwtTokenProvider(@Value("${jwt.secret}") String secretKey) { + byte[] keyBytes = Base64.getDecoder().decode(secretKey.getBytes()); + this.key = new SecretKeySpec(keyBytes, SignatureAlgorithm.HS256.getJcaName()); + } + + public TokenInfo generateToken(Authentication authentication, String email) { + String authorities = authentication.getAuthorities().stream() + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); + + LocalDateTime now = LocalDateTime.now(); + + String accessToken = Jwts.builder() + .setSubject(authentication.getName()) + .claim("auth", authorities) + .claim("email", email) + .setExpiration(java.sql.Date.from(now + .plusMinutes(30) + .atZone(ZoneId.systemDefault()).toInstant())) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + + String refreshToken = Jwts.builder() + .setExpiration(Date.from(now + .plusDays(14) + .atZone(ZoneId.systemDefault()).toInstant())) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + + return new TokenInfo(accessToken, refreshToken); + } + + // JWT 토큰을 복호화하여 토큰에 들어있는 정보를 꺼내는 메서드 + public Authentication getAuthentication(String accessToken) { + // 토큰 복호화 + Claims claims = parseClaims(accessToken); + + if (claims.get("auth") == null) { + throw new AccessDeniedException("권한 정보가 없는 토큰입니다."); + } + + // 클레임에서 권한 정보 가져오기 + Collection authorities = + Arrays.stream(claims.get("auth").toString().split(",")) + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toList()); + + // UserDetails 객체를 만들어서 Authentication 리턴 + UserDetails principal = new User(claims.getSubject(), "", authorities); + return new UsernamePasswordAuthenticationToken(principal, "", authorities); + } + + + public JwtCode validateToken(String token) { + try { + Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + return JwtCode.ACCESS; + } catch (ExpiredJwtException e) { + // 기한 만료 + return JwtCode.EXPIRED; + } catch (Exception e) { + // parsing 에러 + return JwtCode.DENIED; + } + } + + public Claims parseClaims(String token) { + try { + return Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody(); + } catch (ExpiredJwtException e) { + return e.getClaims(); + } + } + + public Cookie generateCookie(String from, String token) { + Cookie cookie = new Cookie(from, token); + + cookie.setPath("/"); + cookie.setHttpOnly(true); // XSS 공격을 막기 위한 설정 + cookie.setSecure(true); + + return cookie; + } } From 8578d10a9091adcd40c1547d35146db6f41c917b Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:14:15 +0900 Subject: [PATCH 07/49] feat: query dsl config --- .../configuration/QueryDslConfig.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java index 5031f90..4a43933 100644 --- a/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java +++ b/src/main/java/com/gdscys/cokepoke/configuration/QueryDslConfig.java @@ -1,2 +1,21 @@ -package com.gdscys.cokepoke.configuration;public class QueryDslConfig { +package com.gdscys.cokepoke.configuration; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +@EnableJpaAuditing +@Configuration +public class QueryDslConfig { + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } } From 9340f2617f01c08bec2667b88c5f38c3132076a8 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:14:24 +0900 Subject: [PATCH 08/49] feat: security config --- .../configuration/SecurityConfig.java | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java index 8d3e7af..8ae7988 100644 --- a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java +++ b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java @@ -1,2 +1,55 @@ -package com.gdscys.cokepoke.configuration;public class SecurityConfig { +package com.gdscys.cokepoke.configuration; + +import com.gdscys.cokepoke.auth.jwt.JwtAuthFilter; +import com.gdscys.cokepoke.auth.jwt.JwtTokenProvider; +import com.gdscys.cokepoke.member.repository.RefreshTokenRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.security.servlet.PathRequest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.factory.PasswordEncoderFactories; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtTokenProvider jwtTokenProvider; + private final RefreshTokenRepository refreshTokenRepository; + + @Bean + public PasswordEncoder passwordEncoder() { + return PasswordEncoderFactories.createDelegatingPasswordEncoder(); + } + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { + // 정적 자원에 대해서 Security를 적용하지 않음으로 설정 + return web -> web.ignoring().requestMatchers(PathRequest.toStaticResources().atCommonLocations()); + } + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.httpBasic().disable() + .csrf().disable() + .formLogin().disable() + .headers().frameOptions().sameOrigin() + .and() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .authorizeRequests() + .antMatchers("/", "/auth/login", "/auth/signup", "/h2-console/**") + .permitAll() + .anyRequest().authenticated() + .and() + .addFilterBefore(new JwtAuthFilter(jwtTokenProvider, refreshTokenRepository), UsernamePasswordAuthenticationFilter.class); + return http.build(); + } + } + From 50032c1b48e87515c66ab727351efa7b94bd4012 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:14:32 +0900 Subject: [PATCH 09/49] feat: swagger config --- .../cokepoke/configuration/SwaggerConfig.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java index 17d6af7..6a979b4 100644 --- a/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java +++ b/src/main/java/com/gdscys/cokepoke/configuration/SwaggerConfig.java @@ -1,2 +1,24 @@ -package com.gdscys.cokepoke.configuration;public class SwaggerConfig { +package com.gdscys.cokepoke.configuration; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .components(new Components()) + .info(apiInfo()); + } + + private Info apiInfo() { + return new Info() + .title("Springdoc 테스트") + .description("Springdoc을 사용한 Swagger UI 테스트") + .version("1.0.0"); + } } From 91786bd9b5b0f0d65737bda2dab70bd674d2d8a6 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:14:41 +0900 Subject: [PATCH 10/49] feat: error response --- .../cokepoke/exception/ErrorResponse.java | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java b/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java index 6dd90b4..d2c7145 100644 --- a/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java +++ b/src/main/java/com/gdscys/cokepoke/exception/ErrorResponse.java @@ -1,2 +1,41 @@ -package com.gdscys.cokepoke.exception;public class ErrorResponse { +package com.gdscys.cokepoke.exception; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +@Getter +public class ErrorResponse { + private final Exception exception; + private final String message; + private final HttpStatus status; + private List errors; + + private ErrorResponse(Exception exception, String message, HttpStatus status) { + this.exception = exception; + this.message = message; + this.status = status; + } + + public static ErrorResponse of(Exception exception, String message, HttpStatus status) { + return new ErrorResponse(exception, message, status); + } + + @Getter + @RequiredArgsConstructor + private static class ValidationError { + private final String field; + private final String message; + } + + public void addValidationError(String field, String message){ + if(Objects.isNull(errors)){ + errors = new ArrayList<>(); + } + errors.add(new ValidationError(field, message)); + } } From 0ac1b03c0832f2dd7827df8b0bd6bb859b3cbce4 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:14:49 +0900 Subject: [PATCH 11/49] feat: global exception handler --- .../exception/GlobalExceptionHandler.java | 102 +++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java index 0003910..262444a 100644 --- a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java @@ -1,2 +1,102 @@ -package com.gdscys.cokepoke.exception;public class GlobalExceptionHandler { +package com.gdscys.cokepoke.exception; + + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.context.request.WebRequest; + +import java.io.IOException; +import java.nio.file.AccessDeniedException; +import java.util.NoSuchElementException; + +@ControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(IOException.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ResponseEntity handleIOException( + IOException exception + ) { + ErrorResponse response = ErrorResponse.of( + exception, + exception.getMessage(), + HttpStatus.INTERNAL_SERVER_ERROR + ); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); + } + + @ExceptionHandler(AccessDeniedException.class) + @ResponseStatus(HttpStatus.FORBIDDEN) + public ResponseEntity handleAccessDeniedException( + AccessDeniedException exception, + WebRequest request + ) { + ErrorResponse response = ErrorResponse.of( + exception, + exception.getMessage(), + HttpStatus.FORBIDDEN + ); + return ResponseEntity.status(HttpStatus.FORBIDDEN).body(response); + } + + @ExceptionHandler(NoSuchElementException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ResponseEntity handleNoSuchElementFoundException( + NoSuchElementException exception, WebRequest request + ) { + ErrorResponse response = ErrorResponse.of( + exception, + exception.getMessage(), + HttpStatus.NOT_FOUND + ); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY) + public ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException ex, + WebRequest request + ) { + ErrorResponse errorResponse = ErrorResponse.of( + ex, + "Validation error. Check 'errors' field for details.", + HttpStatus.UNPROCESSABLE_ENTITY + ); + + for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) { + errorResponse.addValidationError(fieldError.getField(), + fieldError.getDefaultMessage()); + } + return ResponseEntity.unprocessableEntity().body(errorResponse); + } + + @ExceptionHandler(IllegalArgumentException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ResponseEntity handleIllegalArgumentException( + IllegalArgumentException exception, + WebRequest request){ + ErrorResponse response = ErrorResponse.of(exception, + exception.getMessage(), + HttpStatus.BAD_REQUEST + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); + } + + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ResponseEntity handleAllUncaughtException( + Exception exception, + WebRequest request){ + ErrorResponse response = ErrorResponse.of(exception, + exception.getMessage(), + HttpStatus.INTERNAL_SERVER_ERROR + ); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); + } + } From 4e15829d98e9906932bfccab19f17da81d1636b8 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:15:01 +0900 Subject: [PATCH 12/49] feat: member controller --- .../member/controller/MemberController.java | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java b/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java index 8e4261d..5e7790a 100644 --- a/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java +++ b/src/main/java/com/gdscys/cokepoke/member/controller/MemberController.java @@ -1,2 +1,40 @@ -package com.gdscys.cokepoke.member.controller;public class MemberController { +package com.gdscys.cokepoke.member.controller; + +import com.gdscys.cokepoke.member.domain.Member; +import com.gdscys.cokepoke.member.dto.MemberResponse; +import com.gdscys.cokepoke.member.service.MemberService; +import javax.validation.constraints.Min; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/member") +@RequiredArgsConstructor +public class MemberController { + + private final MemberService memberService; + + @GetMapping("/my") + public ResponseEntity viewMy(@AuthenticationPrincipal Member member) { + return ResponseEntity.ok(MemberResponse.of(member)); + } + + @GetMapping("/all") + public ResponseEntity> viewAll(@AuthenticationPrincipal Member member, + @RequestParam @Min(0) int page) { + List responses = memberService.findAll(page) + .stream() + .map(MemberResponse::of) + .collect(Collectors.toList()); + return ResponseEntity.ok(responses); + } + } From c6d566638572b66021a8a5a127c0146e87e393e7 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:15:09 +0900 Subject: [PATCH 13/49] feat: member domain --- .../gdscys/cokepoke/member/domain/Member.java | 105 +++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java index fc1536c..0203b98 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java @@ -1,2 +1,105 @@ -package com.gdscys.cokepoke.member.domain;public class Member { +package com.gdscys.cokepoke.member.domain; + +import com.gdscys.cokepoke.validation.declaration.ValidEmail; +import javax.persistence.*; +import lombok.Getter; +import net.minidev.json.annotate.JsonIgnore; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.UpdateTimestamp; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +@Entity(name = "Member") +@Getter +@EntityListeners(AuditingEntityListener.class) +public class Member implements UserDetails { + + @Id @Column(name = "id", updatable = false, nullable = false, unique = true) + @GeneratedValue(generator = "uuid2") + @GenericGenerator(name = "uuid2", strategy = "uuid2") + private UUID id; + + @Column(name = "email", unique = true, nullable = false, columnDefinition = "varchar(40)") + @ValidEmail + private String email; + + @Column(name = "username", nullable = false, columnDefinition = "varchar(20)") + private String username; + + @JsonIgnore + @Column(name = "password_hash", nullable = false) + private String passwordHash; + + @CreationTimestamp + private LocalDateTime createdAt; + + @UpdateTimestamp + private LocalDateTime updatedAt; + + @OneToOne(mappedBy = "member", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private RefreshToken refreshToken; + + @ElementCollection(fetch = FetchType.EAGER) + private Set roles = new HashSet<>(); + + + protected Member() {} + + public Member(String email, String username, String passwordHash, Set roles) { + this.email = email; + this.username = username; + this.passwordHash = passwordHash; + this.roles = roles; + } + + public void updatePassword(String passwordHash) { + this.passwordHash = passwordHash; + } + + @Override + public Collection getAuthorities() { + return this.roles.stream() + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toSet()); + } + + @Override + public String getPassword() { + return this.passwordHash; + } + + @Override + public String getUsername() { + return this.username; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } } From b4d99026fb70e03bfd9f75ce45f85b325ba88978 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:15:22 +0900 Subject: [PATCH 14/49] feat: refresh token --- .../cokepoke/member/domain/RefreshToken.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java b/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java index 679a8ae..6a89bf2 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java +++ b/src/main/java/com/gdscys/cokepoke/member/domain/RefreshToken.java @@ -1,2 +1,32 @@ -package com.gdscys.cokepoke.member.domain;public class RefreshToken { +package com.gdscys.cokepoke.member.domain; + +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.GenericGenerator; + +import java.util.UUID; + +@Entity +@Getter +@Setter +public class RefreshToken { + + @Id + @GeneratedValue(generator = "uuid2") + @GenericGenerator(name = "uuid2", strategy = "uuid2") + private UUID id; + + private String refreshToken; + + @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", unique = true) + private Member member; + + public RefreshToken(String refreshToken, Member member) { + this.refreshToken = refreshToken; + this.member = member; + } + + protected RefreshToken() {} } From a57a047a7166fa385d8d43391f3640a135f44621 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:15:32 +0900 Subject: [PATCH 15/49] feat: member response --- .../cokepoke/member/dto/MemberResponse.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java b/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java index 13fc630..4ddae22 100644 --- a/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java +++ b/src/main/java/com/gdscys/cokepoke/member/dto/MemberResponse.java @@ -1,2 +1,26 @@ -package com.gdscys.cokepoke.member.dto;public class MemberRespons { +package com.gdscys.cokepoke.member.dto; + +import com.gdscys.cokepoke.member.domain.Member; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MemberResponse { + private String email; + private String username; + + protected MemberResponse() {} + + public MemberResponse(String email, String username) { + this.email = email; + this.username = username; + } + + public static MemberResponse of(Member member) { + return MemberResponse.builder() + .email(member.getEmail()) + .username(member.getUsername()) + .build(); + } } From aa97e43e0e9578a3de693ce91dc4c46fad71c0da Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:15:42 +0900 Subject: [PATCH 16/49] feat: signup request --- .../cokepoke/member/dto/SignupRequest.java | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java b/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java index 7867aa9..5093db7 100644 --- a/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java +++ b/src/main/java/com/gdscys/cokepoke/member/dto/SignupRequest.java @@ -1,2 +1,38 @@ -package com.gdscys.cokepoke.member.dto;public class SignupRequest { +package com.gdscys.cokepoke.member.dto; + +import com.gdscys.cokepoke.validation.declaration.PasswordMatches; +import com.gdscys.cokepoke.validation.declaration.ValidEmail; +import javax.validation.constraints.NotBlank; +import lombok.Builder; +import lombok.Getter; +import org.hibernate.validator.constraints.Length; + +@Getter +@PasswordMatches +public class SignupRequest { + + @NotBlank + @ValidEmail + private String email; + + @NotBlank + private String username; + + @NotBlank + @Length(min = 8, max = 20) + private String password; + + @NotBlank + @Length(min = 8, max = 20) + private String confirmPassword; + + protected SignupRequest() {} + + @Builder + public SignupRequest(String email, String username, String password, String confirmPassword) { + this.email = email; + this.username = username; + this.password = password; + this.confirmPassword = confirmPassword; + } } From 3fa0df6b084764741886cb0c15319955e0939597 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:15:54 +0900 Subject: [PATCH 17/49] feat: update member request --- .../member/dto/UpdateMemberRequest.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java b/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java index ce41def..b281cd1 100644 --- a/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java +++ b/src/main/java/com/gdscys/cokepoke/member/dto/UpdateMemberRequest.java @@ -1,2 +1,22 @@ -package com.gdscys.cokepoke.member.dto;public class UpdateMemberRequest { +package com.gdscys.cokepoke.member.dto; + +import com.gdscys.cokepoke.validation.declaration.PasswordMatches; +import lombok.Builder; +import lombok.Getter; + +@Getter +@PasswordMatches +public class UpdateMemberRequest { + private String originalPassword; + private String newPassword; + private String confirmNewPassword; + + protected UpdateMemberRequest() {} + + @Builder + public UpdateMemberRequest(String originalPassword, String newPassword, String confirmNewPassword) { + this.originalPassword = originalPassword; + this.newPassword = newPassword; + this.confirmNewPassword = confirmNewPassword; + } } From 8d2d636e94a6e18edca41455ac9eb6672c7717f6 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:16:01 +0900 Subject: [PATCH 18/49] feat: member repository --- .../member/repository/MemberRepository.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java b/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java index af59c4d..75ee26d 100644 --- a/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java +++ b/src/main/java/com/gdscys/cokepoke/member/repository/MemberRepository.java @@ -1,2 +1,19 @@ -package com.gdscys.cokepoke.member.repository;public interface MemberRepository { +package com.gdscys.cokepoke.member.repository; + +import com.gdscys.cokepoke.member.domain.Member; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + +import java.util.Optional; +import java.util.UUID; + +@Repository +public interface MemberRepository extends JpaRepository { + Optional findByEmail(String email); + Optional findByUsername(String username); + Boolean existsByEmail(String email); + Page findAll(Pageable pageable); } From d7e2aec563bbd8cb656af226fba8c65e9ad22450 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:16:11 +0900 Subject: [PATCH 19/49] feat: refresh token repository --- .../member/repository/RefreshTokenRepository.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java b/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java index ef4a865..453a724 100644 --- a/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java +++ b/src/main/java/com/gdscys/cokepoke/member/repository/RefreshTokenRepository.java @@ -1,2 +1,14 @@ -package com.gdscys.cokepoke.member.repository;public class RefreshTokenRepository { +package com.gdscys.cokepoke.member.repository; + +import com.gdscys.cokepoke.member.domain.RefreshToken; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; +import java.util.UUID; + +@Repository +public interface RefreshTokenRepository extends JpaRepository { + Optional findByMember_Email(String email); + Optional findByRefreshToken(String refreshToken); } From 840f8ff621b885f9664866114acac60aa7a9bf46 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:16:25 +0900 Subject: [PATCH 20/49] feat: custom user details service --- .../service/CustomUserDetailsService.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java b/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java index 912ba1e..e1f1eac 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java @@ -1,2 +1,30 @@ -package com.gdscys.cokepoke.member.service;public class CustomUserDetailsService { +package com.gdscys.cokepoke.member.service; + +import com.gdscys.cokepoke.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +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.Service; + +import java.util.Arrays; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberRepository memberRepository; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + return memberRepository.findByUsername(username) + .map(member -> User.builder() + .username(member.getUsername()) + .password(member.getPasswordHash()) + .roles(Arrays.toString(member.getRoles().toArray())) + .build()) + .orElseThrow(() -> new UsernameNotFoundException("User not found with username: " + username)); + } + } From b76e369b1e4ec10105afc479bc36d8cef61e57c5 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:19:46 +0900 Subject: [PATCH 21/49] feat: member service interface --- .../cokepoke/member/service/IMemberService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java index d54bbcd..bc00f7f 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java @@ -1,2 +1,13 @@ -package com.gdscys.cokepoke.member.service;public class IMemberService { +package com.gdscys.cokepoke.member.service; + +import com.gdscys.cokepoke.member.domain.Member; +import com.gdscys.cokepoke.member.dto.UpdateMemberRequest; + +import java.util.List; + +public interface IMemberService { + Member saveMember(String email, String username, String password); + void updateMember(Member member, UpdateMemberRequest request); + void deleteMember(Member member); + List findAll(int page); } From 2b3173acb38acbebe83a17a0af2a32a80d96eaa2 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:20:05 +0900 Subject: [PATCH 22/49] feat: member service --- .../member/service/MemberService.java | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java index b05bb13..2784124 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java @@ -1,2 +1,90 @@ -package com.gdscys.cokepoke.member.service;public class MemberService { +package com.gdscys.cokepoke.member.service; + +import com.gdscys.cokepoke.auth.jwt.JwtTokenProvider; +import com.gdscys.cokepoke.auth.domain.TokenInfo; +import com.gdscys.cokepoke.member.repository.RefreshTokenRepository; +import com.gdscys.cokepoke.member.domain.Member; + +import com.gdscys.cokepoke.member.domain.RefreshToken; +import com.gdscys.cokepoke.member.dto.UpdateMemberRequest; +import com.gdscys.cokepoke.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + + +@Service +@RequiredArgsConstructor +public class MemberService implements IMemberService { + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + private final AuthenticationManagerBuilder authenticationManagerBuilder; + private final JwtTokenProvider jwtTokenProvider; + private final RefreshTokenRepository refreshTokenRepository; + + private final static int PAGE_SIZE = 15; + + @Override + public Member saveMember(String email, String username, String password) { + Member member = new Member(email, username, passwordEncoder.encode(password), Set.of("USER")); + return memberRepository.save(member); + } + + @Transactional + public TokenInfo login(String email, String password) { + + UsernamePasswordAuthenticationToken authenticationToken = + new UsernamePasswordAuthenticationToken(email, password); + + Authentication authentication = authenticationManagerBuilder + .getObject().authenticate(authenticationToken); + Optional member = memberRepository.findByEmail(email); + + if (member.isEmpty()) { + throw new UsernameNotFoundException("User not found with email: " + email); + } + + //토큰 생성 + TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication, email); + + // refresh token 없으면 생성, 있으면 업데이트 + refreshTokenRepository.findByMember_Email(member.get().getEmail()) + .ifPresentOrElse(refreshToken -> { + refreshToken.setRefreshToken(tokenInfo.getRefreshToken()); + refreshTokenRepository.save(refreshToken); + }, () -> { + refreshTokenRepository.save(new RefreshToken(tokenInfo.getRefreshToken(), member.get())); + }); + return tokenInfo; + } + + @Override + public void updateMember(Member member, UpdateMemberRequest request) { + member.updatePassword(passwordEncoder.encode(request.getNewPassword())); + } + + @Override + public void deleteMember(Member member) { + memberRepository.delete(member); + } + + @Override + public List findAll(int page) { + PageRequest pr = PageRequest.of(page, PAGE_SIZE); + return memberRepository.findAll(pr).stream() + .sorted(Comparator.comparing(Member::getUsername)) + .collect(Collectors.toList()); + } } From 21cdbd72d724688effc5d657194097eadd5a6bae Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:20:20 +0900 Subject: [PATCH 23/49] feat: password matches validator --- .../declaration/PasswordMatches.java | 22 ++++++++++++- .../PasswordMatchesValidator.java | 31 ++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java b/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java index 2bd99a8..4ba4388 100644 --- a/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java +++ b/src/main/java/com/gdscys/cokepoke/validation/declaration/PasswordMatches.java @@ -1,2 +1,22 @@ -package com.gdscys.cokepoke.validation.declaration;public class PasswordMatches { +package com.gdscys.cokepoke.validation.declaration; + +import com.gdscys.cokepoke.validation.implementation.PasswordMatchesValidator; +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({TYPE,ANNOTATION_TYPE}) +@Retention(RUNTIME) +@Constraint(validatedBy = PasswordMatchesValidator.class) +@Documented +public @interface PasswordMatches { + String message() default "Your passwords do not match."; + Class[] groups() default {}; + Class[] payload() default {}; } diff --git a/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java b/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java index 02f3961..1526e4f 100644 --- a/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java +++ b/src/main/java/com/gdscys/cokepoke/validation/implementation/PasswordMatchesValidator.java @@ -1,2 +1,31 @@ -package com.gdscys.cokepoke.validation.implementation;public class PasswordMatchesValidator { +package com.gdscys.cokepoke.validation.implementation; + +import com.gdscys.cokepoke.member.dto.SignupRequest; +import com.gdscys.cokepoke.member.dto.UpdateMemberRequest; +import com.gdscys.cokepoke.validation.declaration.PasswordMatches; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +public class PasswordMatchesValidator implements ConstraintValidator { + + @Override + public boolean isValid(Object obj, ConstraintValidatorContext context){ + if (obj.getClass().equals(SignupRequest.class)) { + return validateSignupRequest(obj); + } + if (obj.getClass().equals(UpdateMemberRequest.class)) { + return validateUpdateUserRequest(obj); + } + return false; + } + + public boolean validateSignupRequest(Object obj) { + SignupRequest request = (SignupRequest) obj; + return request.getPassword().equals(request.getConfirmPassword()); + } + public boolean validateUpdateUserRequest(Object obj) { + UpdateMemberRequest request = (UpdateMemberRequest) obj; + return ((!request.getOriginalPassword().equals(request.getNewPassword())) + && request.getNewPassword().equals(request.getConfirmNewPassword())); + } } From e206db6c676650635c93aeb84dc47521825c9a59 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 00:20:33 +0900 Subject: [PATCH 24/49] feat: validate email --- .../validation/declaration/ValidEmail.java | 19 +++++++++++- .../implementation/EmailValidator.java | 29 ++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java b/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java index 1231bf1..f5d7081 100644 --- a/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java +++ b/src/main/java/com/gdscys/cokepoke/validation/declaration/ValidEmail.java @@ -1,2 +1,19 @@ -package com.gdscys.cokepoke.validation.declaration;public class ValidEmail { +package com.gdscys.cokepoke.validation.declaration; + +import com.gdscys.cokepoke.validation.implementation.EmailValidator; +import javax.validation.Constraint; +import javax.validation.Payload; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE, ElementType.FIELD, ElementType.ANNOTATION_TYPE}) +@Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +@Constraint(validatedBy = {EmailValidator.class}) +public @interface ValidEmail { + + String message() default "Invalid email"; + Class[] groups() default {}; + Class[] payload() default {}; } diff --git a/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java b/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java index 7ac8552..80136a4 100644 --- a/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java +++ b/src/main/java/com/gdscys/cokepoke/validation/implementation/EmailValidator.java @@ -1,2 +1,29 @@ -package com.gdscys.cokepoke.validation.implementation;public class EmailValidator { +package com.gdscys.cokepoke.validation.implementation; + +import com.gdscys.cokepoke.validation.declaration.ValidEmail; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class EmailValidator implements ConstraintValidator { + + private Pattern pattern; + private Matcher matcher; + private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-+]+(.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(.[A-Za-z0-9]+)*(.[A-Za-z]{2,})$"; + + @Override + public void initialize(ValidEmail constraintAnnotation) {} + + @Override + public boolean isValid(String email, ConstraintValidatorContext context) { + return validateEmail(email); + } + + private boolean validateEmail(String email) { + pattern = Pattern.compile(EMAIL_PATTERN); + matcher = pattern.matcher(email); + return matcher.matches(); + } } From fc6fc9f3eb76c51fb9edea93087a33476d70bce3 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 01:50:13 +0900 Subject: [PATCH 25/49] feat: constraints added --- .../gdscys/cokepoke/auth/controller/AuthController.java | 7 ++----- .../java/com/gdscys/cokepoke/auth/dto/LoginRequest.java | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java b/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java index fdc5341..fff58fc 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java +++ b/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java @@ -34,11 +34,8 @@ public ResponseEntity signup(@RequestBody @Valid SignupRequest r .body(MemberResponse.of(member)); } - @PostMapping(value = "/login", - consumes = "application/json", - produces = "application/json" - ) - public ResponseEntity login(@RequestBody LoginRequest loginRequest) { + @PostMapping(value = "/login") + public ResponseEntity login(@RequestBody @Valid LoginRequest loginRequest) { TokenInfo tokenInfo = memberService.login(loginRequest.getEmail(), loginRequest.getPassword()); return ResponseEntity.ok() .header(SET_COOKIE, generateCookie("accessToken", tokenInfo.getAccessToken()).toString()) diff --git a/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java b/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java index aa0053a..1786810 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java +++ b/src/main/java/com/gdscys/cokepoke/auth/dto/LoginRequest.java @@ -1,10 +1,17 @@ package com.gdscys.cokepoke.auth.dto; +import com.gdscys.cokepoke.validation.declaration.ValidEmail; import lombok.Getter; +import javax.validation.constraints.NotBlank; + @Getter public class LoginRequest { + + @ValidEmail private String email; + + @NotBlank private String password; protected LoginRequest() {} From 9ddfaaf101ffcc8b5cf00f2958d9d4fc7f4aeb24 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 01:50:24 +0900 Subject: [PATCH 26/49] fix: filter chain --- .../cokepoke/auth/jwt/JwtAuthFilter.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java index d21571b..7a1cc75 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java @@ -1,20 +1,23 @@ package com.gdscys.cokepoke.auth.jwt; + import com.gdscys.cokepoke.auth.domain.JwtCode; import com.gdscys.cokepoke.auth.domain.TokenInfo; -import com.gdscys.cokepoke.member.repository.RefreshTokenRepository; import com.gdscys.cokepoke.member.domain.RefreshToken; +import com.gdscys.cokepoke.member.repository.RefreshTokenRepository; import io.jsonwebtoken.Claims; -import javax.servlet.*; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.Optional; @@ -89,7 +92,7 @@ protected boolean shouldNotFilter(HttpServletRequest request) { String path = request.getServletPath(); // filter 에서 제외한 url 목록 - String[] excludedPaths = { "/auth/login", "/auth/signUp"}; + String[] excludedPaths = { "/auth/login", "/auth/signup", "/h2-console"}; for (String excludedPath : excludedPaths) { if (path.startsWith(excludedPath)) { @@ -99,5 +102,4 @@ protected boolean shouldNotFilter(HttpServletRequest request) { return false; } - -} +} \ No newline at end of file From 22cfdc7855df33febf933331bf484ff045e9c7f0 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 01:51:36 +0900 Subject: [PATCH 27/49] fix: imports --- .../gdscys/cokepoke/auth/jwt/JwtTokenProvider.java | 13 +++++-------- .../cokepoke/configuration/SecurityConfig.java | 13 ++++++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java index 6e586ff..7b3a2c4 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtTokenProvider.java @@ -2,11 +2,7 @@ import com.gdscys.cokepoke.auth.domain.JwtCode; import com.gdscys.cokepoke.auth.domain.TokenInfo; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.ExpiredJwtException; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import javax.servlet.http.Cookie; +import io.jsonwebtoken.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.AccessDeniedException; @@ -19,6 +15,7 @@ import org.springframework.stereotype.Component; import javax.crypto.spec.SecretKeySpec; +import javax.servlet.http.Cookie; import java.security.Key; import java.sql.Date; import java.time.LocalDateTime; @@ -31,7 +28,6 @@ @Slf4j @Component public class JwtTokenProvider { - private final Key key; public JwtTokenProvider(@Value("${jwt.secret}") String secretKey) { @@ -50,7 +46,7 @@ public TokenInfo generateToken(Authentication authentication, String email) { .setSubject(authentication.getName()) .claim("auth", authorities) .claim("email", email) - .setExpiration(java.sql.Date.from(now + .setExpiration(Date.from(now .plusMinutes(30) .atZone(ZoneId.systemDefault()).toInstant())) .signWith(key, SignatureAlgorithm.HS256) @@ -117,4 +113,5 @@ public Cookie generateCookie(String from, String token) { return cookie; } -} + +} \ No newline at end of file diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java index 8ae7988..5934da2 100644 --- a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java +++ b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java @@ -40,16 +40,19 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .formLogin().disable() .headers().frameOptions().sameOrigin() .and() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() .authorizeRequests() - .antMatchers("/", "/auth/login", "/auth/signup", "/h2-console/**") + .antMatchers("/", "/auth/login", "/auth/signup", + "/h2-console/**") .permitAll() .anyRequest().authenticated() .and() .addFilterBefore(new JwtAuthFilter(jwtTokenProvider, refreshTokenRepository), UsernamePasswordAuthenticationFilter.class); + return http.build(); - } -} + + } + +} \ No newline at end of file From 3709231668b048e3bb96e5cf6499f4952990d931 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 01:52:00 +0900 Subject: [PATCH 28/49] fix: delete redundant code --- .../cokepoke/exception/GlobalExceptionHandler.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java index 262444a..1a6928c 100644 --- a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java @@ -16,18 +16,6 @@ @ControllerAdvice public class GlobalExceptionHandler { - @ExceptionHandler(IOException.class) - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - public ResponseEntity handleIOException( - IOException exception - ) { - ErrorResponse response = ErrorResponse.of( - exception, - exception.getMessage(), - HttpStatus.INTERNAL_SERVER_ERROR - ); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); - } @ExceptionHandler(AccessDeniedException.class) @ResponseStatus(HttpStatus.FORBIDDEN) @@ -99,4 +87,5 @@ public ResponseEntity handleAllUncaughtException( return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); } + } From 944fbdf985b8eb5324a75fca5b784f0042697b2b Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:16:00 +0900 Subject: [PATCH 29/49] feat: friendship --- .../cokepoke/member/domain/Friendship.java | 37 +++++++++++++++++++ .../gdscys/cokepoke/member/domain/Member.java | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java b/src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java new file mode 100644 index 0000000..b55ec67 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java @@ -0,0 +1,37 @@ +package com.gdscys.cokepoke.member.domain; + +import lombok.Getter; + +import javax.persistence.*; + +@Entity(name = "Friends") +@Getter +@SequenceGenerator(name = "FRIENDS_SEQ_GEN", sequenceName = "FRIENDS_SEQ", allocationSize = 1) +public class Friendship { + + @Id @GeneratedValue(generator = "FRIENDS_SEQ_GEN") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "id") + private Member requestMember; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "id") + private Member recipientMember; + + @Column(name = "is_accepted", columnDefinition = "boolean default false") + private boolean isAccepted; + + protected Friendship() {} + + public Friendship(Member requestMember, Member recipientMember) { + this.requestMember = requestMember; + this.recipientMember = recipientMember; + } + + public void accept() { + this.isAccepted = true; + } + +} diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java index 0203b98..1b1dbe5 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java @@ -40,6 +40,9 @@ public class Member implements UserDetails { @Column(name = "password_hash", nullable = false) private String passwordHash; + @OneToMany(mappedBy = "member", fetch = FetchType.LAZY) + private Set friendships = new HashSet<>(); + @CreationTimestamp private LocalDateTime createdAt; From 3d072ca0ff75bfbca7fef4e36e34d57f8a806f40 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:19:41 +0900 Subject: [PATCH 30/49] refactor --- .../cokepoke/{member => friendship}/domain/Friendship.java | 3 ++- .../cokepoke/friendship/repository/FriendshipRepository.java | 2 ++ src/main/java/com/gdscys/cokepoke/member/domain/Member.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) rename src/main/java/com/gdscys/cokepoke/{member => friendship}/domain/Friendship.java (90%) create mode 100644 src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java similarity index 90% rename from src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java rename to src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java index b55ec67..abc3e65 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/Friendship.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java @@ -1,5 +1,6 @@ -package com.gdscys.cokepoke.member.domain; +package com.gdscys.cokepoke.friendship.domain; +import com.gdscys.cokepoke.member.domain.Member; import lombok.Getter; import javax.persistence.*; diff --git a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java new file mode 100644 index 0000000..59c79f4 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.friendship.repository;public interface FriendshipRepository { +} diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java index 1b1dbe5..1dc4259 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java @@ -1,5 +1,6 @@ package com.gdscys.cokepoke.member.domain; +import com.gdscys.cokepoke.friendship.domain.Friendship; import com.gdscys.cokepoke.validation.declaration.ValidEmail; import javax.persistence.*; import lombok.Getter; From 586f77c37e67da55cb323c246674aa13d7349df7 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:19:48 +0900 Subject: [PATCH 31/49] feat: friendship repository --- .../repository/FriendshipRepository.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java index 59c79f4..143e2ad 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java @@ -1,2 +1,19 @@ -package com.gdscys.cokepoke.friendship.repository;public interface FriendshipRepository { +package com.gdscys.cokepoke.friendship.repository; + +import com.gdscys.cokepoke.friendship.domain.Friendship; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface FriendshipRepository extends JpaRepository { + + Page findAllByRequestMember(Long requestMember, Pageable pageable); + Page findAllByRecipientMember(Long recipientMember, Pageable pageable); + Optional findByRequestMemberAndRecipientMember(Long requestMember, Long recipientMember); + Optional findByRequestMemberOrRecipientMemberAndAccepted(Long requestMember, Long recipientMember, boolean accepted); + } From c47ae0fc10b399813008f0a4cbf3016898583367 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:30:45 +0900 Subject: [PATCH 32/49] fix: friendship repository --- .../friendship/repository/FriendshipRepository.java | 10 ++++++---- .../cokepoke/friendship/service/FriendshipService.java | 2 ++ .../friendship/service/IFriendshipService.java | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java create mode 100644 src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java diff --git a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java index 143e2ad..16a24b3 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java @@ -1,6 +1,7 @@ package com.gdscys.cokepoke.friendship.repository; import com.gdscys.cokepoke.friendship.domain.Friendship; +import com.gdscys.cokepoke.member.domain.Member; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -11,9 +12,10 @@ @Repository public interface FriendshipRepository extends JpaRepository { - Page findAllByRequestMember(Long requestMember, Pageable pageable); - Page findAllByRecipientMember(Long recipientMember, Pageable pageable); - Optional findByRequestMemberAndRecipientMember(Long requestMember, Long recipientMember); - Optional findByRequestMemberOrRecipientMemberAndAccepted(Long requestMember, Long recipientMember, boolean accepted); + Page findAllByRequestMember(Member requestMember, Pageable pageable); + Page findAllByRecipientMember(Member recipientMember, Pageable pageable); + Page findAllByRequestMemberOrRecipientMember(Member member); + Optional findByRequestMemberAndRecipientMember(Member requestMember, Member recipientMember); + Optional findByRequestMemberOrRecipientMemberAndAccepted(Member requestMember, Member recipientMember, boolean accepted); } diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java new file mode 100644 index 0000000..fcfc1a5 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.friendship.service;public class FriendshipService { +} diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java new file mode 100644 index 0000000..518d480 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.friendship.service;public interface IFriendshipService { +} From ec6a5b850bb313fe9dcbed887cb15a49d36038b1 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:30:59 +0900 Subject: [PATCH 33/49] feat: friendship service --- .../cokepoke/friendship/service/IFriendshipService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java index 518d480..35419cf 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java @@ -1,2 +1,9 @@ -package com.gdscys.cokepoke.friendship.service;public interface IFriendshipService { +package com.gdscys.cokepoke.friendship.service; + +import com.gdscys.cokepoke.member.domain.Member; + +public interface IFriendshipService { + + void createFriendship(Member requestMember, Member recipientMember); + void deleteFriendship(Member requestMember, Member recipientMember); } From 375be84dc776391d76a00a110bf2900d9169fb5f Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:31:05 +0900 Subject: [PATCH 34/49] feat: friendship service --- .../friendship/service/FriendshipService.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java index fcfc1a5..5f5401c 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -1,2 +1,26 @@ -package com.gdscys.cokepoke.friendship.service;public class FriendshipService { +package com.gdscys.cokepoke.friendship.service; + +import com.gdscys.cokepoke.friendship.domain.Friendship; +import com.gdscys.cokepoke.friendship.repository.FriendshipRepository; +import com.gdscys.cokepoke.member.domain.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class FriendshipService implements IFriendshipService { + private final FriendshipRepository friendshipRepository; + + @Override + public void createFriendship(Member requestMember, Member recipientMember) { + Friendship friendship = new Friendship(requestMember, recipientMember); + friendshipRepository.save(friendship); + } + + @Override + public void deleteFriendship(Member requestMember, Member recipientMember) { + Friendship friendship = friendshipRepository.findByRequestMemberAndRecipientMember(requestMember, recipientMember) + .orElseThrow(() -> new IllegalArgumentException("No friendship found between: " + requestMember.getUsername() + " and " + recipientMember.getUsername() + ".")); + friendshipRepository.delete(friendship); + } } From 22da1a3182cfb4259e33a9b5d6c41336f00ef93a Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:39:40 +0900 Subject: [PATCH 35/49] fix: entity name --- .../cokepoke/friendship/controller/FriendshipController.java | 2 ++ .../java/com/gdscys/cokepoke/friendship/domain/Friendship.java | 2 +- .../com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java | 2 ++ .../com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java create mode 100644 src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java create mode 100644 src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java diff --git a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java new file mode 100644 index 0000000..7cc71ae --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.friendship.controller;public class FriendshipController { +} diff --git a/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java index abc3e65..58e061f 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java @@ -5,7 +5,7 @@ import javax.persistence.*; -@Entity(name = "Friends") +@Entity(name = "Friendship") @Getter @SequenceGenerator(name = "FRIENDS_SEQ_GEN", sequenceName = "FRIENDS_SEQ", allocationSize = 1) public class Friendship { diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java new file mode 100644 index 0000000..d92ee2d --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.friendship.dto;public class FriendshipRequest { +} diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java new file mode 100644 index 0000000..20db11a --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java @@ -0,0 +1,2 @@ +package com.gdscys.cokepoke.friendship.dto;public class FriendshipResponse { +} From a0bc06c9a2bb31e367064df3e1a1d0dec733a4c7 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:39:47 +0900 Subject: [PATCH 36/49] feat: friendship request --- .../cokepoke/friendship/dto/FriendshipRequest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java index d92ee2d..e8e134d 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java @@ -1,2 +1,13 @@ -package com.gdscys.cokepoke.friendship.dto;public class FriendshipRequest { +package com.gdscys.cokepoke.friendship.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class FriendshipRequest { + private String requestUsername; + private String recipientUsername; + + protected FriendshipRequest() {} } From 357ae964fd6a3968722d6f6b2f28fd7dd3698dc4 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:39:57 +0900 Subject: [PATCH 37/49] feat: friendship response --- .../friendship/dto/FriendshipResponse.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java index 20db11a..8a55974 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java @@ -1,2 +1,14 @@ -package com.gdscys.cokepoke.friendship.dto;public class FriendshipResponse { +package com.gdscys.cokepoke.friendship.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class FriendshipResponse { + private String username1; + private String username2; + + protected FriendshipResponse() {} + } From 6fbbc4aa8efeff6899f14a91d889ecba8b8d5fe5 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:40:16 +0900 Subject: [PATCH 38/49] feat(MemberService): find by username --- .../com/gdscys/cokepoke/member/service/IMemberService.java | 1 + .../com/gdscys/cokepoke/member/service/MemberService.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java index bc00f7f..68e95fd 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/IMemberService.java @@ -7,6 +7,7 @@ public interface IMemberService { Member saveMember(String email, String username, String password); + Member findMemberByUsername(String username); void updateMember(Member member, UpdateMemberRequest request); void deleteMember(Member member); List findAll(int page); diff --git a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java index 2784124..c453b53 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java @@ -42,6 +42,12 @@ public Member saveMember(String email, String username, String password) { return memberRepository.save(member); } + @Override + public Member findMemberByUsername(String username) { + return memberRepository.findByUsername(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found with username: " + username)); + } + @Transactional public TokenInfo login(String email, String password) { From 33bd72c0bab20aa6bf083138fd80db3fb5c7b011 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:55:13 +0900 Subject: [PATCH 39/49] feat: friendship controller --- .../controller/FriendshipController.java | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java index 7cc71ae..0e5f2da 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java @@ -1,2 +1,46 @@ -package com.gdscys.cokepoke.friendship.controller;public class FriendshipController { +package com.gdscys.cokepoke.friendship.controller; + +import com.gdscys.cokepoke.friendship.dto.FriendshipRequest; +import com.gdscys.cokepoke.friendship.dto.FriendshipResponse; +import com.gdscys.cokepoke.friendship.service.FriendshipService; +import com.gdscys.cokepoke.member.domain.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; + +import static java.util.stream.Nodes.collect; + +@Controller +@RequestMapping("/friendship") +@RequiredArgsConstructor +public class FriendshipController { + + private final FriendshipService friendshipService; + + // 친구관계 만들기 + @PostMapping("/create") + public ResponseEntity createFriendship(@AuthenticationPrincipal Member member, + @RequestBody @Valid FriendshipRequest request) { + friendshipService.createFriendship(member, request.getRecipientUsername()); + return ResponseEntity.status(HttpStatus.CREATED).build(); + } + + // 내 친구관계 전체조회 + @GetMapping("/my") + public ResponseEntity> findFriendshipsByMember(@AuthenticationPrincipal Member member, + @RequestParam(defaultValue = "0") int page) { + List responses = friendshipService.findFriendshipsByMember(member, page) + .stream() + .map(FriendshipResponse::of) + .collect(Collectors.toList()); + } + + } From 9c8f18b9bfda58b918f7e5dea484b3306a4751eb Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:55:26 +0900 Subject: [PATCH 40/49] fix: friendship request --- .../com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java index e8e134d..6dd4f67 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java @@ -3,10 +3,12 @@ import lombok.AllArgsConstructor; import lombok.Getter; +import javax.validation.constraints.NotBlank; + @Getter @AllArgsConstructor public class FriendshipRequest { - private String requestUsername; + @NotBlank private String recipientUsername; protected FriendshipRequest() {} From 3872955025dba2b4c23b6e8965441ef937fdbc67 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:55:40 +0900 Subject: [PATCH 41/49] feat: converter --- .../gdscys/cokepoke/friendship/dto/FriendshipResponse.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java index 8a55974..a643fdc 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java @@ -1,5 +1,6 @@ package com.gdscys.cokepoke.friendship.dto; +import com.gdscys.cokepoke.friendship.domain.Friendship; import lombok.AllArgsConstructor; import lombok.Getter; @@ -11,4 +12,10 @@ public class FriendshipResponse { protected FriendshipResponse() {} + public static FriendshipResponse of(Friendship friendship) { + String username1 = friendship.getRequestMember().getUsername(); + String username2 = friendship.getRecipientMember().getUsername(); + return new FriendshipResponse(username1, username2); + } + } From cb77fc41ce4d77a595d1de2b078ff69d45372298 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:55:57 +0900 Subject: [PATCH 42/49] feat: friendship service --- .../repository/FriendshipRepository.java | 2 +- .../friendship/service/FriendshipService.java | 36 +++++++++++++++---- .../service/IFriendshipService.java | 10 ++++-- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java index 16a24b3..bcc37cc 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java @@ -14,7 +14,7 @@ public interface FriendshipRepository extends JpaRepository { Page findAllByRequestMember(Member requestMember, Pageable pageable); Page findAllByRecipientMember(Member recipientMember, Pageable pageable); - Page findAllByRequestMemberOrRecipientMember(Member member); + Page findAllByRequestMemberOrRecipientMember(Member member, Pageable pageable); Optional findByRequestMemberAndRecipientMember(Member requestMember, Member recipientMember); Optional findByRequestMemberOrRecipientMemberAndAccepted(Member requestMember, Member recipientMember, boolean accepted); diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java index 5f5401c..12ba32e 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -3,24 +3,48 @@ import com.gdscys.cokepoke.friendship.domain.Friendship; import com.gdscys.cokepoke.friendship.repository.FriendshipRepository; import com.gdscys.cokepoke.member.domain.Member; +import com.gdscys.cokepoke.member.service.MemberService; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Optional; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor public class FriendshipService implements IFriendshipService { private final FriendshipRepository friendshipRepository; + private final MemberService memberService; + + private static final int PAGE_SIZE = 15; @Override - public void createFriendship(Member requestMember, Member recipientMember) { - Friendship friendship = new Friendship(requestMember, recipientMember); + public void createFriendship(Member member, String recipientUsername) { + Member recipientMember = memberService.findMemberByUsername(recipientUsername); + Friendship friendship = new Friendship(member, recipientMember); friendshipRepository.save(friendship); } @Override - public void deleteFriendship(Member requestMember, Member recipientMember) { - Friendship friendship = friendshipRepository.findByRequestMemberAndRecipientMember(requestMember, recipientMember) - .orElseThrow(() -> new IllegalArgumentException("No friendship found between: " + requestMember.getUsername() + " and " + recipientMember.getUsername() + ".")); - friendshipRepository.delete(friendship); + public Friendship findFriendshipByMembers(Member member, String username2) { + Member member2 = memberService.findMemberByUsername(username2); + + Optional friendship = friendshipRepository.findByRequestMemberAndRecipientMember(member, member2); + Optional friendship2 = friendshipRepository.findByRequestMemberAndRecipientMember(member2, member); + + if (friendship.isEmpty() && friendship2.isEmpty()) throw new NoSuchElementException("No friendship found between " + member2.getUsername() + " and " + username2); + else return friendship.orElseGet(friendship2::get); + } + + @Override + public List findFriendshipsByMember(Member member, int page) { + PageRequest pageRequest = PageRequest.of(page, PAGE_SIZE); + return friendshipRepository.findAllByRequestMemberOrRecipientMember(member, pageRequest) + .stream() + .collect(Collectors.toList()); } + } diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java index 35419cf..03585b5 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java @@ -1,9 +1,15 @@ package com.gdscys.cokepoke.friendship.service; +import com.gdscys.cokepoke.friendship.domain.Friendship; import com.gdscys.cokepoke.member.domain.Member; +import java.util.List; + public interface IFriendshipService { - void createFriendship(Member requestMember, Member recipientMember); - void deleteFriendship(Member requestMember, Member recipientMember); + void createFriendship(Member member, String recipientUsername); + + Friendship findFriendshipByMembers(Member member, String username2); + + List findFriendshipsByMember(Member member, int page); } From 9e39d396caebc029326c8bde69be2587ec3082c1 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 02:57:01 +0900 Subject: [PATCH 43/49] fix: error --- .../cokepoke/friendship/controller/FriendshipController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java index 0e5f2da..8b29a2c 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.stream.Collectors; -import static java.util.stream.Nodes.collect; @Controller @RequestMapping("/friendship") @@ -40,6 +39,8 @@ public ResponseEntity> findFriendshipsByMember(@Authent .stream() .map(FriendshipResponse::of) .collect(Collectors.toList()); + + return ResponseEntity.ok(responses); } From 9c1df6b369625d5c1202ce944c56ebdb3400fd47 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 03:06:08 +0900 Subject: [PATCH 44/49] fix: friendship --- .../com/gdscys/cokepoke/friendship/domain/Friendship.java | 2 ++ .../cokepoke/friendship/service/FriendshipService.java | 5 +++++ .../java/com/gdscys/cokepoke/member/domain/Member.java | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java index 58e061f..f2cce52 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java @@ -15,10 +15,12 @@ public class Friendship { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "id") + @Column(name = "request_member_id") private Member requestMember; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "id") + @Column(name = "recipient_member_id") private Member recipientMember; @Column(name = "is_accepted", columnDefinition = "boolean default false") diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java index 12ba32e..7f283a8 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -24,6 +24,11 @@ public class FriendshipService implements IFriendshipService { @Override public void createFriendship(Member member, String recipientUsername) { Member recipientMember = memberService.findMemberByUsername(recipientUsername); + if (member.equals(recipientMember)) throw new IllegalArgumentException("You cannot be friends with yourself"); + if (friendshipRepository.findByRequestMemberAndRecipientMember(member, recipientMember).isPresent() || + friendshipRepository.findByRequestMemberAndRecipientMember(recipientMember, member).isPresent() + ) throw new IllegalArgumentException("You are already friends with " + recipientUsername); + Friendship friendship = new Friendship(member, recipientMember); friendshipRepository.save(friendship); } diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java index 1dc4259..9467066 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java @@ -41,8 +41,11 @@ public class Member implements UserDetails { @Column(name = "password_hash", nullable = false) private String passwordHash; - @OneToMany(mappedBy = "member", fetch = FetchType.LAZY) - private Set friendships = new HashSet<>(); + @OneToMany(mappedBy = "request_member", fetch = FetchType.LAZY) + private Set requestedFriendships = new HashSet<>(); + + @OneToMany(mappedBy = "recipient_member", fetch = FetchType.LAZY) + private Set receivedFriendships = new HashSet<>(); @CreationTimestamp private LocalDateTime createdAt; From ef9a13b86cece55924788fdfd171b876f8b7c81e Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 03:47:43 +0900 Subject: [PATCH 45/49] fix --- .../friendship/domain/Friendship.java | 21 ++++++------ .../friendship/dto/FriendshipResponse.java | 4 +-- .../repository/FriendshipRepository.java | 10 +++--- .../friendship/service/FriendshipService.java | 34 +++++++++++++------ .../gdscys/cokepoke/member/domain/Member.java | 16 ++++++--- 5 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java index f2cce52..77fa95e 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/domain/Friendship.java @@ -13,24 +13,23 @@ public class Friendship { @Id @GeneratedValue(generator = "FRIENDS_SEQ_GEN") private Long id; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id") - @Column(name = "request_member_id") - private Member requestMember; + @ManyToOne + @JoinColumn(name="from_member_id") + private Member from; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "id") - @Column(name = "recipient_member_id") - private Member recipientMember; + @ManyToOne + @JoinColumn(name="to_member_id") + private Member to; @Column(name = "is_accepted", columnDefinition = "boolean default false") private boolean isAccepted; protected Friendship() {} - public Friendship(Member requestMember, Member recipientMember) { - this.requestMember = requestMember; - this.recipientMember = recipientMember; + public Friendship(Member from, Member to) { + this.from = from; + this.to = to; + this.isAccepted = false; } public void accept() { diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java index a643fdc..3d877c1 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipResponse.java @@ -13,8 +13,8 @@ public class FriendshipResponse { protected FriendshipResponse() {} public static FriendshipResponse of(Friendship friendship) { - String username1 = friendship.getRequestMember().getUsername(); - String username2 = friendship.getRecipientMember().getUsername(); + String username1 = friendship.getFrom().getUsername(); + String username2 = friendship.getTo().getUsername(); return new FriendshipResponse(username1, username2); } diff --git a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java index bcc37cc..b0edd81 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/repository/FriendshipRepository.java @@ -12,10 +12,8 @@ @Repository public interface FriendshipRepository extends JpaRepository { - Page findAllByRequestMember(Member requestMember, Pageable pageable); - Page findAllByRecipientMember(Member recipientMember, Pageable pageable); - Page findAllByRequestMemberOrRecipientMember(Member member, Pageable pageable); - Optional findByRequestMemberAndRecipientMember(Member requestMember, Member recipientMember); - Optional findByRequestMemberOrRecipientMemberAndAccepted(Member requestMember, Member recipientMember, boolean accepted); - + Page findAllByFrom(Member from, Pageable pageable); + Page findAllByTo(Member to, Pageable pageable); + Optional findByFromAndTo(Member from, Member to); + Optional findByFrom(Member from); } diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java index 7f283a8..72580bc 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -23,33 +23,45 @@ public class FriendshipService implements IFriendshipService { @Override public void createFriendship(Member member, String recipientUsername) { - Member recipientMember = memberService.findMemberByUsername(recipientUsername); - if (member.equals(recipientMember)) throw new IllegalArgumentException("You cannot be friends with yourself"); - if (friendshipRepository.findByRequestMemberAndRecipientMember(member, recipientMember).isPresent() || - friendshipRepository.findByRequestMemberAndRecipientMember(recipientMember, member).isPresent() - ) throw new IllegalArgumentException("You are already friends with " + recipientUsername); + Member to = memberService.findMemberByUsername(recipientUsername); + if (member.equals(to)) throw new IllegalArgumentException("You cannot be friends with yourself"); + if (friendshipRepository.findByFromAndTo(member, to).isPresent()) { + throw new IllegalArgumentException("You already sent a friend request"); + } - Friendship friendship = new Friendship(member, recipientMember); + Friendship friendship = new Friendship(member, to); friendshipRepository.save(friendship); + member.addRequested(friendship); + to.addReceived(friendship); + checkIfFriendshipExists(friendship); } @Override public Friendship findFriendshipByMembers(Member member, String username2) { - Member member2 = memberService.findMemberByUsername(username2); + Member to = memberService.findMemberByUsername(username2); - Optional friendship = friendshipRepository.findByRequestMemberAndRecipientMember(member, member2); - Optional friendship2 = friendshipRepository.findByRequestMemberAndRecipientMember(member2, member); + Optional friendship = friendshipRepository.findByFromAndTo(member, to); + Optional friendship2 = friendshipRepository.findByFromAndTo(to, member); - if (friendship.isEmpty() && friendship2.isEmpty()) throw new NoSuchElementException("No friendship found between " + member2.getUsername() + " and " + username2); + if (friendship.isEmpty() && friendship2.isEmpty()) throw new NoSuchElementException("No friendship found between " + to.getUsername() + " and " + username2); else return friendship.orElseGet(friendship2::get); } @Override public List findFriendshipsByMember(Member member, int page) { PageRequest pageRequest = PageRequest.of(page, PAGE_SIZE); - return friendshipRepository.findAllByRequestMemberOrRecipientMember(member, pageRequest) + return friendshipRepository.findAllByFrom(member, pageRequest) .stream() + .filter(Friendship::isAccepted) .collect(Collectors.toList()); } + private void checkIfFriendshipExists(Friendship friendship) { + Optional friendshipOptional = friendshipRepository.findByFromAndTo(friendship.getTo(), friendship.getFrom()); + if (friendshipOptional.isPresent()) { + friendship.accept(); + friendshipOptional.get().accept(); + } + } + } diff --git a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java index 9467066..b7ed617 100644 --- a/src/main/java/com/gdscys/cokepoke/member/domain/Member.java +++ b/src/main/java/com/gdscys/cokepoke/member/domain/Member.java @@ -41,11 +41,11 @@ public class Member implements UserDetails { @Column(name = "password_hash", nullable = false) private String passwordHash; - @OneToMany(mappedBy = "request_member", fetch = FetchType.LAZY) - private Set requestedFriendships = new HashSet<>(); + @OneToMany(mappedBy = "from") + private Set requested = new HashSet<>(); - @OneToMany(mappedBy = "recipient_member", fetch = FetchType.LAZY) - private Set receivedFriendships = new HashSet<>(); + @OneToMany(mappedBy = "to") + private Set received = new HashSet<>(); @CreationTimestamp private LocalDateTime createdAt; @@ -69,6 +69,14 @@ public Member(String email, String username, String passwordHash, Set ro this.roles = roles; } + public void addRequested(Friendship friendship) { + this.requested.add(friendship); + } + + public void addReceived(Friendship friendship) { + this.received.add(friendship); + } + public void updatePassword(String passwordHash) { this.passwordHash = passwordHash; } From e03b676ce7c6418925cb24da621039ad0a80527b Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 04:27:18 +0900 Subject: [PATCH 46/49] fix --- .../com/gdscys/cokepoke/auth/controller/AuthController.java | 2 -- .../java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java | 1 - .../com/gdscys/cokepoke/configuration/SecurityConfig.java | 2 +- .../cokepoke/member/service/CustomUserDetailsService.java | 6 +++--- .../com/gdscys/cokepoke/member/service/MemberService.java | 4 +--- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java b/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java index fff58fc..601599e 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java +++ b/src/main/java/com/gdscys/cokepoke/auth/controller/AuthController.java @@ -2,7 +2,6 @@ import com.gdscys.cokepoke.auth.domain.TokenInfo; import com.gdscys.cokepoke.auth.dto.LoginRequest; -import com.gdscys.cokepoke.member.service.CustomUserDetailsService; import com.gdscys.cokepoke.member.domain.Member; import com.gdscys.cokepoke.member.dto.SignupRequest; import com.gdscys.cokepoke.member.dto.MemberResponse; @@ -24,7 +23,6 @@ @RequestMapping("/auth") @RequiredArgsConstructor public class AuthController { - private final CustomUserDetailsService customUserDetailsService; private final MemberService memberService; @PostMapping("/signup") diff --git a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java index 7a1cc75..040d5ee 100644 --- a/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java +++ b/src/main/java/com/gdscys/cokepoke/auth/jwt/JwtAuthFilter.java @@ -8,7 +8,6 @@ import io.jsonwebtoken.Claims; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java index 5934da2..d23379a 100644 --- a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java +++ b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java @@ -42,7 +42,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .and() .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() .authorizeRequests() - .antMatchers("/", "/auth/login", "/auth/signup", + .antMatchers("/", "/auth/**", "/auth/login", "/auth/signup", "/h2-console/**") .permitAll() .anyRequest().authenticated() diff --git a/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java b/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java index e1f1eac..b82fb07 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/CustomUserDetailsService.java @@ -17,14 +17,14 @@ public class CustomUserDetailsService implements UserDetailsService { private final MemberRepository memberRepository; @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - return memberRepository.findByUsername(username) + public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { + return memberRepository.findByEmail(email) .map(member -> User.builder() .username(member.getUsername()) .password(member.getPasswordHash()) .roles(Arrays.toString(member.getRoles().toArray())) .build()) - .orElseThrow(() -> new UsernameNotFoundException("User not found with username: " + username)); + .orElseThrow(() -> new UsernameNotFoundException("User not found with email: " + email)); } } diff --git a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java index c453b53..500fa68 100644 --- a/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java +++ b/src/main/java/com/gdscys/cokepoke/member/service/MemberService.java @@ -70,9 +70,7 @@ public TokenInfo login(String email, String password) { .ifPresentOrElse(refreshToken -> { refreshToken.setRefreshToken(tokenInfo.getRefreshToken()); refreshTokenRepository.save(refreshToken); - }, () -> { - refreshTokenRepository.save(new RefreshToken(tokenInfo.getRefreshToken(), member.get())); - }); + }, () -> refreshTokenRepository.save(new RefreshToken(tokenInfo.getRefreshToken(), member.get()))); return tokenInfo; } From f6ae74144359438613cfdf09c28eb86a67e67e99 Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 04:51:24 +0900 Subject: [PATCH 47/49] fix --- .gitignore | 37 +++ build.gradle | 52 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 1 + .../gdscys/cokepoke/CokePokeApplication.java | 13 + .../DelegatingSecurityContextRepository.java | 53 ++++ .../gdscys/cokepoke/auth/SecurityUtil.java | 12 + .../configuration/SecurityConfig.java | 9 + .../exception/GlobalExceptionHandler.java | 1 - .../controller/FriendshipController.java | 14 +- .../friendship/dto/FriendshipRequest.java | 2 +- .../friendship/service/FriendshipService.java | 9 +- .../service/IFriendshipService.java | 6 +- src/main/resources/application.yml | 22 ++ .../cokepoke/CokePokeApplicationTests.java | 13 + 18 files changed, 577 insertions(+), 14 deletions(-) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/gdscys/cokepoke/CokePokeApplication.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/DelegatingSecurityContextRepository.java create mode 100644 src/main/java/com/gdscys/cokepoke/auth/SecurityUtil.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/gdscys/cokepoke/CokePokeApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a92a83e --- /dev/null +++ b/build.gradle @@ -0,0 +1,52 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.16' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'com.gdsc-ys' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '11' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + + implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.12' + implementation 'net.minidev:json-smart:2.4.9' + + compileOnly 'org.projectlombok:lombok:1.18.30' + runtimeOnly 'com.h2database:h2' + annotationProcessor 'org.projectlombok:lombok:1.18.30' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + + // jwt + implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5' + runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5' + runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5' + + + implementation "com.querydsl:querydsl-jpa:5.0.0" + annotationProcessor "com.querydsl:querydsl-apt:5.0.0" + +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..033e24c4cdf41af1ab109bc7f253b2b887023340 GIT binary patch literal 63375 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≫L+crb^Bz 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..1d250d3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'coke-poke' diff --git a/src/main/java/com/gdscys/cokepoke/CokePokeApplication.java b/src/main/java/com/gdscys/cokepoke/CokePokeApplication.java new file mode 100644 index 0000000..9fba821 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/CokePokeApplication.java @@ -0,0 +1,13 @@ +package com.gdscys.cokepoke; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CokePokeApplication { + + public static void main(String[] args) { + SpringApplication.run(CokePokeApplication.class, args); + } + +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/DelegatingSecurityContextRepository.java b/src/main/java/com/gdscys/cokepoke/auth/DelegatingSecurityContextRepository.java new file mode 100644 index 0000000..fc395e0 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/DelegatingSecurityContextRepository.java @@ -0,0 +1,53 @@ +package com.gdscys.cokepoke.auth; + +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.web.context.HttpRequestResponseHolder; +import org.springframework.security.web.context.SecurityContextRepository; +import org.springframework.util.Assert; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +public class DelegatingSecurityContextRepository implements SecurityContextRepository { + private final List delegates; + + public DelegatingSecurityContextRepository(SecurityContextRepository... delegates) { + this(Arrays.asList(delegates)); + } + + public DelegatingSecurityContextRepository(List delegates) { + Assert.notEmpty(delegates, "delegates cannot be empty"); + this.delegates = delegates; + } + + @Override + public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) { + SecurityContext result = null; + for (SecurityContextRepository delegate : this.delegates) { + SecurityContext delegateResult = delegate.loadContext(requestResponseHolder); + if (result == null || delegate.containsContext(requestResponseHolder.getRequest())) { + result = delegateResult; + } + } + return result; + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + for (SecurityContextRepository delegate : this.delegates) { + delegate.saveContext(context, request, response); + } + } + + @Override + public boolean containsContext(HttpServletRequest request) { + for (SecurityContextRepository delegate : this.delegates) { + if (delegate.containsContext(request)) { + return true; + } + } + return false; + } +} diff --git a/src/main/java/com/gdscys/cokepoke/auth/SecurityUtil.java b/src/main/java/com/gdscys/cokepoke/auth/SecurityUtil.java new file mode 100644 index 0000000..b35fa15 --- /dev/null +++ b/src/main/java/com/gdscys/cokepoke/auth/SecurityUtil.java @@ -0,0 +1,12 @@ +package com.gdscys.cokepoke.auth; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; + +public class SecurityUtil { + public static String getLoginUsername(){ + Authentication loggedInUser = SecurityContextHolder.getContext().getAuthentication(); + String username = loggedInUser.getName(); + return username; + } +} diff --git a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java index d23379a..44794bd 100644 --- a/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java +++ b/src/main/java/com/gdscys/cokepoke/configuration/SecurityConfig.java @@ -1,5 +1,6 @@ package com.gdscys.cokepoke.configuration; +import com.gdscys.cokepoke.auth.DelegatingSecurityContextRepository; import com.gdscys.cokepoke.auth.jwt.JwtAuthFilter; import com.gdscys.cokepoke.auth.jwt.JwtTokenProvider; import com.gdscys.cokepoke.member.repository.RefreshTokenRepository; @@ -15,6 +16,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; +import org.springframework.security.web.context.RequestAttributeSecurityContextRepository; @Configuration @EnableWebSecurity @@ -47,6 +50,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .permitAll() .anyRequest().authenticated() .and() + .securityContext((securityContext) -> securityContext + .securityContextRepository(new DelegatingSecurityContextRepository( + new RequestAttributeSecurityContextRepository(), + new HttpSessionSecurityContextRepository() + )) + ) .addFilterBefore(new JwtAuthFilter(jwtTokenProvider, refreshTokenRepository), UsernamePasswordAuthenticationFilter.class); return http.build(); diff --git a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java index 1a6928c..87b764a 100644 --- a/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/gdscys/cokepoke/exception/GlobalExceptionHandler.java @@ -87,5 +87,4 @@ public ResponseEntity handleAllUncaughtException( return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); } - } diff --git a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java index 8b29a2c..00fcc32 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/controller/FriendshipController.java @@ -15,6 +15,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.gdscys.cokepoke.auth.SecurityUtil.getLoginUsername; + @Controller @RequestMapping("/friendship") @@ -25,17 +27,17 @@ public class FriendshipController { // 친구관계 만들기 @PostMapping("/create") - public ResponseEntity createFriendship(@AuthenticationPrincipal Member member, - @RequestBody @Valid FriendshipRequest request) { - friendshipService.createFriendship(member, request.getRecipientUsername()); + public ResponseEntity createFriendship(@RequestBody @Valid FriendshipRequest request) { + String username = getLoginUsername(); + friendshipService.createFriendship(username, request.getToUsername()); return ResponseEntity.status(HttpStatus.CREATED).build(); } // 내 친구관계 전체조회 @GetMapping("/my") - public ResponseEntity> findFriendshipsByMember(@AuthenticationPrincipal Member member, - @RequestParam(defaultValue = "0") int page) { - List responses = friendshipService.findFriendshipsByMember(member, page) + public ResponseEntity> findFriendshipsByMember(@RequestParam(defaultValue = "0") int page) { + String username = getLoginUsername(); + List responses = friendshipService.findFriendshipsByMember(username, page) .stream() .map(FriendshipResponse::of) .collect(Collectors.toList()); diff --git a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java index 6dd4f67..7873205 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/dto/FriendshipRequest.java @@ -9,7 +9,7 @@ @AllArgsConstructor public class FriendshipRequest { @NotBlank - private String recipientUsername; + private String toUsername; protected FriendshipRequest() {} } diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java index 72580bc..98b98cd 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -22,7 +22,8 @@ public class FriendshipService implements IFriendshipService { private static final int PAGE_SIZE = 15; @Override - public void createFriendship(Member member, String recipientUsername) { + public void createFriendship(String username, String recipientUsername) { + Member member = memberService.findMemberByUsername(username); Member to = memberService.findMemberByUsername(recipientUsername); if (member.equals(to)) throw new IllegalArgumentException("You cannot be friends with yourself"); if (friendshipRepository.findByFromAndTo(member, to).isPresent()) { @@ -37,7 +38,8 @@ public void createFriendship(Member member, String recipientUsername) { } @Override - public Friendship findFriendshipByMembers(Member member, String username2) { + public Friendship findFriendshipByMembers(String username, String username2) { + Member member = memberService.findMemberByUsername(username); Member to = memberService.findMemberByUsername(username2); Optional friendship = friendshipRepository.findByFromAndTo(member, to); @@ -48,7 +50,8 @@ public Friendship findFriendshipByMembers(Member member, String username2) { } @Override - public List findFriendshipsByMember(Member member, int page) { + public List findFriendshipsByMember(String username, int page) { + Member member = memberService.findMemberByUsername(username); PageRequest pageRequest = PageRequest.of(page, PAGE_SIZE); return friendshipRepository.findAllByFrom(member, pageRequest) .stream() diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java index 03585b5..90ae20c 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/IFriendshipService.java @@ -7,9 +7,9 @@ public interface IFriendshipService { - void createFriendship(Member member, String recipientUsername); + void createFriendship(String username, String recipientUsername); - Friendship findFriendshipByMembers(Member member, String username2); + Friendship findFriendshipByMembers(String username, String username2); - List findFriendshipsByMember(Member member, int page); + List findFriendshipsByMember(String username, int page); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..e937f50 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,22 @@ +server: + port: 8080 +spring: + datasource: + url: jdbc:h2:mem:testdb + username: sa + password: password + driver-class-name: org.h2.Driver + jpa: + database-platform: org.hibernate.dialect.H2Dialect + h2: + console: + enabled: true + path: /h2-console +jwt: + secret: fpvuvttzKZKGmQ3UoD0QpU7oSDAmCKb8X6l78RULm1Rm01R5Itcg5C8Q9me5sffF + +logging: + level: + org: + springframework: + security=DEBUG: DEBUG \ No newline at end of file diff --git a/src/test/java/com/gdscys/cokepoke/CokePokeApplicationTests.java b/src/test/java/com/gdscys/cokepoke/CokePokeApplicationTests.java new file mode 100644 index 0000000..d2765f9 --- /dev/null +++ b/src/test/java/com/gdscys/cokepoke/CokePokeApplicationTests.java @@ -0,0 +1,13 @@ +package com.gdscys.cokepoke; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CokePokeApplicationTests { + + @Test + void contextLoads() { + } + +} From 649d7bf1b675e473984ffbe5fa19f4d32fdebaaa Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 04:54:35 +0900 Subject: [PATCH 48/49] fixed untracked files --- .gitignore | 8 ++ gradlew | 248 ------------------------------------------------ gradlew.bat | 92 ------------------ settings.gradle | 1 - 4 files changed, 8 insertions(+), 341 deletions(-) delete mode 100755 gradlew delete mode 100644 gradlew.bat delete mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index c2065bc..9824e4c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,14 @@ bin/ out/ !**/src/main/**/out/ !**/src/test/**/out/ +settings.gradle +/build/** +/.gradle/** +gradlew +gradlew.bat + + + ### NetBeans ### /nbproject/private/ diff --git a/gradlew b/gradlew deleted file mode 100755 index fcb6fca..0000000 --- a/gradlew +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 6689b85..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 1d250d3..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'coke-poke' From 037cc9112d5e5232d2ba871cb2ab8a641f309e7c Mon Sep 17 00:00:00 2001 From: becooq81 Date: Wed, 11 Oct 2023 05:22:55 +0900 Subject: [PATCH 49/49] fix --- .../gdscys/cokepoke/friendship/service/FriendshipService.java | 2 ++ src/main/resources/application.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java index 98b98cd..15862af 100644 --- a/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java +++ b/src/main/java/com/gdscys/cokepoke/friendship/service/FriendshipService.java @@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.NoSuchElementException; @@ -22,6 +23,7 @@ public class FriendshipService implements IFriendshipService { private static final int PAGE_SIZE = 15; @Override + @Transactional public void createFriendship(String username, String recipientUsername) { Member member = memberService.findMemberByUsername(username); Member to = memberService.findMemberByUsername(recipientUsername); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e937f50..20cf506 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,12 +2,14 @@ server: port: 8080 spring: datasource: - url: jdbc:h2:mem:testdb + url: jdbc:h2:tcp://localhost/~/testdb username: sa password: password driver-class-name: org.h2.Driver jpa: database-platform: org.hibernate.dialect.H2Dialect + hibernate: + ddl-auto: create h2: console: enabled: true