[FEAT] 네이버 소셜 로그인 구현

server/src/main/java/com/talkka/server/config/SecurityConfig.java

@@ -5,9 +5,9 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
-import com.talkka.server.oauth.OAuth2LoginFailureHandler;
-import com.talkka.server.oauth.OAuth2LoginSuccessHandler;
+import com.talkka.server.oauth.filter.UnregisteredUserFilter;
 import com.talkka.server.oauth.service.CustomOAuth2Service;
 
 import lombok.RequiredArgsConstructor;
@@ -17,21 +17,25 @@
 public class SecurityConfig {
 
 	private final CustomOAuth2Service customOAuth2Service;
-	private final OAuth2LoginSuccessHandler oAuth2LoginSuccessHandler;
-	private final OAuth2LoginFailureHandler oAuth2LoginFailureHandler;
 
 	@Bean
 	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		http
 			.csrf(AbstractHttpConfigurer::disable)
 			.cors(AbstractHttpConfigurer::disable)
 			.authorizeHttpRequests(authorize -> authorize
-				.requestMatchers("/auth/**").permitAll()
-				.anyRequest().authenticated())
+				.requestMatchers("/auth/**", "/login/**").permitAll()
+				.anyRequest().authenticated()
+			)
+			.addFilterAfter(new UnregisteredUserFilter(), BasicAuthenticationFilter.class)
 			.oauth2Login(oauth -> oauth
 				.userInfoEndpoint(userInfo -> userInfo.userService(customOAuth2Service))
-				.successHandler(oAuth2LoginSuccessHandler)
-				.failureHandler(oAuth2LoginFailureHandler)
+				.defaultSuccessUrl("/")
+			)
+			.exceptionHandling(exceptionHandling -> exceptionHandling
+				.authenticationEntryPoint((request, response, authException) -> {
+					response.sendRedirect("/auth/login");
+				})
 			);
 		return http.build();
 	}

server/src/main/java/com/talkka/server/oauth/controller/AuthController.java

@@ -8,8 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.talkka.server.oauth.domain.AuthUserDto;
-import com.talkka.server.oauth.domain.CustomUserPrincipal;
+import com.talkka.server.oauth.domain.OAuth2UserInfo;
 import com.talkka.server.user.dto.UserCreateDto;
 import com.talkka.server.user.dto.UserDto;
 import com.talkka.server.user.service.UserService;
@@ -30,32 +29,30 @@ public String loginForm() {
 	}
 
 	@GetMapping("/signUp")
