Merge pull request #335 from GTable/feature/#334-app-kakao-login

feat : 앱 전용 카카오 로그인 구현

Author: Jjiggu

nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -156,7 +157,7 @@ public String updateMenuSortOrder(List<MenuSortUpdateRequest> requests, MemberDe
 		}
 
 		Map<Long, Long> idToSort = requests.stream()
-			.collect(java.util.stream.Collectors.toMap(MenuSortUpdateRequest::getMenuId,
+			.collect(Collectors.toMap(MenuSortUpdateRequest::getMenuId,
 				MenuSortUpdateRequest::getSortOrder));
 
 		menus.forEach(m -> m.updateSortOrder(idToSort.get(m.getId())));

nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java

@@ -14,7 +14,7 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.cors.CorsConfigurationSource;
 
-import com.nowait.applicationuser.oauth.oauth2.CustomOAuth2UserService;
+import com.nowait.applicationuser.oauth.service.CustomOAuth2UserService;
 import com.nowait.applicationuser.oauth.oauth2.OAuth2LoginSuccessHandler;
 import com.nowait.applicationuser.security.jwt.JwtAuthorizationFilter;
 import com.nowait.applicationuser.security.jwt.JwtUtil;
@@ -58,6 +58,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 					"/oauth2/authorization/kakao", // 카카오 로그인 요청
 					"/login/oauth2/code/**", // 카카오 인증 콜백
 					"/api/refresh-token", // refresh token (토큰 갱신)
+					"/v2/app/oauth/kakao/login", // 카카오 앱 로그인
 					"/v1/menus/**", // 모든 메뉴 조회
 					"/v1/store-payments/**", // 결제 관련 API
 					"/orders/**",

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/controller/KakaoAppAuthController.java

@@ -0,0 +1,35 @@
+package com.nowait.applicationuser.oauth.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.nowait.applicationuser.oauth.dto.KakaoAppLoginRequest;
+import com.nowait.applicationuser.oauth.dto.KakaoAppLoginResponse;
+import com.nowait.applicationuser.oauth.service.KakaoAppLoginService;
+import com.nowait.common.api.ApiUtils;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/v2/app/oauth/kakao")
+@RequiredArgsConstructor
+public class KakaoAppAuthController {
+
+	private final KakaoAppLoginService kakaoAppLoginService;
+
+	@PostMapping("/login")
+	public ResponseEntity<?> kakaoAppLogin(@RequestBody KakaoAppLoginRequest request) {
+
+		KakaoAppLoginResponse response = kakaoAppLoginService.login(request);
+
+		return ResponseEntity
+			.status(HttpStatus.OK)
+			.body(
+				ApiUtils.success(response)
+			);
+	}
+}

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/dto/KakaoAppLoginRequest.java

@@ -0,0 +1,13 @@
+package com.nowait.applicationuser.oauth.dto;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class KakaoAppLoginRequest {
+	private String kakaoAccessToken;
+}

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/dto/KakaoAppLoginResponse.java

@@ -0,0 +1,22 @@
+package com.nowait.applicationuser.oauth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class KakaoAppLoginResponse{
+	private String accessToken;
+	private String refreshToken;
+	private Long userId;
+	private String email;
+	private String nickName;
+	private String profileImage;
+	private boolean phoneEntered;
+	private boolean marketingAgree;
+	private boolean isNewUser;
+}

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/dto/OAuthUserResult.java

@@ -0,0 +1,13 @@
+package com.nowait.applicationuser.oauth.dto;
+
+import com.nowait.domaincorerdb.user.entity.User;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class OAuthUserResult {
+	private final User user;
+	private final boolean newUser;
+}

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/oauth2/OAuth2LoginSuccessHandler.java

@@ -1,18 +1,15 @@
 package com.nowait.applicationuser.oauth.oauth2;
 
 import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.Optional;
 
 import org.springframework.http.ResponseCookie;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.nowait.applicationuser.security.jwt.JwtUtil;
-import com.nowait.domaincorerdb.token.entity.Token;
-import com.nowait.domaincorerdb.token.repository.TokenRepository;
+import com.nowait.applicationuser.token.dto.AuthenticationResponse;
+import com.nowait.applicationuser.token.service.AuthTokenService;
 import com.nowait.domaincorerdb.user.entity.User;
 import com.nowait.domainuserrdb.oauth.dto.CustomOAuth2User;
 
@@ -30,8 +27,7 @@
 @RequiredArgsConstructor
 @Slf4j
 public class OAuth2LoginSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
-	private final JwtUtil jwtUtil;
-	private final TokenRepository tokenRepository;
+	private final AuthTokenService authTokenService;
 
 	@Override
 	@Transactional
@@ -40,26 +36,11 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
 		CustomOAuth2User customUserDetails = (CustomOAuth2User)authentication.getPrincipal();
 		User user = customUserDetails.getUser();
-		Long userId = customUserDetails.getUserId();
-		String role = authentication.getAuthorities().iterator().next().getAuthority();
 
-		// JWT 발급
-		String accessToken = jwtUtil.createAccessToken("accessToken", userId, role,
-			Boolean.TRUE.equals(user.getPhoneEntered()),  Boolean.TRUE.equals(user.getIsMarketingAgree()),60 * 60 * 1000L); // 1시간
-		String refreshToken = jwtUtil.createRefreshToken("refreshToken", userId, 30L * 24 * 60 * 60 * 1000L); // 30일
-
-		// 1. refreshToken을 DB에 저장 or update
-		Optional<Token> tokenOptional = tokenRepository.findByUserId(user.getId());
-		if (tokenOptional.isPresent()) {
-			Token token = tokenOptional.get();
-			token.updateRefreshToken(refreshToken, LocalDateTime.now().plusDays(30));
-		} else {
-			Token token = Token.toEntity(user, refreshToken, LocalDateTime.now().plusDays(30));
-			tokenRepository.save(token);
-		}
+		AuthenticationResponse authenticationResponse = authTokenService.issueTokens(user);
 
 		// 2. refreshToken을 HttpOnly 쿠키로 설정 (ResponseCookie로)
-		ResponseCookie refreshTokenCookie = ResponseCookie.from("refreshToken", refreshToken)
+		ResponseCookie refreshTokenCookie = ResponseCookie.from("refreshToken", authenticationResponse.getRefreshToken())
 			.httpOnly(true)
 			.secure(false) // 운영환경에서는 true
 			.path("/")
@@ -71,7 +52,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 		response.setHeader("Set-Cookie", refreshTokenCookie.toString());
 
 		// 3. 프론트엔드로 리다이렉트 (accessToken만 쿼리로 전달)
-		String targetUrl = "https://app.nowait.co.kr/login/success?accessToken=" + accessToken;
+		String targetUrl = "https://app.nowait.co.kr/login/success?accessToken=" + authenticationResponse.getAccessToken();
 		response.sendRedirect(targetUrl);
 	}
 }

