Merge pull request #159 from SWU-Elixir/feat/136-social-login

feat: 소셜 회원용 회원가입 성공 시 토큰 발급 기능 추가

Author: seoyeon83

src/main/java/BE_Elixir/Elixir/domain/member/controller/MemberController.java

@@ -1,7 +1,9 @@
 package BE_Elixir.Elixir.domain.member.controller;
 
+import BE_Elixir.Elixir.domain.auth.dto.response.TokenResponseDTO;
 import BE_Elixir.Elixir.domain.follow.service.FollowService;
 import BE_Elixir.Elixir.domain.member.controller.api.MemberApi;
+import BE_Elixir.Elixir.domain.member.dto.SocialSignUpDTO;
 import BE_Elixir.Elixir.domain.member.dto.request.*;
 import BE_Elixir.Elixir.domain.member.dto.response.*;
 import BE_Elixir.Elixir.domain.member.entity.Member;
@@ -64,18 +66,18 @@ public ResponseEntity<CommonResponse<?>> signUp(
 
     // 소셜 회원용 회원가입
     @PostMapping(value= "/signup/{loginType}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<CommonResponse<?>> socialSignUp(
+    public ResponseEntity<CommonResponse<TokenResponseDTO>> socialSignUp(
             @PathVariable(name="loginType") LoginType loginType,
             @RequestPart("dto") SocialSignUpRequestDTO dto,
             @RequestPart(value = "profileImage", required = false) MultipartFile profileImage
     ) {
         log.info("소셜 회원용 회원가입 요청 - 이메일: {}", dto.getEmail());
 
-        Member member = memberService.socialSignUp(loginType, dto, profileImage);
-        log.info("소셜 회원용 회원가입 성공 - 회원 ID: {}", member.getId());
+        SocialSignUpDTO socialSignUpDTO = memberService.socialSignUp(loginType, dto, profileImage);
+        log.info("소셜 회원용 회원가입 성공 - 회원 ID: {}", socialSignUpDTO.getMember().getId());
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(CommonResponse.success(HttpStatus.CREATED.value(), HttpStatus.CREATED.toString(),
-                        "소셜 회원용 회원가입 성공 - memberId: " + member.getId()));
+                        "소셜 회원용 회원가입 성공 - memberId: " + socialSignUpDTO.getMember().getId(), socialSignUpDTO.getTokenResponseDTO()));
     }
 
     // 이메일 인증 요청하기

src/main/java/BE_Elixir/Elixir/domain/member/controller/api/MemberApi.java

@@ -1,5 +1,6 @@
 package BE_Elixir.Elixir.domain.member.controller.api;
 
+import BE_Elixir.Elixir.domain.auth.dto.response.TokenResponseDTO;
 import BE_Elixir.Elixir.domain.member.dto.request.*;
 import BE_Elixir.Elixir.domain.member.dto.response.*;
 import BE_Elixir.Elixir.domain.member.entity.MemberDetails;
@@ -92,7 +93,10 @@ ResponseEntity<CommonResponse<?>> signUp(
                                       "status": 200,
                                       "code": "200 OK",
                                       "message": "소셜 회원용 회원가입 성공 - memberId: 1",
-                                      "data": null
+                                      "data": {
+                                          "grantType": "Bearer",
+                                          "accessToken": "eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiJtb29sMDIwODAzQGdtYWlsLmNvbSIsImF1dGgiOiJVU0VSIiwiZXhwIjoxNzUzNTk4NDQxfQ.YW8gIVXLWMFEm_ywGtDI4TTSJTHOpNVOxKG2wLeBBC2fCW_ZaG1rF7e_9Xps9gnp",
+                                          "refreshToken": "eyJhbGciOiJIUzM4NCJ9.eyJleHAiOjE3NTQ4MDQ0NDF9.Ew5909EU638VuUe3gzNDUv50r162BMrZuDlJD43brRr8dSIclat71BOtPRzZZX9Q"
                                     }
                                     """))),
             @ApiResponse(responseCode = "401", description = "소셜 회원용 회원가입 실패",
@@ -106,7 +110,7 @@ ResponseEntity<CommonResponse<?>> signUp(
                                     }
                                     """)))
     })
