Merge pull request #10 from Link-MIND/test

[Merge] 현재까지 변경사항 develop 브랜치 반영

linkmind/build.gradle

@@ -26,12 +26,21 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'mysql:mysql-connector-java:8.0.32'
 	compileOnly 'org.projectlombok:lombok'
-	//implementation 'org.springframework.boot:spring-boot-starter-security'
-	//testImplementation 'org.springframework.security:spring-security-test'
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	runtimeOnly 'com.mysql:mysql-connector-j'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+	//JWT
+	implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
+	implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
+	implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
+
+
+	//FCM
+	implementation group: 'com.google.firebase', name: 'firebase-admin', version: '6.8.1'
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'  // Firebase 서버로 푸시 메시지 전송 시 필요
+
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 }
 

linkmind/src/main/java/com/app/toaster/config/UserId.java

@@ -0,0 +1,11 @@
+package com.app.toaster.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UserId {
+}

linkmind/src/main/java/com/app/toaster/config/UserIdResolver.java

@@ -0,0 +1,45 @@
+package com.app.toaster.config;
+
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+import com.app.toaster.config.jwt.JwtService;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Component
+public class UserIdResolver implements HandlerMethodArgumentResolver {
+
+	private final JwtService jwtService;
+
+	@Override
+	public boolean supportsParameter(MethodParameter parameter) {
+		return parameter.hasParameterAnnotation(UserId.class) && Long.class.equals(parameter.getParameterType());
+	}
+
+	@Override
+	public Object resolveArgument(@NotNull MethodParameter parameter, ModelAndViewContainer modelAndViewContainer, @NotNull NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+		final HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
+		final String token = request.getHeader("accessToken");
+
+		// 토큰 검증
+		if (!jwtService.verifyToken(token)) {
+			throw new RuntimeException(String.format("USER_ID를 가져오지 못했습니다. (%s - %s)", parameter.getClass(), parameter.getMethod()));
+		}
+
+		// 유저 아이디 반환
+		final String tokenContents = jwtService.getJwtContents(token);
+		try {
+			return Long.parseLong(tokenContents);
+		} catch (NumberFormatException e) {
+			throw new RuntimeException(String.format("USER_ID를 가져오지 못했습니다. (%s - %s)", parameter.getClass(), parameter.getMethod()));
+		}
+	}
+}

linkmind/src/main/java/com/app/toaster/config/jwt/JwtService.java

@@ -0,0 +1,88 @@
+package com.app.toaster.config.jwt;
+
+
+import static io.jsonwebtoken.Jwts.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Date;
+
+import javax.crypto.SecretKey;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import com.app.toaster.exception.Error;
+import com.app.toaster.exception.model.NotFoundException;
+import com.app.toaster.exception.model.UnauthorizedException;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Header;
+import io.jsonwebtoken.security.Keys;
+import jakarta.annotation.PostConstruct;
+
+@Service
+public class JwtService {
+
+	@Value("${jwt.secret}")
+	private String jwtSecret;
+
+	@PostConstruct
+	protected void init() {
+		jwtSecret = Base64.getEncoder()
+			.encodeToString(jwtSecret.getBytes(StandardCharsets.UTF_8));
+	}
+
+	// JWT 토큰 발급
+	public String issuedToken(String userId, Long tokenExpirationTime) {
+		final Date now = new Date();
+
+		// 클레임 생성
+		final Claims claims = claims()
+			.setSubject("token")
+			.setIssuedAt(now)
+			.setExpiration(new Date(now.getTime() + tokenExpirationTime));
+
+		//private claim 등록
+		claims.put("userId", userId);
+
+		return builder()
+			.setHeaderParam(Header.TYPE , Header.JWT_TYPE)
+			.setClaims(claims)
+			.signWith(getSigningKey())
+			.compact();
+	}
+
+	private SecretKey getSigningKey() {
+		final byte[] keyBytes = jwtSecret.getBytes(StandardCharsets.UTF_8);
+		return Keys.hmacShaKeyFor(keyBytes);
+	}
+
+	// JWT 토큰 검증
+	public boolean verifyToken(String token) {
+		try {
+			final Claims claims = getBody(token);
+			return true;
+		} catch (RuntimeException e) {
+			if (e instanceof ExpiredJwtException) {
+				throw new UnauthorizedException(Error.TOKEN_TIME_EXPIRED_EXCEPTION, Error.TOKEN_TIME_EXPIRED_EXCEPTION.getMessage());
+			}
+			throw new NotFoundException(Error.NOT_FOUND_USER_EXCEPTION, Error.NOT_FOUND_USER_EXCEPTION.getMessage());
+		}
+	}
+
+	private Claims getBody(final String token) {
+		return parserBuilder()
+			.setSigningKey(getSigningKey())
+			.build()
+			.parseClaimsJws(token)
+			.getBody();
+	}
+
+	// JWT 토큰 내용 확인
+	public String getJwtContents(String token) {
+		final Claims claims = getBody(token);
+		return (String) claims.get("userId");
+	}
+}

