Merge pull request #427 from Kernel360/develop

[merge] develop into main

Author: Hju95

core/src/main/java/com/kernelsquare/core/common_response/error/code/AuthErrorCode.java

@@ -14,7 +14,9 @@ public enum AuthErrorCode implements ErrorCode {
 	ALREADY_SAVED_NICKNAME(HttpStatus.CONFLICT, AuthServiceStatus.ALREADY_SAVED_NICKNAME, "사용 중인 닉네임입니다."),
 	ALREADY_SAVED_EMAIL(HttpStatus.CONFLICT, AuthServiceStatus.ALREADY_SAVED_EMAIL, "사용 중인 이메일입니다."),
 	UNAUTHORIZED_ACCESS(HttpStatus.NOT_FOUND, AuthServiceStatus.UNAUTHORIZED_ACCESS, "접근 권한이 없습니다."),
-	UNAUTHENTICATED(HttpStatus.UNAUTHORIZED, AuthServiceStatus.UNAUTHENTICATED, "해당 기능은 로그인이 필요합니다.");
+	UNAUTHENTICATED(HttpStatus.UNAUTHORIZED, AuthServiceStatus.UNAUTHENTICATED, "해당 기능은 로그인이 필요합니다."),
+	NO_EMAIL_INFO(HttpStatus.BAD_REQUEST, AuthServiceStatus.NO_EMAIL_INFO, "이메일 정보가 없습니다."),
+	SOCIAL_TYPE_MISMATCH(HttpStatus.BAD_REQUEST, AuthServiceStatus.SOCIAL_TYPE_MISMATCH, "등록되지 않은 소셜타입 입니다.");
 
 	private final HttpStatus httpStatus;
 	private final ServiceStatus serviceStatus;

core/src/main/java/com/kernelsquare/core/common_response/service/code/AuthServiceStatus.java

@@ -11,6 +11,8 @@ public enum AuthServiceStatus implements ServiceStatus {
 	ALREADY_SAVED_EMAIL(1103),
 	UNAUTHORIZED_ACCESS(1104),
 	UNAUTHENTICATED(1105),
+	NO_EMAIL_INFO(1106),
+	SOCIAL_TYPE_MISMATCH(1107),
 
 	//success
 	LOGIN_SUCCESS(1140),

core/src/main/java/com/kernelsquare/core/type/SocialProvider.java

@@ -8,6 +8,7 @@
 public enum SocialProvider {
 	KAKAO("kakao"),
 	GITHUB("github"),
+	NAVER("naver"),
 	GOOGLE("google");
 
 	private final String description;

domain-mysql/src/main/java/com/kernelsquare/domainmysql/domain/member_authority/repository/MemberAuthorityRepository.java

@@ -1,9 +1,15 @@
 package com.kernelsquare.domainmysql.domain.member_authority.repository;
 
+import com.kernelsquare.domainmysql.domain.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.kernelsquare.domainmysql.domain.member_authority.entity.MemberAuthority;
 
+import java.util.List;
+
 public interface MemberAuthorityRepository extends JpaRepository<MemberAuthority, Long> {
+  
+    List<MemberAuthority> findAllByMember(Member member);
+  
     void deleteAllByMemberId(Long memberId);
 }

domain-mysql/src/main/java/com/kernelsquare/domainmysql/domain/social_login/entity/SocialLogin.java

@@ -12,6 +12,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -30,4 +31,12 @@ public class SocialLogin extends BaseEntity {
 	@Enumerated(value = EnumType.STRING)
 	@Column(nullable = false, name = "social_provider", columnDefinition = "varchar(40)")
 	private SocialProvider socialProvider;
+
+
+	@Builder
+	public SocialLogin(Long id, String email, SocialProvider socialProvider) {
+		this.id = id;
+		this.email = email;
+		this.socialProvider = socialProvider;
+	}
 }

domain-mysql/src/main/java/com/kernelsquare/domainmysql/domain/social_login/repository/SocialLoginRepository.java

@@ -0,0 +1,10 @@
+package com.kernelsquare.domainmysql.domain.social_login.repository;
+
+import com.kernelsquare.core.type.SocialProvider;
+import com.kernelsquare.domainmysql.domain.social_login.entity.SocialLogin;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SocialLoginRepository extends JpaRepository<SocialLogin, Long> {
+
+    Boolean existsByEmailAndSocialProvider(String email, SocialProvider socialProvider);
+}

member-api/build.gradle

@@ -44,6 +44,7 @@ dependencies {
 
     //Security
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
 

member-api/src/main/java/com/kernelsquare/memberapi/common/config/OAuth2Config.java

@@ -0,0 +1,18 @@
+package com.kernelsquare.memberapi.common.config;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
+
+@Configuration
+@RequiredArgsConstructor
+public class OAuth2Config {
+
+    @Bean
+    public OAuth2UserService oAuth2UserService() {
+        return new DefaultOAuth2UserService();
+    }
+
+}

member-api/src/main/java/com/kernelsquare/memberapi/common/config/SecurityConfig.java

@@ -1,5 +1,9 @@
 package com.kernelsquare.memberapi.common.config;
 
+import com.kernelsquare.memberapi.common.oauth2.handler.OAuth2LoginFailureHandler;
+import com.kernelsquare.memberapi.common.oauth2.handler.OAuth2LoginSuccessHandler;
+import com.kernelsquare.memberapi.common.oauth2.service.CustomOAuth2MemberService;
+import com.kernelsquare.memberapi.domain.auth.service.TokenProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -16,7 +20,6 @@
 import com.kernelsquare.memberapi.common.filter.JWTSettingFilter;
 import com.kernelsquare.memberapi.common.jwt.JWTAccessDeniedHandler;
 import com.kernelsquare.memberapi.common.jwt.JWTAuthenticationEntryPoint;
-import com.kernelsquare.memberapi.domain.auth.service.TokenProvider;
 
 import lombok.RequiredArgsConstructor;
 
@@ -25,9 +28,12 @@
 @EnableMethodSecurity
 @RequiredArgsConstructor
 public class SecurityConfig {
-	private final TokenProvider tokenProvider;
 	private final JWTAuthenticationEntryPoint jwtAuthenticationEntryPoint;
 	private final JWTAccessDeniedHandler jwtAccessDeniedHandler;
+	private final OAuth2LoginSuccessHandler oAuth2LoginSuccessHandler;
+	private final OAuth2LoginFailureHandler oAuth2LoginFailureHandler;
+	private final CustomOAuth2MemberService customOAuth2MemberService;
+	private final TokenProvider tokenProvider;
 
 	private final String[] permitAllPatterns = new String[] {
 		"/api/v1/auth/check/email",
@@ -73,6 +79,7 @@ public class SecurityConfig {
 		"/api/v1/levels/**"
 	};
 
+
 	@Bean
 	public PasswordEncoder passwordEncoder() {
 		return new BCryptPasswordEncoder();
@@ -95,6 +102,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 			.requestMatchers(HttpMethod.GET, "/api/v1/coffeechat/posts/{postId}").permitAll()
 			.requestMatchers(HttpMethod.GET, "/api/v1/hashtags").permitAll()
 			.requestMatchers(HttpMethod.GET, "/api/v1/techs").permitAll()
+                               
+			.requestMatchers(HttpMethod.GET, "/login/oauth2/**").permitAll()
+			.requestMatchers(HttpMethod.GET, "/oauth2/**").permitAll()
+			.requestMatchers(HttpMethod.GET, "/favicon.ico/**").permitAll()
+			// 백엔드 임시 테스트 창
+			.requestMatchers(HttpMethod.GET, "/api/v1/test").permitAll()
+
 			.requestMatchers(HttpMethod.GET, "/api/v1/coding-meetings").permitAll()
 			.requestMatchers(HttpMethod.GET, "/api/v1/coding-meetings/{codingMeetingToken}").permitAll()
 			.requestMatchers(HttpMethod.GET, "/api/v1/coding-meeting-comments/{codingMeetingToken}").permitAll()
@@ -147,12 +161,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 			sessionManagementConfigurer
 				.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
 
-		// http.oauth2Login(oAuth2LoginConfigurer ->
-		// 		oAuth2LoginConfigurer
-		// 			.successHandler(oAuth2LoginSuccessHandler)
-		// 			.failureHandler(oAuth2LoginFailureHandler)
-		// 			.userInfoEndpoint(userInfoEndpointConfigurer ->
-		// 				userInfoEndpointConfigurer.userService(customOAuth2MemberService)))
+		 http.oauth2Login(oAuth2LoginConfigurer ->
+		 		oAuth2LoginConfigurer
+		 			.successHandler(oAuth2LoginSuccessHandler)
+		 			.failureHandler(oAuth2LoginFailureHandler)
+		 			.userInfoEndpoint(userInfoEndpointConfigurer ->
+		 				userInfoEndpointConfigurer.userService(customOAuth2MemberService)));
+
 		http.logout(Customizer.withDefaults());
 
 		return http.build();

member-api/src/main/java/com/kernelsquare/memberapi/common/filter/JWTSettingFilter.java

@@ -1,9 +1,20 @@
 package com.kernelsquare.memberapi.common.filter;
 
 import java.io.IOException;
+import java.security.Key;
 
+import com.kernelsquare.core.common_response.error.exception.BusinessException;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
+import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -17,6 +28,9 @@
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 
+import static com.kernelsquare.core.common_response.error.code.TokenErrorCode.*;
+import static com.kernelsquare.core.common_response.error.code.TokenErrorCode.WRONG_TOKEN;
+
 @RequiredArgsConstructor
 public class JWTSettingFilter extends OncePerRequestFilter {
 	private final TokenProvider tokenProvider;