Merge branch 'main' of https://github.com/9ITHON/7-ToGetHer-BE

Author: swoo0514

backend/src/main/java/com/together/backend/global/security/oauth2/CustomSuccessHandler.java

@@ -39,11 +39,12 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
         String email = customUserDetails.getEmail();
         Long userId = customUserDetails.getUserId();
+        String role = String.valueOf(customUserDetails.getUserRole()); // 기본값으로 ROLE_USER 설정
 
         Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
         Iterator<? extends GrantedAuthority> iterator = authorities.iterator();
         GrantedAuthority auth = iterator.next();
-        String role = "ROLE_USER"; // 기본값으로 ROLE_USER 설정
+
 
 
         String accessToken = jwtUtil.createToken(email,userId, role);
@@ -54,7 +55,12 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
         jwtTokenService.refreshTokenSave(email, refreshToken);
 
-        response.sendRedirect("http://7-together.kro.kr/?step=2");
+        if (role.equals("ROLE_USER")){
+            response.sendRedirect("http://7-together.kro.kr/?step=2");
+        }else {
+            response.sendRedirect("http://7-together.kro.kr/partner?step=4");
+        }
+
 
 //        response.getWriter().write("{\"message\": \"OAuth2 login success. JWT cookie set.\"}");
 //        response.flushBuffer();  // 확실하게 커밋

backend/src/main/java/com/together/backend/global/security/oauth2/dto/CustomOAuth2User.java

@@ -1,5 +1,6 @@
 package com.together.backend.global.security.oauth2.dto;
 
+import com.together.backend.domain.user.model.entity.Role;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.core.user.OAuth2User;
@@ -42,4 +43,6 @@ public String getEmail() {
     public Long getUserId() {
         return userDTO.getUserId();
     }
+
+    public Role getUserRole() {return userDTO.getRole();}
 }