linkmind/src/main/java/com/app/toaster/controller/AuthController.java

@@ -0,0 +1,56 @@
+package com.app.toaster.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.app.toaster.common.dto.ApiResponse;
+import com.app.toaster.config.UserId;
+import com.app.toaster.controller.request.auth.SignInRequestDto;
+import com.app.toaster.controller.response.auth.SignInResponseDto;
+import com.app.toaster.controller.response.auth.TokenResponseDto;
+import com.app.toaster.exception.Success;
+import com.app.toaster.service.auth.AuthService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/auth")
+public class AuthController {
+	private final AuthService authService;
+
+	@PostMapping
+	@ResponseStatus(HttpStatus.OK)
+	public ApiResponse<SignInResponseDto> signIn(
+		@RequestHeader("Authorization") String socialAccessToken,
+		@RequestBody SignInRequestDto requestDto
+	) {
+		return ApiResponse.success(Success.LOGIN_SUCCESS, authService.signIn(socialAccessToken, requestDto));
+	}
+
+	@PostMapping("/token")
+	@ResponseStatus(HttpStatus.OK)
+	public ApiResponse<TokenResponseDto> reissueToken(@RequestHeader String refreshToken) {
+		return ApiResponse.success(Success.RE_ISSUE_TOKEN_SUCCESS, authService.issueToken(refreshToken));
+	}
+
+	@PostMapping("/sign-out")
+	@ResponseStatus(HttpStatus.OK)
+	public ApiResponse signOut(@UserId Long userId) {
+		authService.signOut(userId);
+		return ApiResponse.success(Success.SIGNOUT_SUCCESS);
+	}
+
+	@DeleteMapping("/withdraw")
+	@ResponseStatus(HttpStatus.OK)
+	public ApiResponse withdraw(@UserId Long userId){
+		authService.withdraw(userId);
+		return ApiResponse.success(Success.DELETE_USER_SUCCESS);
+	}
+}

linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java

@@ -0,0 +1,4 @@
+package com.app.toaster.controller.request.auth;
+
+public record SignInRequestDto(String socialType, String fcmToken) {
+}

linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java

@@ -0,0 +1,8 @@
+package com.app.toaster.controller.response.auth;
+
+public record SignInResponseDto(Long userId, String accessToken, String refreshToken, String fcmToken, Boolean isRegistered,Boolean FcmIsAllowed) {
+	public static SignInResponseDto of(Long userId, String accessToken, String refreshToken, String fcmToken,
+		Boolean isRegistered, Boolean fcmIsAllowed){
+		return new SignInResponseDto(userId,accessToken, refreshToken,fcmToken,isRegistered,fcmIsAllowed);
+	}
+}

linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java

@@ -0,0 +1,8 @@
+package com.app.toaster.controller.response.auth;
+
+public record TokenResponseDto(String accessToken, String refreshToken) {
+	public static TokenResponseDto of(String accessToken, String refreshToken){
+		return new TokenResponseDto(accessToken,refreshToken);
+	}
+
+}

linkmind/src/main/java/com/app/toaster/domain/Category.java

@@ -5,7 +5,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

linkmind/src/main/java/com/app/toaster/domain/Toast.java

@@ -21,7 +21,7 @@ public class Toast {
 	private Long Id;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "toast_id")
+	@JoinColumn(name = "user_id")
 	private User user;
 
 	private String title;

linkmind/src/main/java/com/app/toaster/exception/Error.java

