Fix: Oauth 연령, 생일, 전화번호 추가

readyvery · Nov 19, 2023 · b9fb5d0 · b9fb5d0
1 parent 6d0027a
commit b9fb5d0
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 6 deletions.
diff --git a/src/main/java/com/readyvery/readyverydemo/security/oauth2/OAuthAttributes.java b/src/main/java/com/readyvery/readyverydemo/security/oauth2/OAuthAttributes.java
@@ -58,6 +58,9 @@ public UserInfo toEntity(SocialType socialType, OAuth2UserInfo oauth2UserInfo) {
 			.socialType(socialType)
 			.socialId(oauth2UserInfo.getId())
 			.email(oauth2UserInfo.getEmail())
+			.phone(oauth2UserInfo.getPhoneNumber())
+			.age(oauth2UserInfo.getAge())
+			.birth(oauth2UserInfo.getBirth())
 			.nickName(oauth2UserInfo.getNickName())
 			.imageUrl(oauth2UserInfo.getImageUrl())
 			.role(Role.USER)

diff --git a/src/main/java/com/readyvery/readyverydemo/security/oauth2/userinfo/KakaoOAuth2UserInfo.java b/src/main/java/com/readyvery/readyverydemo/security/oauth2/userinfo/KakaoOAuth2UserInfo.java
@@ -47,4 +47,37 @@ public String getEmail() {
 
 		return (String)account.get("email");
 	}
+
+	@Override
+	public String getPhoneNumber() {
+		Map<String, Object> account = (Map<String, Object>)attributes.get("kakao_account");
+
+		if (account == null) {
+			return null;
+		}
+
+		return (String)account.get("phone_number");
+	}
+
+	@Override
+	public String getBirth() {
+		Map<String, Object> account = (Map<String, Object>)attributes.get("kakao_account");
+
+		if (account == null) {
+			return null;
+		}
+
+		return (String)account.get("birthyear");
+	}
+
+	@Override
+	public String getAge() {
+		Map<String, Object> account = (Map<String, Object>)attributes.get("kakao_account");
+
+		if (account == null) {
+			return null;
+		}
+
+		return (String)account.get("age_range");
+	}
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/security/oauth2/userinfo/OAuth2UserInfo.java b/src/main/java/com/readyvery/readyverydemo/security/oauth2/userinfo/OAuth2UserInfo.java
@@ -17,4 +17,10 @@ public OAuth2UserInfo(Map<String, Object> attributes) {
 	public abstract String getImageUrl();
 
 	public abstract String getEmail();
+
+	public abstract String getPhoneNumber();
+
+	public abstract String getBirth();
+
+	public abstract String getAge();
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/UserController.java b/src/main/java/com/readyvery/readyverydemo/src/user/UserController.java
@@ -34,7 +34,7 @@ public String jwtTest() {
 	@GetMapping("/auth")
 	public UserAuthRes userAuth(@AuthenticationPrincipal CustomUserDetails userDetails) {
 		// 서비스 계층을 호출하여 사용자 정보를 조회합니다.
-		return userServiceImpl.getUserAuthById(userDetails);
+		return userServiceImpl.getUserAuthByCustomUserDetails(userDetails);
 	}
 
 	/**

diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/UserService.java b/src/main/java/com/readyvery/readyverydemo/src/user/UserService.java
@@ -7,7 +7,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 public interface UserService {
-	UserAuthRes getUserAuthById(CustomUserDetails userDetails);
+	UserAuthRes getUserAuthByCustomUserDetails(CustomUserDetails userDetails);
 
 	UserInfoRes getUserInfoById(Long id);
 

diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java
@@ -28,7 +28,7 @@ public class UserServiceImpl implements UserService {
 	private String refreshCookie;
 
 	@Override
-	public UserAuthRes getUserAuthById(CustomUserDetails userDetails) {
+	public UserAuthRes getUserAuthByCustomUserDetails(CustomUserDetails userDetails) {
 
 		return userMapper.userInfoToUserAuthRes(userDetails);
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -2,6 +2,7 @@ spring.datasource.url=jdbc:mysql://localhost:3306/readyvery
 spring.datasource.username=root
 spring.datasource.password=12345678
 spring.jpa.hibernate.ddl-auto=update
+spring.jpa.generate-ddl=true
 spring.jpa.show-sql=true
 spring.jackson.serialization.fail-on-empty-beans=false
 # JWT Configuration
@@ -12,12 +13,12 @@ jwt.refresh.expiration=604800
 jwt.refresh.cookie=refreshToken
 jwt.redirect-uri=http://localhost:3000/login
 # Kakao
-spring.security.oauth2.client.registration.kakao.client-id=e35c097c37d24f762290ec7e9e81887b
-spring.security.oauth2.client.registration.kakao.client-secret=bMT73UM5sM7xfB5yulXMtsxPtjmsJfGS
+spring.security.oauth2.client.registration.kakao.client-id=f5153d4ff1ef221bc332da3ccfec5e81
+spring.security.oauth2.client.registration.kakao.client-secret=E1YuDOXrG22kymEaB53kqRYvMJrt4z5f
 spring.security.oauth2.client.registration.kakao.redirect-uri=http://localhost:8080/login/oauth2/code/kakao
 spring.security.oauth2.client.registration.kakao.client-authentication-method=client_secret_post
 spring.security.oauth2.client.registration.kakao.authorization-grant-type=authorization_code
-spring.security.oauth2.client.registration.kakao.scope=profile_nickname, profile_image, account_email
+spring.security.oauth2.client.registration.kakao.scope=profile_nickname, profile_image, account_email, phone_number, age_range, birthday
 spring.security.oauth2.client.registration.kakao.client-name=Kakao
 spring.security.oauth2.client.provider.kakao.authorization-uri=https://kauth.kakao.com/oauth/authorize
 spring.security.oauth2.client.provider.kakao.token-uri=https://kauth.kakao.com/oauth/token