feat: oAuth에 id, thumbnail_image,nick_name email받아오게 변경

YAPP-Github · Jan 22, 2024 · fe1a809 · fe1a809
1 parent 8ca7c6e
commit fe1a809
Show file tree

Hide file tree

Showing 24 changed files with 128 additions and 59 deletions.
diff --git a/core-api/src/main/java/com/imlinker/coreapi/configuration/SecurityConfiguration.java b/core-api/src/main/java/com/imlinker/coreapi/configuration/SecurityConfiguration.java
@@ -1,8 +1,8 @@
 package com.imlinker.coreapi.configuration;
 
-import com.imlinker.coreapi.core.auth.jwt.JwtTokenProperties;
-import com.imlinker.coreapi.core.auth.jwt.TokenProperties;
-import com.imlinker.coreapi.core.auth.oauth2.*;
+import com.imlinker.coreapi.core.auth.security.jwt.JwtTokenProperties;
+import com.imlinker.coreapi.core.auth.security.jwt.TokenProperties;
+import com.imlinker.coreapi.core.auth.security.oauth2.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;

diff --git a/core-api/src/main/java/com/imlinker/coreapi/core/auth/controller/AuthController.java b/core-api/src/main/java/com/imlinker/coreapi/core/auth/controller/AuthController.java
@@ -0,0 +1,15 @@
+package com.imlinker.coreapi.core.auth.controller;
+
+import com.imlinker.coreapi.support.response.ApiResponse;
+import com.imlinker.enums.OperationResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class AuthController {
+
+    @PostMapping
+    public ApiResponse<OperationResult> signUp() {
+        return ApiResponse.success(OperationResult.SUCCESS);
+    }
+}
diff --git a/core-api/src/main/java/com/imlinker/coreapi/core/auth/controller/request/SignUpRequest.java b/core-api/src/main/java/com/imlinker/coreapi/core/auth/controller/request/SignUpRequest.java
@@ -0,0 +1,12 @@
+package com.imlinker.coreapi.core.auth.controller.request;
+
+import com.imlinker.domain.tag.Tag;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+
+public record SignUpRequest(
+        @Schema(description = "oAuth 식별자") String oAuthId,
+        @Schema(description = "이름") String name,
+        @Schema(description = "프로필 이미지 URL") String profileImgUrl,
+        @Schema(description = "핸드폰 번호") String phoneNumber,
+        @Schema(description = "관심사") List<Tag> tags) {}
diff --git a/.../java/com/imlinker/coreapi/core/auth/oauth2/vendor/KakaoOAuthVendorAttributeResolver.java b/.../java/com/imlinker/coreapi/core/auth/oauth2/vendor/KakaoOAuthVendorAttributeResolver.java
diff --git a/.../main/java/com/imlinker/coreapi/core/auth/oauth2/vendor/OAuthVendorAttributeResolver.java b/.../main/java/com/imlinker/coreapi/core/auth/oauth2/vendor/OAuthVendorAttributeResolver.java
diff --git a/...ore/auth/jwt/JwtAuthenticationFilter.java → ...security/jwt/JwtAuthenticationFilter.java b/...ore/auth/jwt/JwtAuthenticationFilter.java → ...security/jwt/JwtAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.jwt;
+package com.imlinker.coreapi.core.auth.security.jwt;
 
 import com.imlinker.coreapi.support.exception.FilterExceptionHandler;
 import com.imlinker.error.ErrorType;

diff --git a/...api/core/auth/jwt/JwtTokenProperties.java → ...auth/security/jwt/JwtTokenProperties.java b/...api/core/auth/jwt/JwtTokenProperties.java → ...auth/security/jwt/JwtTokenProperties.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.jwt;
+package com.imlinker.coreapi.core.auth.security.jwt;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...reapi/core/auth/jwt/JwtTokenProvider.java → ...e/auth/security/jwt/JwtTokenProvider.java b/...reapi/core/auth/jwt/JwtTokenProvider.java → ...e/auth/security/jwt/JwtTokenProvider.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.jwt;
+package com.imlinker.coreapi.core.auth.security.jwt;
 
 import com.imlinker.coreapi.support.exception.FilterExceptionHandler;
 import com.imlinker.domain.common.Email;