…auth/oauth2/CustomOAuth2UserService.java …uth/service/CustomOAuth2UserService.javanowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/oauth2/CustomOAuth2UserService.java renamed to nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/service/CustomOAuth2UserService.java nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/oauth2/CustomOAuth2UserService.java renamed to nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/service/CustomOAuth2UserService.java

@@ -1,7 +1,4 @@
-package com.nowait.applicationuser.oauth.oauth2;
-
-import java.time.LocalDateTime;
-import java.util.Optional;
+package com.nowait.applicationuser.oauth.service;
 
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
@@ -11,10 +8,8 @@
 
 import com.nowait.applicationuser.oauth.dto.KaKaoResponse;
 import com.nowait.applicationuser.oauth.dto.OAuth2Response;
-import com.nowait.common.enums.Role;
-import com.nowait.common.enums.SocialType;
+import com.nowait.applicationuser.oauth.dto.OAuthUserResult;
 import com.nowait.domaincorerdb.user.entity.User;
-import com.nowait.domaincorerdb.user.repository.UserRepository;
 import com.nowait.domainuserrdb.oauth.dto.CustomOAuth2User;
 
 import lombok.RequiredArgsConstructor;
@@ -25,12 +20,13 @@
 @RequiredArgsConstructor
 @Slf4j
 public class CustomOAuth2UserService extends DefaultOAuth2UserService {
-	private final UserRepository userRepository;
+	private final OAuthUserService oAuthUserService;
 
 	@Override
 	public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
 		OAuth2User oAuth2User = super.loadUser(userRequest);
 
+		// TODO : 해당 로그 필요한지 추후 확인 필요
 		log.info("CustomOAuth2UserService :: {}", oAuth2User);
 		log.info("oAuthUser.getAttributes :: {}", oAuth2User.getAttributes());
 
@@ -44,34 +40,10 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 		}
 
 		// DB에 유저가 있는지 판단
-		Optional<User> foundUser = userRepository.findByEmail(oAuth2Response.getEmail());
-
-		// DB에 유저 없으면 - 회원가입
-		if (foundUser.isEmpty()) {
-
-			User user = User.builder()
-				.email(oAuth2Response.getEmail())
-				.phoneNumber("")
-				.nickname(oAuth2Response.getNickName())
-				.profileImage(oAuth2Response.getProfileImage())
-				.socialType(SocialType.KAKAO)
-				.role(Role.USER) // 일반 유저 설정
-				.storeId(0L)
-				.phoneEntered(false)
-				.isMarketingAgree(false)
-				.createdAt(LocalDateTime.now())
-				.updatedAt(LocalDateTime.now())
-				.build();
-
-			userRepository.save(user);
+		OAuthUserResult result = oAuthUserService.loadOrCreateUser(oAuth2Response);
+		User user = result.getUser();
+		boolean newUser = result.isNewUser();
 
-			return new CustomOAuth2User(user);
-		} else {
-			// DB에 유저 존재하면 - 로그인 진행 (이때 로그인 처리는 안하고, OAuth2LoginSuccessHandler에서 담당함)
-			User user = foundUser.get();
-
-			return new CustomOAuth2User(user);
-		}
+		return new CustomOAuth2User(user, newUser);
 	}