-	public String signUpForm(Model model, @AuthenticationPrincipal CustomUserPrincipal principal) {
-		AuthUserDto userDto = principal.getUser();
-		model.addAttribute("user", userDto);
+	public String signUpForm(Model model, @AuthenticationPrincipal OAuth2UserInfo principal) {
+		model.addAttribute("name", principal.getName());
+		model.addAttribute("email", principal.getEmail());
 		return "signUpForm";
 	}
 
-	@SuppressWarnings("checkstyle:WhitespaceAround")
 	@PostMapping("/signUp")
 	public String signUp(@RequestParam("nickname") String nickname,
 		Model model,
-		@AuthenticationPrincipal CustomUserPrincipal principal,
+		@AuthenticationPrincipal OAuth2UserInfo principal,
 		HttpServletRequest request) {
 		if (userService.isDuplicatedNickname(nickname)) {
 			return "signUpForm";
 		}
-		AuthUserDto authUserDto = principal.getUser();
 		UserCreateDto userCreateDto = UserCreateDto.builder()
-			.name(authUserDto.getName())
-			.email(authUserDto.getEmail())
-			.oauthProvider(authUserDto.getProvider())
+			.name(principal.getName())
+			.email(principal.getEmail())
+			.oauthProvider(principal.getProvider())
 			.nickname(nickname)
-			.accessToken(authUserDto.getAccessToken())
+			.accessToken(principal.getAccessToken())
 			.build();
 		UserDto user = userService.createUser(userCreateDto);
 		request.getSession().invalidate();
-		return "redirect:/";
+		return "redirect:/oauth2/authorization/naver";
 	}
 
 	@GetMapping("/login/naver")

server/src/main/java/com/talkka/server/oauth/controller/BaseController.java

@@ -0,0 +1,23 @@
+package com.talkka.server.oauth.controller;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import com.talkka.server.oauth.domain.OAuth2UserInfo;
+
+// 인증 테스트를 위한 임시 컨트롤러
+@Controller
+public class BaseController {
+	@GetMapping("/")
+	public String authIndex(Model model, @AuthenticationPrincipal OAuth2UserInfo userInfo) {
+		model.addAttribute("name", userInfo.getName());
+		model.addAttribute("email", userInfo.getEmail());
+		model.addAttribute("nickname", userInfo.getNickName());
+		model.addAttribute("oauth2Id", userInfo.getOAuth2Id());
+		model.addAttribute("provider", userInfo.getProvider());
+		model.addAttribute("accessToken", userInfo.getAccessToken());
+		return "index";
+	}
+}

server/src/main/java/com/talkka/server/oauth/domain/NaverOAuth2User.java

@@ -0,0 +1,23 @@
+package com.talkka.server.oauth.domain;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.springframework.security.core.GrantedAuthority;
+
+public class NaverOAuth2User extends OAuth2UserInfo {
+
+	public NaverOAuth2User(Map<String, Object> attributes) {
+		super((Map<String, Object>)attributes.get("response"));
+	}
+
+	public NaverOAuth2User(Map<String, Object> attributes, Collection<? extends GrantedAuthority> authorities) {
+		super((Map<String, Object>)attributes, authorities);
+	}
+
+	@Override
+	public String getProvider() {
+		return "NAVER";
+	}
+
+}

server/src/main/java/com/talkka/server/oauth/domain/OAuth2UserInfo.java

@@ -0,0 +1,60 @@
+package com.talkka.server.oauth.domain;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+public abstract class OAuth2UserInfo implements OAuth2User {
+
+	protected final Map<String, Object> attributes;
+	private final Collection<? extends GrantedAuthority> authorities;
+
+	public OAuth2UserInfo(Map<String, Object> attributes, Collection<? extends GrantedAuthority> authorities) {
+		this.attributes = attributes;
+		this.authorities = authorities;
+	}
+
+	// OAuth2 인증까지만 통과하면 UNREGISTERED 권한 부여
+	public OAuth2UserInfo(Map<String, Object> attributes) {
+		this.attributes = attributes;
+		this.authorities = List.of(new SimpleGrantedAuthority("UNREGISTERED"));
+	}
+
+	@Override
+	public Map<String, Object> getAttributes() {
+		return attributes;
+	}
+
+	@Override
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		return authorities;
+	}
+
+	@Override
+	public String getName() {
+		return (String)attributes.get("name");
+	}
+
+	public String getOAuth2Id() {
+		return (String)attributes.get("id");
+	}
+
+	public String getEmail() {
+		return (String)attributes.get("email");
+	}
+
+	public String getAccessToken() {
+		return (String)attributes.get("accessToken");
+	}
+
+	public String getNickName() {
+		return (String)attributes.get("nickname");
+	}
+
+	// oauth provider 는 각 제공자 별로 구현
+	public abstract String getProvider();
+}

server/src/main/java/com/talkka/server/oauth/filter/UnregisteredUserFilter.java

@@ -0,0 +1,51 @@
+package com.talkka.server.oauth.filter;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class UnregisteredUserFilter implements Filter {
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+		throws IOException, ServletException {
+		HttpServletRequest httpRequest = (HttpServletRequest)request;
+		HttpServletResponse httpResponse = (HttpServletResponse)response;
+
+		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+		if (authentication != null) {
+			Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
+			for (GrantedAuthority authority : authorities) {
+				if (authority.getAuthority().equals("UNREGISTERED")
+					&& !httpRequest.getRequestURI().equals("/auth/signUp")) {
+					httpResponse.sendRedirect("/auth/signUp");
+					return;
+				}
+			}
+		}
+
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void destroy() {
+	}
+
+}