Merge branch 'develop' into feat/terraform

Author: leeeunda

src/main/java/com/blockcloud/dto/oauth/CustomOAuth2User.java

@@ -1,46 +1,49 @@
 package com.blockcloud.dto.oauth;
 
 import com.blockcloud.domain.user.User;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority; // import 추가
 import org.springframework.security.oauth2.core.user.OAuth2User;
 
 @AllArgsConstructor
 public class CustomOAuth2User implements OAuth2User {
-	private final User user;
-
-
-	@Override
-	public Map<String, Object> getAttributes() {
-		return null;
-	}
-
-	@Override
-	public String getName() {
-		return user.getUsername();  // 예: principal로 사용할 이메일 반환
-	}
-
-	public String getEmail() {
-		return user.getEmail();
-	}
-
-	public String getRole() {
-		return user.getRole();
-	}
-
-	public String getImageUrl() {
-		return user.getImgUrl();
-	}
-
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-		return null;
-	}
-
-	public User getUser() {
-		return user;
-	}
-}
+    private final User user;
+
+    @Override
+    public Map<String, Object> getAttributes() {
+        return Map.of();
+    }
+
+    @Override
+    public String getName() {
+       return user.getEmail();
+    }
+
+    public String getEmail() {
+       return user.getEmail();
+    }
+
+    public String getRole() {
+       return user.getRole();
+    }
+
+    public String getImageUrl() {
+       return user.getImgUrl();
+    }
+
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        Collection<GrantedAuthority> authorities = new ArrayList<>();
+        authorities.add(new SimpleGrantedAuthority("ROLE_" + user.getRole()));
+        return authorities;
+    }
+
+    public User getUser() {
+       return user;
+    }
+}

src/main/java/com/blockcloud/exception/handler/OAuth2SuccessHandler.java

@@ -8,74 +8,62 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.web.util.UriComponentsBuilder;
-
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
 
 @AllArgsConstructor
 public class OAuth2SuccessHandler implements AuthenticationSuccessHandler {
 
-	private final JWTUtil jwtUtil;
-	private final CookieService cookieService;
-
+    private final JWTUtil jwtUtil;
+    private final CookieService cookieService;
 
-	@Override
-	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
-		// Authentication 객체에서 CustomOAuth2User 정보 가져오기
-		CustomOAuth2User customOAuth2User = (CustomOAuth2User) authentication.getPrincipal();
-		User user = customOAuth2User.getUser();  // User 정보 가져오기
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
 
-		// ObjectMapper와 PrintWriter를 한번만 생성
-		ObjectMapper objectMapper = new ObjectMapper();
-		PrintWriter writer = response.getWriter();
+        CustomOAuth2User customOAuth2User = (CustomOAuth2User) authentication.getPrincipal();
+        User user = customOAuth2User.getUser();
+        ObjectMapper objectMapper = new ObjectMapper();
 
 		try {
 				String accessToken = jwtUtil.createJwt("access", user.getEmail(), String.valueOf(user.getRole()), 30 * 60 * 1000L);
 				String refreshToken = jwtUtil.createJwt("refresh", user.getEmail(), String.valueOf(user.getRole()), 24 * 60 * 60 * 1000L);
 
-				Cookie refreshCookie = cookieService.createCookie( "refresh", refreshToken, 24 * 60 * 60 * 1000L);
-				response.addCookie(refreshCookie);
-				response.setStatus(HttpStatus.OK.value());
-				String userJson = objectMapper.writeValueAsString(user);
+            Cookie refreshCookie = cookieService.createCookie("refresh", refreshToken, 24 * 60 * 60 * 1000L);
+            response.addCookie(refreshCookie);
 
-				// JSON 직렬화
-				String userjson = objectMapper.writeValueAsString(
-					Map.of(
-						"message", "Login successful",
-						"email", user.getEmail(),
-						"imgUrl",user.getImgUrl(),
-						"userName",user.getUsername(),
-						"role",user.getRole()
-					)
-				);
+            response.setStatus(HttpStatus.OK.value());
+            response.setContentType("application/json;charset=UTF-8");
 
-				// URL에 JSON을 쿼리 파라미터로 추가
-				String encodedJson = URLEncoder.encode(userjson, StandardCharsets.UTF_8);
+            String userJson = objectMapper.writeValueAsString(
+                Map.of(
+                    "message", "Login successful",
+                    "email", user.getEmail(),
+                    "imgUrl", user.getImgUrl(),
+                    "userName", user.getUsername(),
+                    "role", user.getRole()
+                )
+            );
+			String redirectUrl =  "https://app.blockcloud.com/oauth2/callback"
+				+ "?access=" + URLEncoder.encode(accessToken, StandardCharsets.UTF_8)
+				+ "&user=" + URLEncoder.encode(userJson, StandardCharsets.UTF_8);
 
-				String uri = UriComponentsBuilder
-					.newInstance()
-					.scheme("http")
-					.host("localhost:8080")
-					.path("/login/success")
-					.queryParam("user", encodedJson)
-					.queryParam("access", accessToken)
-					.build()
-					.toString();
-				response.sendRedirect(uri);
-		} catch (IOException e) {
-			// 에러 처리: 500 응답 전송
-			response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
-			writer.write("{\"message\": \"An error occurred during authentication\"}");
-			writer.flush();
-		}
+			response.sendRedirect(redirectUrl);
+        } catch (IOException e) {
+            e.printStackTrace();
+            response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.setContentType("application/json;charset=UTF-8");
 
-	}
-}
+            try (PrintWriter writer = response.getWriter()) {
+                writer.write("{\"message\": \"An error occurred during authentication\"}");
+                writer.flush();
+            }
+        }
+    }
+}