-
 }

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/service/KakaoAppLoginService.java

@@ -0,0 +1,73 @@
+package com.nowait.applicationuser.oauth.service;
+
+import java.time.Instant;
+
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.core.OAuth2AccessToken;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Service;
+
+import com.nowait.applicationuser.oauth.dto.KakaoAppLoginRequest;
+import com.nowait.applicationuser.oauth.dto.KakaoAppLoginResponse;
+import com.nowait.applicationuser.token.dto.AuthenticationResponse;
+import com.nowait.applicationuser.token.service.AuthTokenService;
+import com.nowait.domaincorerdb.user.entity.User;
+import com.nowait.domainuserrdb.oauth.dto.CustomOAuth2User;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class KakaoAppLoginService {
+
+	private final CustomOAuth2UserService customOAuth2UserService;
+	private final ClientRegistrationRepository clientRegistrationRepository;
+	private final AuthTokenService authTokenService;
+
+	public KakaoAppLoginResponse login(KakaoAppLoginRequest request) {
+		String kakaoAccessTokenValue = request.getKakaoAccessToken();
+
+		if (kakaoAccessTokenValue == null || kakaoAccessTokenValue.isEmpty()) {
+			throw new OAuth2AuthenticationException("Kakao Access Token is missing.");
+		}
+
+		ClientRegistration kakaoRegistration = clientRegistrationRepository.findByRegistrationId("kakao");
+
+		if (kakaoRegistration == null) {
+			throw new OAuth2AuthenticationException("Kakao Client Registration not found.");
+		}
+
+		OAuth2AccessToken kakaoAccessToken = new OAuth2AccessToken(
+			OAuth2AccessToken.TokenType.BEARER,
+			kakaoAccessTokenValue,
+			Instant.now(),
+			null
+		);
+
+		OAuth2UserRequest userRequest = new OAuth2UserRequest(
+			kakaoRegistration,
+			kakaoAccessToken
+		);
+
+		OAuth2User oAuth2User = customOAuth2UserService.loadUser(userRequest);
+		CustomOAuth2User customUser = (CustomOAuth2User) oAuth2User;
+		User user = customUser.getUser();
+
+		AuthenticationResponse authenticationResponse = authTokenService.issueTokens(user);
+
+		return KakaoAppLoginResponse.builder()
+			.accessToken(authenticationResponse.getAccessToken())
+			.refreshToken(authenticationResponse.getRefreshToken())
+			.userId(user.getId())
+			.email(user.getEmail())
+			.nickName(user.getNickname())
+			.profileImage(user.getProfileImage())
+			.phoneEntered(user.getPhoneEntered())
+			.marketingAgree(user.getIsMarketingAgree())
+			.isNewUser(customUser.isNewUser())
+			.build();
+	}
+}

nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/service/OAuthUserService.java

@@ -0,0 +1,49 @@
+package com.nowait.applicationuser.oauth.service;
+
+import java.time.LocalDateTime;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.nowait.applicationuser.oauth.dto.OAuth2Response;
+import com.nowait.applicationuser.oauth.dto.OAuthUserResult;
+import com.nowait.common.enums.Role;
+import com.nowait.common.enums.SocialType;
+import com.nowait.domaincorerdb.user.entity.User;
+import com.nowait.domaincorerdb.user.repository.UserRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class OAuthUserService {
+	private final UserRepository userRepository;
+
+	@Transactional
+	public OAuthUserResult loadOrCreateUser(OAuth2Response oAuth2Response) {
+		return userRepository.findByEmail(oAuth2Response.getEmail())
+			.map(user -> new OAuthUserResult(user, false))   // 기존 유저
+			.orElseGet(() -> {
+				User created = createUser(oAuth2Response);
+				return new OAuthUserResult(created, true);  // 신규 유저
+			});
+	}
+
+	private User createUser(OAuth2Response oAuth2Response) {
+		User user = User.builder()
+			.email(oAuth2Response.getEmail())
+			.phoneNumber("")
+			.nickname(oAuth2Response.getNickName())
+			.profileImage(oAuth2Response.getProfileImage())
+			.socialType(SocialType.KAKAO)
+			.role(Role.USER) // 일반 유저 설정
+			.storeId(0L)
+			.phoneEntered(false)
+			.isMarketingAgree(false)
+			.createdAt(LocalDateTime.now())
+			.updatedAt(LocalDateTime.now())
+			.build();
+
+		return userRepository.save(user);
+	}
+}