File tree Expand file tree Collapse file tree 5 files changed +15
-12
lines changed Expand file tree Collapse file tree 5 files changed +15
-12
lines changed Original file line number Diff line number Diff line change 77import org .springframework .security .core .GrantedAuthority ;
88import org .springframework .security .oauth2 .core .user .OAuth2User ;
99
10+ import com .example .log4u .domain .user .dto .UserCreateRequestDto ;
1011import com .example .log4u .domain .user .entity .User ;
1112
12- import lombok .Getter ;
13-
1413public class CustomOAuth2User implements OAuth2User {
1514 private final UserCreateRequestDto userCreateRequestDto ;
1615
1716 public CustomOAuth2User (UserCreateRequestDto userCreateRequestDto ) {
1817 this .userCreateRequestDto = userCreateRequestDto ;
1918 }
2019
21- public CustomOAuth2User (User user ){
20+ public CustomOAuth2User (User user ) {
2221 this .userCreateRequestDto = UserCreateRequestDto .fromEntity (user );
2322 }
2423
25-
2624 @ Override
2725 public Map <String , Object > getAttributes () {
2826 return Map .of ();
@@ -40,11 +38,15 @@ public String getName() {
4038 return userCreateRequestDto .name ();
4139 }
4240
43- public String getRole () { return userCreateRequestDto .role ();}
41+ public String getRole () {
42+ return userCreateRequestDto .role ();
43+ }
4444
4545 public String getProviderId () {
4646 return userCreateRequestDto .providerId ();
4747 }
4848
49- public Long getUserId () { return userCreateRequestDto .userId (); }
49+ public Long getUserId () {
50+ return userCreateRequestDto .userId ();
51+ }
5052}
Original file line number Diff line number Diff line change 1313import com .example .log4u .common .oauth2 .dto .KakaoResponseDto ;
1414import com .example .log4u .common .oauth2 .dto .NaverResponseDto ;
1515import com .example .log4u .common .oauth2 .dto .OAuth2Response ;
16- import com .example .log4u .common . oauth2 .dto .UserCreateRequestDto ;
16+ import com .example .log4u .domain . user .dto .UserCreateRequestDto ;
1717import com .example .log4u .domain .user .entity .User ;
1818import com .example .log4u .domain .user .repository .UserRepository ;
1919
@@ -34,6 +34,7 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
3434 @ Override
3535 public OAuth2User loadUser (OAuth2UserRequest userRequest ) throws OAuth2AuthenticationException {
3636 OAuth2User oAuth2User = super .loadUser (userRequest );
37+ // registrationId = 소셜 로그인 타입
3738 String registrationId = userRequest .getClientRegistration ().getRegistrationId ();
3839
3940 // 정보 가공
Original file line number Diff line number Diff line change 11package com .example .log4u .domain .user .controller ;
22
3-
43import org .springframework .security .core .annotation .AuthenticationPrincipal ;
54import org .springframework .web .bind .annotation .GetMapping ;
65import org .springframework .web .bind .annotation .RequestMapping ;
@@ -18,8 +17,8 @@ public class UserController {
1817 @ GetMapping ("" )
1918 public String modifyUserProfile (
2019 @ AuthenticationPrincipal CustomOAuth2User customOAuth2User
21- ){
22- log .info ("테스트 GET DATA user = " + customOAuth2User .getUserId () );
20+ ) {
21+ log .info ("테스트 GET DATA user = " + customOAuth2User .getUserId ());
2322 return "test" ;
2423 }
2524}
Original file line number Diff line number Diff line change 1313public class UserService {
1414 private final UserRepository userRepository ;
1515
16- public User getUserById (Long userId ){
16+ public User getUserById (Long userId ) {
1717 return userRepository .findById (userId ).orElseThrow (
1818 UserNotFoundException ::new
1919 );
Original file line number Diff line number Diff line change @@ -118,7 +118,7 @@ spring:
118118 scope :
119119 - profile
120120 - email
121- -
121+
122122 kakao :
123123 client-name : kakao
124124 client-id : ${kakao.client-id}
@@ -130,6 +130,7 @@ spring:
130130 - profile_nickname
131131 - profile_image
132132 - account_email
133+ -
133134 provider :
134135 naver :
135136 authorization-uri : https://nid.naver.com/oauth2.0/authorize
You can’t perform that action at this time.
0 commit comments