diff --git a/...oreapi/core/auth/jwt/TokenProperties.java → ...re/auth/security/jwt/TokenProperties.java b/...oreapi/core/auth/jwt/TokenProperties.java → ...re/auth/security/jwt/TokenProperties.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.jwt;
+package com.imlinker.coreapi.core.auth.security.jwt;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...nker/coreapi/core/auth/jwt/TokenType.java → ...api/core/auth/security/jwt/TokenType.java b/...nker/coreapi/core/auth/jwt/TokenType.java → ...api/core/auth/security/jwt/TokenType.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.jwt;
+package com.imlinker.coreapi.core.auth.security.jwt;
 
 public enum TokenType {
     ACCESS_TOKEN,

diff --git a/...uth/oauth2/CustomAccessDeniedHandler.java → ...ity/oauth2/CustomAccessDeniedHandler.java b/...uth/oauth2/CustomAccessDeniedHandler.java → ...ity/oauth2/CustomAccessDeniedHandler.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
 import com.imlinker.coreapi.support.exception.FilterExceptionHandler;
 import com.imlinker.error.ErrorType;

diff --git a/...auth2/CustomAuthenticationEntryPoint.java → ...auth2/CustomAuthenticationEntryPoint.java b/...auth2/CustomAuthenticationEntryPoint.java → ...auth2/CustomAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
 import com.imlinker.coreapi.support.exception.FilterExceptionHandler;
 import com.imlinker.error.ErrorType;

diff --git a/...2/CustomAuthenticationSuccessHandler.java → ...2/CustomAuthenticationSuccessHandler.java b/...2/CustomAuthenticationSuccessHandler.java → ...2/CustomAuthenticationSuccessHandler.java
@@ -1,16 +1,18 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
-import com.imlinker.coreapi.core.auth.jwt.JwtTokenProvider;
-import com.imlinker.coreapi.core.auth.jwt.TokenType;
-import com.imlinker.coreapi.core.auth.oauth2.vendor.OAuthVendor;
-import com.imlinker.coreapi.core.auth.oauth2.vendor.OAuthVendorAttributeResolver;
+import com.imlinker.coreapi.core.auth.security.jwt.JwtTokenProvider;
+import com.imlinker.coreapi.core.auth.security.jwt.TokenType;
+import com.imlinker.coreapi.core.auth.security.oauth2.vendor.OAuthVendor;
+import com.imlinker.coreapi.core.auth.security.oauth2.vendor.OAuthVendorAttributeResolver;
 import com.imlinker.domain.common.Email;
 import com.imlinker.domain.user.UserService;
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -64,11 +66,25 @@ public void onAuthenticationSuccess(
             String refreshToken = jwtTokenProvider.generateToken(email, TokenType.REFRESH_TOKEN);
 
             String redirectUri =
-                    String.format(
-                            "%s?accessToken=%s&refreshToken=%s", clientOriginHost, accessToken, refreshToken);
+                    clientOriginHost
+                            + "?"
+                            + String.format(
+                                    "%s?accessToken=%s&refreshToken=%s", clientOriginHost, accessToken, refreshToken);
             getRedirectStrategy().sendRedirect(request, response, redirectUri);
         } else {
-            String redirectUri = String.format("%s?email=%s", clientOriginHost, email.getValue());
+            String oAuthId = resolver.getOAuthId(oAuth2User.getAttributes());
+            String nickname = resolver.getNickname(oAuth2User.getAttributes());
+            String profileImgUrl = resolver.getProfileImgUrl(oAuth2User.getAttributes());
+
+            String redirectUri =
+                    clientOriginHost
+                            + "?"
+                            + URLEncoder.encode(
+                                    String.format(
+                                            "oAuthId=%s&nickname=%s&profileImgUrl=%s&email=%s",
+                                            oAuthId, nickname, profileImgUrl, email.getValue()),
+                                    StandardCharsets.UTF_8);
+
             getRedirectStrategy().sendRedirect(request, response, redirectUri);
         }
     }

diff --git a/...2/CustomAuthorizationRequestResolver.java → ...2/CustomAuthorizationRequestResolver.java b/...2/CustomAuthorizationRequestResolver.java → ...2/CustomAuthorizationRequestResolver.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;

diff --git a/...h/oauth2/CustomClientOriginHostCache.java → ...y/oauth2/CustomClientOriginHostCache.java b/...h/oauth2/CustomClientOriginHostCache.java → ...y/oauth2/CustomClientOriginHostCache.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
 import com.imlinker.localcache.LocalCache;
 import java.time.Duration;

diff --git a/...2/CustomClientRegistrationRepository.java → ...2/CustomClientRegistrationRepository.java b/...2/CustomClientRegistrationRepository.java → ...2/CustomClientRegistrationRepository.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;

diff --git a/...pi/core/auth/oauth2/CustomOAuth2User.java → ...uth/security/oauth2/CustomOAuth2User.java b/...pi/core/auth/oauth2/CustomOAuth2User.java → ...uth/security/oauth2/CustomOAuth2User.java
@@ -1,6 +1,6 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
-import com.imlinker.coreapi.core.auth.oauth2.vendor.OAuthVendor;
+import com.imlinker.coreapi.core.auth.security.oauth2.vendor.OAuthVendor;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;