-    ResponseEntity<CommonResponse<?>> socialSignUp(
+    ResponseEntity<CommonResponse<TokenResponseDTO>> socialSignUp(
             @PathVariable(name="loginType") LoginType loginType,
             @RequestPart("dto") SocialSignUpRequestDTO dto,
             @RequestPart(value = "profileImage", required = false) MultipartFile profileImage

src/main/java/BE_Elixir/Elixir/domain/member/dto/SocialSignUpDTO.java

@@ -0,0 +1,15 @@
+package BE_Elixir.Elixir.domain.member.dto;
+
+import BE_Elixir.Elixir.domain.auth.dto.response.TokenResponseDTO;
+import BE_Elixir.Elixir.domain.member.entity.Member;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+@AllArgsConstructor
+public class SocialSignUpDTO {
+    private Member member;
+    private TokenResponseDTO tokenResponseDTO;
+}

src/main/java/BE_Elixir/Elixir/domain/member/service/MemberService.java

@@ -1,8 +1,11 @@
 package BE_Elixir.Elixir.domain.member.service;
 
+import BE_Elixir.Elixir.domain.auth.dto.response.TokenResponseDTO;
+import BE_Elixir.Elixir.domain.member.dto.SocialSignUpDTO;
 import BE_Elixir.Elixir.domain.member.dto.request.SignUpRequestDTO;
 import BE_Elixir.Elixir.domain.member.dto.request.SocialSignUpRequestDTO;
 import BE_Elixir.Elixir.domain.member.entity.Member;
+import BE_Elixir.Elixir.domain.member.entity.MemberDetails;
 import BE_Elixir.Elixir.domain.member.repository.MemberRepository;
 import BE_Elixir.Elixir.global.enums.LoginType;
 import BE_Elixir.Elixir.global.exception.CustomException;
@@ -17,6 +20,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,13 +37,13 @@
 public class MemberService {
 
     private final MemberRepository memberRepository;
+    private final MemberDetailsService memberDetailsService;
     private final BCryptPasswordEncoder passwordEncoder;
     private final JwtProvider jwtProvider;
     private final RedisAuthService redisAuthService;
     private final RedisEmailVerificationService redisMailVerificationService;
     private final S3Service s3Service;
     private final EmailService mailService;
-
     // 이메일 중복 체크
     public boolean isEmailDuplicated(String email) {
         return memberRepository.existsByEmail(email);
@@ -104,7 +109,7 @@ public Member localSignUp(SignUpRequestDTO request, MultipartFile profileImage)
     }
 
     // 소셜 회원용 회원가입 메소드
-    public Member socialSignUp(LoginType loginType, SocialSignUpRequestDTO request, MultipartFile profileImage) {
+    public SocialSignUpDTO socialSignUp(LoginType loginType, SocialSignUpRequestDTO request, MultipartFile profileImage) {
         // 소셜 회원이 맞는지 검증
         if (!loginType.isSocial()) {
             throw new CustomException(ErrorCode.LOGIN_TYPE_MISMATCH);
@@ -156,7 +161,27 @@ public Member socialSignUp(LoginType loginType, SocialSignUpRequestDTO request,
                 member.setProfileUrl(request.getProfileImageUrl());
             }
 
-            return memberRepository.save(member);
+            memberRepository.save(member);
+
+            // JWT 토큰 발급
+            // Spring Security Authentication 객체 생성
+            MemberDetails memberDetails = memberDetailsService.loadUserByUsername(member.getEmail());
+            Authentication authentication = new UsernamePasswordAuthenticationToken(
+                    memberDetails, "", memberDetails.getAuthorities()
+            );
+
+            // JWT 생성
+            TokenResponseDTO tokenResponse = jwtProvider.generateToken(authentication);
+            String refreshToken = tokenResponse.getRefreshToken();
+
+            // Redis에 Refresh Token 저장
+            redisAuthService.saveRefreshToken(member.getEmail(), refreshToken);
+            log.info("[소셜 로그인] Refresh Token Redis에 저장: email={}, token={}", member.getEmail(), refreshToken);
+
+            return SocialSignUpDTO.builder()
+                    .member(member)
+                    .tokenResponseDTO(tokenResponse)
+                    .build();
 
         } catch (DataIntegrityViolationException e) {
             if (e.getMessage().toUpperCase().contains("EMAIL_UNIQUE")) {