Release v.1.0.5

.github/workflows/cicd.yml

@@ -70,7 +70,8 @@ jobs:
           envs: GITHUB_SHA
           script: |
             cd dnd-12th-7-backend
-            sudo docker compose down
-            sudo docker compose rm -f
+            sudo docker compose stop app
+            sudo docker compose rm -f app
             sudo docker rmi ${{env.DOCKER_IMAGE_NAME}}:latest
-            sudo docker compose up -d
+            sudo docker compose pull app
+            sudo docker compose up -d app

src/docs/asciidoc/auth.adoc

@@ -50,4 +50,29 @@ include::{snippets}/auth-controller-test/reissue-access-token/http-response.adoc
 
 ==== 응답
 
-include::{snippets}/auth-controller-test/reissue-access-token/response-body.adoc[]
+include::{snippets}/auth-controller-test/reissue-access-token/response-body.adoc[]
+
+== 카카오톡 소셜 로그인
+
+사용자가 카카오 소셜 로그인을 완료하면, 인가 코드를 통해 카카오 Access Token을 발급받고, 이를 이용해 카카오 사용자 정보를 조회합니다.
+조회된 사용자 정보로 서비스의 Access Token을 생성한 후, 해당 토큰은 쿠키를 통해 클라이언트에 전달됩니다.
+
+=== Example
+
+include::{snippets}/auth-controller-test/kakao-login-callback/curl-request.adoc[]
+
+=== HTTP
+
+==== 요청
+
+include::{snippets}/auth-controller-test/kakao-login-callback/http-request.adoc[]
+
+==== 응답
+
+include::{snippets}/auth-controller-test/kakao-login-callback/http-response.adoc[]
+
+=== Body
+
+==== 응답
+
+include::{snippets}/auth-controller-test/kakao-login-callback/response-body.adoc[]

src/main/java/com/dnd/moddo/ModdoApplication.java

@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 
 @SpringBootApplication(exclude = SecurityAutoConfiguration.class)