@@ -14,12 +14,24 @@ public enum Error {
 	 * 404 NOT FOUND
 	 */
 	DUMMY_NOT_FOUND(HttpStatus.NOT_FOUND, "더미에 데이터가 덜 들어간 것 같아요"),
-
 	RESERVATION_NOT_FOUND(HttpStatus.NOT_FOUND, "예약정보를 찾지 못했어요"),
+	NOT_FOUND_USER_EXCEPTION(HttpStatus.NOT_FOUND, "찾을 수 없는 유저입니다."),
+
+	/**
+	 * 401 UNAUTHORIZED EXCEPTION
+	 */
+	TOKEN_TIME_EXPIRED_EXCEPTION(HttpStatus.UNAUTHORIZED, "만료된 토큰입니다."),
+	INVALID_APPLE_PUBLIC_KEY(HttpStatus.UNAUTHORIZED, "유효하지않은 애플 퍼블릭 키 입니다."),
+	EXPIRED_APPLE_IDENTITY_TOKEN(HttpStatus.UNAUTHORIZED, "만료된 아이덴티티 토큰입니다."),
+	INVALID_APPLE_IDENTITY_TOKEN(HttpStatus.UNAUTHORIZED, "잘못된 아이덴티티 토큰입니다."),
+
+	UNPROCESSABLE_ENTITY_DELETE_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "서버에서 요청을 이해해 삭제하려는 도중 문제가 생겼습니다."),
 	/**
 	 * 500 INTERNAL_SERVER_ERROR
 	 */
-	INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "알 수 없는 서버 에러가 발생했습니다")
+	INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "알 수 없는 서버 에러가 발생했습니다"),
+	INVALID_ENCRYPT_COMMUNICATION(HttpStatus.INTERNAL_SERVER_ERROR, "ios 통신 증명 과정 중 문제가 발생했습니다."),
+	CREATE_PUBLIC_KEY_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "publickey 생성 과정 중 문제가 발생했습니다."),
 	;
 
 	private final HttpStatus httpStatus;

linkmind/src/main/java/com/app/toaster/exception/Success.java

@@ -23,6 +23,12 @@ public enum Success {
 	GET_MAIN_SUCCESS(HttpStatus.OK, "메인 페이지 조회 성공"),
 	GET_TICKET_SUCCESS(HttpStatus.OK, "티켓 선택 페이지 조회 성공"),
 
+  LOGIN_SUCCESS(HttpStatus.OK, "로그인 성공"),
+	RE_ISSUE_TOKEN_SUCCESS(HttpStatus.OK, "토큰 재발급 성공"),
+	SIGNOUT_SUCCESS(HttpStatus.OK, "로그아웃 성공"),
+	DELETE_USER_SUCCESS(HttpStatus.OK, "유저 삭제 성공"),
+
+
 	/**
 	 * 204 NO_CONTENT
 	 */

linkmind/src/main/java/com/app/toaster/exception/model/UnauthorizedException.java

@@ -0,0 +1,10 @@
+package com.app.toaster.exception.model;
+
+import com.app.toaster.exception.Error;
+
+public class UnauthorizedException extends CustomException{
+	public UnauthorizedException(Error error, String message) {
+		super(error, message);
+	}
+
+}

linkmind/src/main/java/com/app/toaster/exception/model/UnprocessableEntityException.java

@@ -0,0 +1,9 @@
+package com.app.toaster.exception.model;
+
+import com.app.toaster.exception.Error;
+
+public class UnprocessableEntityException extends CustomException{
+	public UnprocessableEntityException(Error error, String message) {
+		super(error, message);
+	}
+}

linkmind/src/main/java/com/app/toaster/infrastructure/UserRepository.java

@@ -0,0 +1,22 @@
+package com.app.toaster.infrastructure;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.app.toaster.domain.SocialType;
+import com.app.toaster.domain.User;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+	Boolean existsBySocialIdAndSocialType(String socialId, SocialType socialType);
+
+	Optional<User> findByUserId(Long userId);
+
+	Optional<User> findBySocialIdAndSocialType(String socialId, SocialType socialType);
+
+	Boolean existsByNickname(String s);
+
+	Optional<User> findByRefreshToken(String refreshToken);
+
+	Long deleteByUserId(Long userId);
+}