diff --git a/.../auth/oauth2/CustomOAuth2UserService.java → ...urity/oauth2/CustomOAuth2UserService.java b/.../auth/oauth2/CustomOAuth2UserService.java → ...urity/oauth2/CustomOAuth2UserService.java
@@ -1,6 +1,6 @@
-package com.imlinker.coreapi.core.auth.oauth2;
+package com.imlinker.coreapi.core.auth.security.oauth2;
 
-import com.imlinker.coreapi.core.auth.oauth2.vendor.OAuthVendor;
+import com.imlinker.coreapi.core.auth.security.oauth2.vendor.OAuthVendor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;

diff --git a/.../imlinker/coreapi/core/auth/security/oauth2/vendor/KakaoOAuthVendorAttributeResolver.java b/.../imlinker/coreapi/core/auth/security/oauth2/vendor/KakaoOAuthVendorAttributeResolver.java
@@ -0,0 +1,36 @@
+package com.imlinker.coreapi.core.auth.security.oauth2.vendor;
+
+import com.imlinker.domain.common.Email;
+import java.util.Map;
+import org.springframework.stereotype.Component;
+
+@Component
+public class KakaoOAuthVendorAttributeResolver implements OAuthVendorAttributeResolver {
+    @Override
+    public OAuthVendor getVendor() {
+        return OAuthVendor.KAKAO;
+    }
+
+    @Override
+    public String getOAuthId(Map<String, Object> attributes) {
+        return attributes.get("id").toString();
+    }
+
+    @Override
+    public Email getEmail(Map<String, Object> attributes) {
+        Map<String, String> emailAttributes = (Map<String, String>) attributes.get("kakao_account");
+        return Email.of(emailAttributes.get("email"));
+    }
+
+    @Override
+    public String getProfileImgUrl(Map<String, Object> attributes) {
+        Map<String, String> emailAttributes = (Map<String, String>) attributes.get("properties");
+        return emailAttributes.get("thumbnail_image");
+    }
+
+    @Override
+    public String getNickname(Map<String, Object> attributes) {
+        Map<String, String> emailAttributes = (Map<String, String>) attributes.get("properties");
+        return emailAttributes.get("nickname");
+    }
+}
diff --git a/.../core/auth/oauth2/vendor/OAuthVendor.java → ...h/security/oauth2/vendor/OAuthVendor.java b/.../core/auth/oauth2/vendor/OAuthVendor.java → ...h/security/oauth2/vendor/OAuthVendor.java
@@ -1,4 +1,4 @@
-package com.imlinker.coreapi.core.auth.oauth2.vendor;
+package com.imlinker.coreapi.core.auth.security.oauth2.vendor;
 
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;

diff --git a/...a/com/imlinker/coreapi/core/auth/security/oauth2/vendor/OAuthVendorAttributeResolver.java b/...a/com/imlinker/coreapi/core/auth/security/oauth2/vendor/OAuthVendorAttributeResolver.java
@@ -0,0 +1,17 @@
+package com.imlinker.coreapi.core.auth.security.oauth2.vendor;
+
+import com.imlinker.domain.common.Email;
+import java.util.Map;
+
+public interface OAuthVendorAttributeResolver {
+
+    OAuthVendor getVendor();
+
+    String getOAuthId(Map<String, Object> attributes);
+
+    Email getEmail(Map<String, Object> attributes);
+
+    String getProfileImgUrl(Map<String, Object> attributes);
+
+    String getNickname(Map<String, Object> attributes);
+}
diff --git a/core-api/src/main/java/com/imlinker/coreapi/core/my/request/UpdateMyInfoRequest.java b/core-api/src/main/java/com/imlinker/coreapi/core/my/request/UpdateMyInfoRequest.java
@@ -1,11 +1,10 @@
 package com.imlinker.coreapi.core.my.request;
 
+import com.imlinker.domain.tag.Tag;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 
 public record UpdateMyInfoRequest(
         @Schema(description = "이름") String name,
         @Schema(description = "프로필 이미지 URL") String profileImgUrl,
-        @Schema(description = "직업", nullable = true) String job,
-        @Schema(description = "소속", nullable = true) String association,
-        @Schema(description = "관심사") List<String> tags) {}
+        @Schema(description = "관심사") List<Tag> tags) {}
diff --git a/core-api/src/main/resources/oauth/application-oauth-dev.yml b/core-api/src/main/resources/oauth/application-oauth-dev.yml
@@ -12,6 +12,8 @@ spring:
             client-name: kakao
             scope:
               - account_email
+              - profile_nickname
+              - profile_image
         provider:
           kakao:
             authorization-uri: https://kauth.kakao.com/oauth/authorize

diff --git a/core-api/src/main/resources/oauth/application-oauth-local.yml b/core-api/src/main/resources/oauth/application-oauth-local.yml
@@ -12,6 +12,8 @@ spring:
             client-name: kakao
             scope:
               - account_email
+              - profile_nickname
+              - profile_image
         provider:
           kakao:
             authorization-uri: https://kauth.kakao.com/oauth/authorize