+@ConfigurationPropertiesScan
 public class ModdoApplication {
 
 	public static void main(String[] args) {

src/main/java/com/dnd/moddo/domain/auth/controller/AuthController.java

@@ -1,29 +1,97 @@
 package com.dnd.moddo.domain.auth.controller;
 
+import java.util.Collections;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseCookie;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.dnd.moddo.domain.auth.service.AuthService;
 import com.dnd.moddo.domain.auth.service.RefreshTokenService;
+import com.dnd.moddo.global.config.CookieProperties;
 import com.dnd.moddo.global.jwt.dto.RefreshResponse;
 import com.dnd.moddo.global.jwt.dto.TokenResponse;
+import com.dnd.moddo.global.jwt.service.JwtService;
+
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/v1/user")
+@Validated
+@RequestMapping("/api/v1")
 public class AuthController {
 
-    private final AuthService authService;
-    private final RefreshTokenService refreshTokenService;
+	private final AuthService authService;
+	private final RefreshTokenService refreshTokenService;
+	private final CookieProperties cookieProperties;
+	private final JwtService jwtService;
+
+	@GetMapping("/user/guest/token")
+	public ResponseEntity<TokenResponse> getGuestToken() {
+		TokenResponse tokenResponse = authService.loginWithGuest();
+
+		String cookie = createCookie("accessToken", tokenResponse.accessToken()).toString();
+
+		return ResponseEntity.ok()
+			.header(HttpHeaders.SET_COOKIE, cookie)
+			.body(tokenResponse);
+	}
+
+	@PutMapping("/user/reissue/token")
+	public RefreshResponse reissueAccessToken(@RequestHeader(value = "Authorization") @NotBlank String refreshToken) {
+		return refreshTokenService.execute(refreshToken);
+	}
+
+	@GetMapping("/login/oauth2/callback")
+	public ResponseEntity<Void> kakaoLoginCallback(@RequestParam @NotBlank String code) {
+
+		TokenResponse tokenResponse = authService.loginOrRegisterWithKakao(code);
+
+		String cookie = createCookie("accessToken", tokenResponse.accessToken()).toString();
+
+		return ResponseEntity.ok()
+			.header(HttpHeaders.SET_COOKIE, cookie)
+			.build();
+	}
+
+	@GetMapping("/logout")
+	public ResponseEntity<?> kakaoLogout(@CookieValue(value = "accessToken") String token) {
+		String cookie = expireCookie("accessToken").toString();
+		Long userId = jwtService.getUserId(token);
+		authService.logout(userId);
+		return ResponseEntity.ok()
+			.header(HttpHeaders.SET_COOKIE, cookie)
+			.body(Collections.singletonMap("message", "Logout successful"));
+	}
+
+	private ResponseCookie createCookie(String name, String key) {
+		return ResponseCookie.from(name, key)
+			.httpOnly(cookieProperties.httpOnly())
+			.secure(cookieProperties.secure())
+			.path(cookieProperties.path())
+			.sameSite(cookieProperties.sameSite())
+			.maxAge(cookieProperties.maxAge())
+			.build();
+
+	}
 
-    @GetMapping("/guest/token")
-    public ResponseEntity<TokenResponse> getGuestToken() {
-        return ResponseEntity.ok(authService.createGuestUser());
-    }
+	private ResponseCookie expireCookie(String name) {
+		return ResponseCookie.from(name, null)
+			.httpOnly(cookieProperties.httpOnly())
+			.secure(cookieProperties.secure())
+			.path(cookieProperties.path())
+			.sameSite(cookieProperties.sameSite())
+			.maxAge(0L)
+			.build();
+	}
 
-    @PutMapping("/reissue/token")
-    public RefreshResponse reissueAccessToken(@RequestHeader(value = "Authorization") @NotBlank String refreshToken) {
-        return refreshTokenService.execute(refreshToken);
-    }
 }

src/main/java/com/dnd/moddo/domain/auth/dto/KakaoLogoutResponse.java

@@ -0,0 +1,4 @@
+package com.dnd.moddo.domain.auth.dto;
+
+public record KakaoLogoutResponse(Long id) {
+}

src/main/java/com/dnd/moddo/domain/auth/dto/KakaoProfile.java

@@ -0,0 +1,25 @@
+package com.dnd.moddo.domain.auth.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record KakaoProfile(
+	Long id,
+	@JsonProperty("kakao_account") KakaoAccount kakaoAccount,
+	Properties properties
+) {
+	public record Properties(
+		String nickname
+	) {
+	}
+
+	public record KakaoAccount(
+		String email,
+		Profile profile
+	) {
+	}
+
+	public record Profile(
+		String nickname
+	) {
+	}
+}

src/main/java/com/dnd/moddo/domain/auth/dto/KakaoTokenResponse.java

@@ -0,0 +1,9 @@
+package com.dnd.moddo.domain.auth.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record KakaoTokenResponse(
+	@JsonProperty("access_token") String accessToken,
+	@JsonProperty("expires_in") int expiresIn
+) {
+}

src/main/java/com/dnd/moddo/domain/auth/service/AuthService.java

@@ -1,43 +1,77 @@
 package com.dnd.moddo.domain.auth.service;
 
-import java.time.LocalDateTime;
 import java.util.UUID;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.dnd.moddo.domain.auth.dto.KakaoLogoutResponse;
+import com.dnd.moddo.domain.auth.dto.KakaoProfile;
+import com.dnd.moddo.domain.auth.dto.KakaoTokenResponse;
+import com.dnd.moddo.domain.user.dto.request.GuestUserSaveRequest;
+import com.dnd.moddo.domain.user.dto.request.UserSaveRequest;
 import com.dnd.moddo.domain.user.entity.User;
-import com.dnd.moddo.domain.user.entity.type.Authority;
-import com.dnd.moddo.domain.user.repository.UserRepository;
+import com.dnd.moddo.domain.user.service.CommandUserService;
+import com.dnd.moddo.domain.user.service.QueryUserService;
+import com.dnd.moddo.global.exception.ModdoException;
 import com.dnd.moddo.global.jwt.dto.TokenResponse;
 import com.dnd.moddo.global.jwt.utill.JwtProvider;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @RequiredArgsConstructor
 @Service
+@Slf4j
 public class AuthService {
 
-	private final UserRepository userRepository;
+	private final CommandUserService commandUserService;
+	private final QueryUserService queryUserService;
 	private final JwtProvider jwtProvider;
+	private final KakaoClient kakaoClient;
 
 	@Transactional
-	public TokenResponse createGuestUser() {
+	public TokenResponse loginWithGuest() {
 		String guestEmail = "guest-" + UUID.randomUUID() + "@guest.com";
+		GuestUserSaveRequest request = new GuestUserSaveRequest(guestEmail, "Guest");
 
-		User guestUser = User.builder()
-			.email(guestEmail)
-			.name("Guest")
-			.profile(null)
-			.createdAt(LocalDateTime.now())
-			.expiredAt(LocalDateTime.now().plusMonths(1))
-			.authority(Authority.USER)
-			.isMember(false)
-			.build();
+		User user = commandUserService.createGuestUser(request);
 
-		userRepository.save(guestUser);
+		return jwtProvider.generateToken(user);
+	}
+
+	@Transactional
+	public TokenResponse loginOrRegisterWithKakao(String code) {
+		KakaoTokenResponse tokenResponse = kakaoClient.join(code);
+		KakaoProfile kakaoProfile = kakaoClient.getKakaoProfile(tokenResponse.accessToken());
+
+		String email = kakaoProfile.kakaoAccount().email();
+		String nickname = kakaoProfile.properties().nickname();
+		Long kakaoId = kakaoProfile.id();
+
+		if (email == null || nickname == null || kakaoId == null) {
+			throw new ModdoException(HttpStatus.BAD_REQUEST, "카카오 프로필 정보가 누락되었습니다.");
+		}
+
+		UserSaveRequest request = new UserSaveRequest(email, nickname, kakaoId);
+		User user = commandUserService.getOrCreateUser(request);
 
-		return jwtProvider.generateToken(guestUser.getId(), guestUser.getEmail(), guestUser.getAuthority().toString(),
-			guestUser.getIsMember());
+		log.info("[USER_LOGIN] 로그인 성공 : code = {}, kakaoId =  {}, nickname = {}", code, kakaoId, nickname);
+
+		return jwtProvider.generateToken(user);
+	}
+
+	public void logout(Long userId) {
+		queryUserService.findKakaoIdById(userId).ifPresent(kakaoId -> {
+			KakaoLogoutResponse logoutResponse = kakaoClient.logout(kakaoId);
+
+			if (!kakaoId.equals(logoutResponse.id())) {
+				throw new ModdoException(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 로그아웃 실패: id 불일치");
+			}
+
+			log.info("[USER_LOGOUT] 카카오 로그아웃 성공: userId={}, kakaoId={}", userId, kakaoId);
+		});
 	}
+
 }