Merge pull request #237 from Podo-Store/develop

pipi-shortstocking · web-flow · commit e872d0a2b674 · 2025-04-22T15:37:58.000+09:00
소셜 로그인 기능 구현 완료
diff --git a/build.gradle b/build.gradle
@@ -54,6 +54,9 @@ dependencies {
 
 	// swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
+
+	// 소셜 로그인
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 }
 
 tasks.named('test') {
diff --git a/src/main/java/PodoeMarket/podoemarket/common/config/SocialLoginTypeConverter.java b/src/main/java/PodoeMarket/podoemarket/common/config/SocialLoginTypeConverter.java
@@ -0,0 +1,15 @@
+package PodoeMarket.podoemarket.common.config;
+
+import PodoeMarket.podoemarket.common.entity.type.SocialLoginType;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+@Configuration
+public class SocialLoginTypeConverter implements Converter<String, SocialLoginType> {
+    //대문자 값을 소문자로 mapping
+
+    @Override
+    public SocialLoginType convert(String s) {
+        return SocialLoginType.valueOf(s.toUpperCase());
+    }
+}
diff --git a/src/main/java/PodoeMarket/podoemarket/common/entity/UserEntity.java b/src/main/java/PodoeMarket/podoemarket/common/entity/UserEntity.java
@@ -1,6 +1,6 @@
 package PodoeMarket.podoemarket.common.entity;
 
-import PodoeMarket.podoemarket.common.entity.type.SignUpType;
+import PodoeMarket.podoemarket.common.entity.type.SocialLoginType;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
@@ -39,7 +39,7 @@ public class UserEntity {
 
     @Enumerated(EnumType.STRING)
     @Column
-    private SignUpType signUpType;
+    private SocialLoginType socialLoginType;
 
     @Column(nullable = false, updatable = false)
     private LocalDateTime createdAt;
diff --git a/src/main/java/PodoeMarket/podoemarket/common/entity/type/SocialLoginType.java b/src/main/java/PodoeMarket/podoemarket/common/entity/type/SocialLoginType.java
@@ -1,6 +1,6 @@
 package PodoeMarket.podoemarket.common.entity.type;
 
-public enum SignUpType {
+public enum SocialLoginType {
     KAKAO,
     GOOGLE,
     NAVER
diff --git a/src/main/java/PodoeMarket/podoemarket/common/security/JwtAuthenticationFilter.java b/src/main/java/PodoeMarket/podoemarket/common/security/JwtAuthenticationFilter.java
@@ -76,7 +76,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                     securityContext.setAuthentication(authentication); // context에 인증 정보 설정
                     SecurityContextHolder.setContext(securityContext); // SecurityContextHolder 저장
                 }
-            }else{
+            } else {
                 log.warn("Token is null");
                 filterChain.doFilter(request, response);
                 return;
diff --git a/src/main/java/PodoeMarket/podoemarket/user/controller/OauthController.java b/src/main/java/PodoeMarket/podoemarket/user/controller/OauthController.java
@@ -0,0 +1,59 @@
+package PodoeMarket.podoemarket.user.controller;
+
+import PodoeMarket.podoemarket.common.entity.UserEntity;
+import PodoeMarket.podoemarket.common.entity.type.SocialLoginType;
+import PodoeMarket.podoemarket.common.security.TokenProvider;
+import PodoeMarket.podoemarket.dto.response.ResponseDTO;
+import PodoeMarket.podoemarket.user.dto.response.SignInResponseDTO;
+import PodoeMarket.podoemarket.user.service.OAuthService;
+import PodoeMarket.podoemarket.user.service.UserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RequiredArgsConstructor
+@RestController
+@Slf4j
+@RequestMapping("/auth")
+public class OauthController {
+    private final OAuthService oauthService;
+    private final UserService userService;
+    private final TokenProvider tokenProvider;
+
+    @GetMapping(value = "/{socialLoginType}")
+    public ResponseEntity<?> socialLoginType(@PathVariable(name = "socialLoginType") SocialLoginType socialLoginType) {
+        String redirectURL = oauthService.request(socialLoginType);
+
+        return ResponseEntity.ok().body(redirectURL);
+    }
+
+    @GetMapping(value = "/{socialLoginType}/callback")
+    public ResponseEntity<?> callback(@PathVariable(name = "socialLoginType") SocialLoginType socialLoginType,
+                                      @RequestParam(name = "code") String code) {
+        try {
+            final UserEntity user = oauthService.requestUser(socialLoginType, code);
+
+            if (userService.checkUserId(user.getUserId())) {
+                final UserEntity signInUser  = userService.getByUserId(user.getUserId());
+
+                final SignInResponseDTO resUserDTO = SignInResponseDTO.builder()
+                        .nickname(signInUser.getNickname())
+                        .auth(signInUser.isAuth())
+                        .accessToken(tokenProvider.createAccessToken(user))
+                        .refreshToken(tokenProvider.createRefreshToken(user))
+                        .build();
+
+                return ResponseEntity.ok().body(resUserDTO);
+            } else {
+                // 새 사용자는 저장
+                oauthService.create(user);
+
+                return ResponseEntity.ok().body(true);
+            }
+        } catch(Exception e) {
+            ResponseDTO resDTO = ResponseDTO.builder().error(e.getMessage()).build();
+            return ResponseEntity.badRequest().body(resDTO);
+        }
+    }
+}
diff --git a/src/main/java/PodoeMarket/podoemarket/user/controller/UserController.java b/src/main/java/PodoeMarket/podoemarket/user/controller/UserController.java
@@ -2,7 +2,6 @@
 
 import PodoeMarket.podoemarket.Utils.ValidCheck;
 import PodoeMarket.podoemarket.common.config.jwt.JwtProperties;
-import PodoeMarket.podoemarket.common.entity.type.SignUpType;
 import PodoeMarket.podoemarket.dto.EmailCheckDTO;
 import PodoeMarket.podoemarket.dto.EmailRequestDTO;
 import PodoeMarket.podoemarket.dto.response.ResponseDTO;
@@ -12,7 +11,8 @@
 import PodoeMarket.podoemarket.mail.MailSendService;
 import PodoeMarket.podoemarket.service.RedisUtil;
 import PodoeMarket.podoemarket.user.dto.request.SignInRequestDTO;
-import PodoeMarket.podoemarket.user.dto.response.KakaoUserInfoResponseDTO;
+import PodoeMarket.podoemarket.user.dto.response.SignInResponseDTO;
+import PodoeMarket.podoemarket.user.dto.response.TokenResponseDTO;
 import PodoeMarket.podoemarket.user.service.UserService;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
@@ -196,11 +196,7 @@ public ResponseEntity<?> authenticate(@RequestBody SignInRequestDTO dto) {
             UserEntity user = userService.getByCredentials(dto.getUserId(), dto.getPassword(), pwdEncoder);
 
             if(user.getId() != null) {
-                final UserDTO resUserDTO = UserDTO.builder()
-                        .id(user.getId())
-                        .userId(user.getUserId())
-                        .email(user.getEmail())
-                        .password(user.getPassword())
+                final SignInResponseDTO resUserDTO = SignInResponseDTO.builder()
                         .nickname(user.getNickname())
                         .auth(user.isAuth())
                         .accessToken(tokenProvider.createAccessToken(user))
@@ -222,48 +218,6 @@ public ResponseEntity<?> authenticate(@RequestBody SignInRequestDTO dto) {
         }
     }
 
-    @GetMapping("/kakao")
-    public ResponseEntity<?> getKakao(@RequestParam("code") String code) {
-        try {
-            String accessToken = userService.getAccessTokenFromKakao(code);
-//
-            KakaoUserInfoResponseDTO userInfo = userService.getUserInfo(accessToken);
-//            KakaoUserInfoResponseDTO userInfo = userService.getUserInfo(code);
-
-            // 회원가입 여부 확인
-            if (userService.checkEmail(userInfo.kakaoAccount.email)) {
-                UserEntity user = userService.getByUserId(String.valueOf(userInfo.id));
-
-                final UserDTO resUserDTO = UserDTO.builder()
-                        .id(user.getId())
-                        .userId(user.getUserId())
-                        .email(user.getEmail())
-                        .password(user.getPassword())
-                        .nickname(user.getNickname())
-                        .auth(user.isAuth())
-                        .accessToken(tokenProvider.createAccessToken(user))
-                        .refreshToken(tokenProvider.createRefreshToken(user))
-                        .build();
-
-                return ResponseEntity.ok().body(resUserDTO);
-            } else {
-                final UserEntity user = UserEntity.builder()
-                        .userId(String.valueOf(userInfo.id))
-                        .email(userInfo.kakaoAccount.email)
-                        .nickname(userInfo.kakaoAccount.profile.nickName)
-                        .signUpType(SignUpType.KAKAO)
-                        .build();
-
-                userService.createSocialUser(user);
-
-                return ResponseEntity.ok().body(true);
-            }
-        } catch(Exception e) {
-            ResponseDTO resDTO = ResponseDTO.builder().error(e.getMessage()).build();
-            return ResponseEntity.badRequest().body(resDTO);
-        }
-    }
-
     @PostMapping("/find/mailSend")
     public ResponseEntity<?> findMailSend(@RequestBody EmailRequestDTO dto) {
         try {
@@ -408,7 +362,7 @@ public ResponseEntity<?> createNewToken(HttpServletRequest request){
             UUID id = UUID.fromString(claims.getSubject());
 
             UserEntity user = userService.getById(id);
-            final UserDTO resUserDTO = UserDTO.builder()
+            final TokenResponseDTO resUserDTO = TokenResponseDTO.builder()
                     .userId(user.getUserId())
                     .nickname(user.getNickname())
                     .email(user.getEmail())
diff --git a/src/main/java/PodoeMarket/podoemarket/user/dto/response/SignInResponseDTO.java b/src/main/java/PodoeMarket/podoemarket/user/dto/response/SignInResponseDTO.java
@@ -0,0 +1,17 @@
+package PodoeMarket.podoemarket.user.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SignInResponseDTO {
+    private String nickname;
+    private boolean auth;
+    private String accessToken; // jwt 저장공간
+    private String refreshToken; // jwt 저장공간
+}
diff --git a/src/main/java/PodoeMarket/podoemarket/user/dto/response/TokenResponseDTO.java b/src/main/java/PodoeMarket/podoemarket/user/dto/response/TokenResponseDTO.java
@@ -0,0 +1,17 @@
+package PodoeMarket.podoemarket.user.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TokenResponseDTO {
+    private String userId;
+    private String nickname;
+    private String email;
+    private String accessToken;
+}
diff --git a/src/main/java/PodoeMarket/podoemarket/user/service/GoogleOauth.java b/src/main/java/PodoeMarket/podoemarket/user/service/GoogleOauth.java
@@ -0,0 +1,65 @@
+package PodoeMarket.podoemarket.user.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class GoogleOauth implements SocialOauth {
+    @Value("${sns.google.url}")
+    private String GOOGLE_SNS_BASE_URL;
+    @Value("${sns.google.client-id}")
+    private String GOOGLE_SNS_CLIENT_ID;
+    @Value("${sns.google.callback-url}")
+    private String GOOGLE_SNS_CALLBACK_URL;
+    @Value("${sns.google.client-secret}")
+    private String GOOGLE_SNS_CLIENT_SECRET;
+    @Value("${sns.google.token-url}")
+    private String GOOGLE_SNS_TOKEN_BASE_URL;
+
+    @Override
+    public String getOauthRedirectURL() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("scope", "email profile");
+        params.put("response_type", "code");
+        params.put("client_id", GOOGLE_SNS_CLIENT_ID);
+        params.put("redirect_uri", GOOGLE_SNS_CALLBACK_URL);
+
+        String parameterString = params.entrySet().stream()
+                .map(x -> x.getKey() + "=" + x.getValue())
+                .collect(Collectors.joining("&"));
+
+        return GOOGLE_SNS_BASE_URL + "?" + parameterString;
+    }
+
+    @Override
+    public String requestAccessToken(String code) {
+        RestTemplate restTemplate = new RestTemplate();
+
+        // 파라미터 설정
+        Map<String, Object> params = new HashMap<>();
+        params.put("code", code);
+        params.put("client_id", GOOGLE_SNS_CLIENT_ID);
+        params.put("client_secret", GOOGLE_SNS_CLIENT_SECRET);
+        params.put("redirect_uri", GOOGLE_SNS_CALLBACK_URL);
+        params.put("grant_type", "authorization_code");
+
+        // POST 요청 전송
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(GOOGLE_SNS_TOKEN_BASE_URL, params, String.class);
+
+        if (responseEntity.getStatusCode() == HttpStatus.OK)
+            return responseEntity.getBody();
+
+        return "구글 로그인 요청 처리 실패";
+    }
+}
diff --git a/src/main/java/PodoeMarket/podoemarket/user/service/KakaoOauth.java b/src/main/java/PodoeMarket/podoemarket/user/service/KakaoOauth.java
@@ -0,0 +1,73 @@
+package PodoeMarket.podoemarket.user.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class KakaoOauth implements SocialOauth {
+    @Value("${sns.kakao.url}")
+    private String KAKAO_SNS_BASE_URL;
+    @Value("${sns.kakao.client-id}")
+    private String KAKAO_SNS_CLIENT_ID;
+    @Value("${sns.kakao.callback-url}")
+    private String KAKAO_SNS_CALLBACK_URL;
+    @Value("${sns.kakao.client-secret}")
+    private String KAKAO_SNS_CLIENT_SECRET;
+    @Value("${sns.kakao.token-url}")
+    private String KAKAO_SNS_TOKEN_BASE_URL;
+
+    @Override
+    public String getOauthRedirectURL() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("response_type", "code");
+        params.put("client_id", KAKAO_SNS_CLIENT_ID);
+        params.put("redirect_uri", KAKAO_SNS_CALLBACK_URL);
+
+        String parameterString = params.entrySet().stream()
+                .map(x -> x.getKey() + "=" + x.getValue())
+                .collect(Collectors.joining("&"));
+
+        return KAKAO_SNS_BASE_URL + "?" + parameterString;
+    }
+
+    @Override
+    public String requestAccessToken(String code) {
+        RestTemplate restTemplate = new RestTemplate();
+
+        // Header 설정 (Content-Type을 application/x-www-form-urlencoded로 설정)
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+        // 파라미터 설정
+        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+        params.add("code", code);
+        params.add("client_id", KAKAO_SNS_CLIENT_ID);
+        params.add("client_secret", KAKAO_SNS_CLIENT_SECRET);
+        params.add("redirect_uri", KAKAO_SNS_CALLBACK_URL);
+        params.add("grant_type", "authorization_code");
+
+        // HttpEntity 생성
+        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers);
+
+        // POST 요청 전송
+        ResponseEntity<String> responseEntity =
+                restTemplate.postForEntity(KAKAO_SNS_TOKEN_BASE_URL, requestEntity, String.class);
+
+        if (responseEntity.getStatusCode() == HttpStatus.OK)
+            return responseEntity.getBody();
+
+        return "카카오 로그인 요청 처리 실패";
+    }
+}
diff --git a/src/main/java/PodoeMarket/podoemarket/user/service/NaverOauth.java b/src/main/java/PodoeMarket/podoemarket/user/service/NaverOauth.java
diff --git a/src/main/java/PodoeMarket/podoemarket/user/service/OAuthService.java b/src/main/java/PodoeMarket/podoemarket/user/service/OAuthService.java
diff --git a/src/main/java/PodoeMarket/podoemarket/user/service/SocialOauth.java b/src/main/java/PodoeMarket/podoemarket/user/service/SocialOauth.java
diff --git a/src/main/java/PodoeMarket/podoemarket/user/service/UserService.java b/src/main/java/PodoeMarket/podoemarket/user/service/UserService.java

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ dependencies {`
`54`	`54`
`55`	`55`	`// swagger`
`56`	`56`	`implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'`
	`57`	`+`
	`58`	`+ // 소셜 로그인`
	`59`	`+ implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`tasks.named('test') {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`76`	`76`	`securityContext.setAuthentication(authentication); // context에 인증 정보 설정`
`77`	`77`	`SecurityContextHolder.setContext(securityContext); // SecurityContextHolder 저장`
`78`	`78`	`}`
`79`		`- }else{`
	`79`	`+ } else {`
`80`	`80`	`log.warn("Token is null");`
`81`	`81`	`filterChain.doFilter(request, response);`
`82`	`82`	`return;`