Merge pull request #105 from wafflestudio/feat/socialLogin

소셜로그인 재수정

Author: aystoe

.idea/hangsha-server.iml

@@ -73,12 +73,12 @@ class SecurityConfig(
                     .anyRequest().authenticated()
             }
             .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter::class.java)
-            /*
+
             .oauth2Login { oauth2 ->
                 oauth2.userInfoEndpoint { it.userService(customOAuth2UserService) } // 유저 정보 처리 로직
                 oauth2.successHandler(oAuth2SuccessHandler)
             }
-            */
+
         return http.build()
     }
 }

.idea/modules.xml

@@ -25,6 +25,7 @@ class OAuth2SuccessHandler(
     private val tokenHasher: TokenHasher,
     private val cookieSupport: AuthCookieSupport,
     @Value("\${jwt.refresh-expiration-ms}") private val refreshExpirationMs: Long,
+    @Value("\${app.oauth2.front-redirect-uri}") private val frontRedirectUri: String,
 ) : SimpleUrlAuthenticationSuccessHandler() {
 
     override fun onAuthenticationSuccess(
@@ -33,8 +34,8 @@ class OAuth2SuccessHandler(
         authentication: Authentication
     ) {
         val oAuth2User = authentication.principal as OAuth2User
-        val email = oAuth2User.attributes["email"] as String
-
+        val email = oAuth2User.name
+        val isNewUser = oAuth2User.attributes["isNewUser"] as? Boolean ?: false
         val user = userRepository.findByEmail(email)
             ?: throw RuntimeException("User not found after OAuth2 login")
 
@@ -48,10 +49,9 @@ class OAuth2SuccessHandler(
         )
         response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString())
 
-        // 프론트엔드 주소로 변경(http://localhost:3000/oauth/callback)
-        val targetUrl = UriComponentsBuilder.fromUriString("http://localhost:8080/")
+        val targetUrl = UriComponentsBuilder.fromUriString(frontRedirectUri)
             .queryParam("accessToken", accessToken)
-            // .queryParam("refreshToken", refreshToken) // 필요시 주석 해제
+            .queryParam("isNewUser", isNewUser)
             .build().toUriString()
 
         redirectStrategy.sendRedirect(request, response, targetUrl)

hangsha/src/main/kotlin/com/team1/hangsha/config/SecurityConfig.kt

@@ -10,6 +10,7 @@ import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest
 import org.springframework.security.oauth2.core.user.OAuth2User
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User
 
 @Service
 class CustomOAuth2UserService(
@@ -33,48 +34,54 @@ class CustomOAuth2UserService(
 
         val authProvider = AuthProvider.valueOf(registrationId.uppercase())
 
-        // --- (이하 저장 로직은 기존과 동일) ---
-
-        // 3. 이미 연동된 계정인지 확인
+        var isNewUser = false
         val existingIdentity = userIdentityRepository.findByProviderAndProviderUserId(authProvider, providerId)
-        if (existingIdentity != null) {
-            return oAuth2User
-        }
-
-        // 4. 이메일로 기존 유저 확인 (계정 연동)
-        val existingUser = userRepository.findByEmail(email)
+        if (existingIdentity == null) {
+            val existingUser = userRepository.findByEmail(email)
+
+            if (existingUser != null) {
+                userIdentityRepository.save(
+                    UserIdentity(
+                        userId = existingUser.id!!,
+                        provider = authProvider,
+                        providerUserId = providerId,
+                        email = email
+                    )
+                )
+            } else {
+                isNewUser = true
+                val savedUser = userRepository.save(
+                    User(
+                        email = email,
+                        username = name,
+                        profileImageUrl = picture
+                    )
+                )
 
-        if (existingUser != null) {
-            userIdentityRepository.save(
-                UserIdentity(
-                    userId = existingUser.id!!,
-                    provider = authProvider,
-                    providerUserId = providerId,
-                    email = email
+                userIdentityRepository.save(
+                    UserIdentity(
+                        userId = savedUser.id!!,
+                        provider = authProvider,
+                        providerUserId = providerId,
+                        email = email
+                    )
                 )
-            )
-        } else {
-        val savedUser = userRepository.save(
-            User(
-                email = email,
-                username = name,
-                profileImageUrl = picture
-            )
-        )
+            }
+        }
 
-        userIdentityRepository.save(
-            UserIdentity(
-                userId = savedUser.id!!,
-                provider = authProvider,
-                providerUserId = providerId,
-                email = email
-            )
+        // 3. attributes에 "email"과 "isNewUser" 정보 추가
+        val customAttributes = oAuth2User.attributes.toMutableMap()
+        customAttributes["email"] = email
+        customAttributes["isNewUser"] = isNewUser
+
+        // 4. 무조건 여기서 묶어서 반환 (조기 반환 버그 해결!)
+        return DefaultOAuth2User(
+            oAuth2User.authorities,
+            customAttributes,
+            "email" // 식별자 키
         )
     }
 
-    return oAuth2User
-}
-
     // 소셜별로 데이터를 꺼내는 도우미 함수
     private fun extractAttributes(registrationId: String, attributes: Map<String, Any>): OAuthAttributes {
         return when (registrationId) {

hangsha/src/main/kotlin/com/team1/hangsha/user/handler/OAuth2SuccessHandler.kt

@@ -102,13 +102,10 @@ spring:
   config:
     activate:
       on-profile: local
-oauth2:
-  google: # TODO: 로컬 개발 환경에서 클라이언트 쪽으로의 리다이렉션. 우선 임의로 설정. 확인 필요
-    redirect-uri: "http://localhost:3000/login/callback/google"
-  naver:
-    redirect-uri: "http://localhost:3000/login/callback/naver"
-  kakao:
-    redirect-uri: "http://localhost:3000/login/callback/kakao"
+app:
+  oauth2:
+    front-redirect-uri: "http://localhost:3000/auth/callback"
+
 
 ---
 # ==========================================
@@ -118,14 +115,9 @@ spring:
   config:
     activate:
       on-profile: dev
-oauth2:
-  google: # TODO : 추후 확인 필요. 정말로 이 리다이렉트 URI가 맞는가?
-    redirect-uri: "https://hangsha-dev.wafflestudio.com/login/callback/google"
-  naver:
-    redirect-uri: "https://hangsha-dev.wafflestudio.com/login/callback/naver"
-  kakao:
-    redirect-uri: "https://hangsha-dev.wafflestudio.com/login/callback/kakao"
-
+app:
+  oauth2:
+    front-redirect-uri: "https://hangsha-dev.wafflestudio.com/auth/callback"
 ---
 # ==========================================
 # prod
@@ -134,10 +126,6 @@ spring:
   config:
     activate:
       on-profile: prod
-oauth2:
-  google:
-    redirect-uri: "https://hangsha.wafflestudio.com/login/callback/google"
-  naver:
-    redirect-uri: "https://hangsha.wafflestudio.com/login/callback/naver"
-  kakao:
-    redirect-uri: "https://hangsha.wafflestudio.com/login/callback/kakao"
+app:
+  oauth2:
+    front-redirect-uri: "https://hangsha.wafflestudio.com/auth/callback"