mindol1004/spring-cloud-oauth2-sso-mk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auth params setting resolve

Browse Source
This commit is contained in:
liquidjoo
2019-05-27 17:13:12 +09:00
parent 7eee47237e
commit e6d04205e6
2 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
authorization-server/src/main/java/io/bluemoon/authorizationserver/config/handler/CustomAuthEndpointsApprovalHandler.java Normal file
View File

@@ -0,0 +1,4 @@
package io.bluemoon.authorizationserver.config.handler;
public class CustomAuthEndpointsApprovalHandler {
}

52
authorization-server/src/main/java/io/bluemoon/authorizationserver/domain/social/UserArgumentResolver.java
View File

@@ -62,7 +62,9 @@ public class UserArgumentResolver implements HandlerMethodArgumentResolver {
// User convertUser = convertUser(String.valueOf(authentication.getAuthorities().toArray()[0]), map); // User convertUser = convertUser(String.valueOf(authentication.getAuthorities().toArray()[0]), map);
OAuth2AuthenticationToken authentication = (OAuth2AuthenticationToken) SecurityContextHolder.getContext().getAuthentication(); OAuth2AuthenticationToken authentication = (OAuth2AuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
Map<String, Object> map = authentication.getPrincipal().getAttributes(); Map<String, Object> map = authentication.getPrincipal().getAttributes();
System.out.println(map.toString());
User convertUser = convertUser(authentication.getAuthorizedClientRegistrationId(), map); User convertUser = convertUser(authentication.getAuthorizedClientRegistrationId(), map);
System.out.println(convertUser.toString());
user = userRepository.findByEmail(convertUser.getEmail()); user = userRepository.findByEmail(convertUser.getEmail());
if (user == null) { if (user == null) {
@@ -98,14 +100,35 @@ public class UserArgumentResolver implements HandlerMethodArgumentResolver {
* @return * @return
*/ */
private User getModernUser(SocialType socialType, Map<String, Object> map) { private User getModernUser(SocialType socialType, Map<String, Object> map) {
return User.builder()
.name(String.valueOf(map.get("name"))) if (socialType.getVaule().equals("facebook")) {
.email(String.valueOf(map.get("email"))) return User.builder()
.principal(String.valueOf(map.get("id"))) .name(String.valueOf(map.get("name")))
.socialType(socialType) .email(String.valueOf(map.get("email")))
.createdAt(LocalDateTime.now()) .principal(String.valueOf(map.get("id")))
.updatedAt(LocalDateTime.now()) .socialType(socialType)
.build(); .createdAt(LocalDateTime.now())
.updatedAt(LocalDateTime.now())
.build();
} else if (socialType.getVaule().equals("google")) {
return User.builder()
.name(String.valueOf(map.get("name")))
.email(String.valueOf(map.get("email")))
.principal(String.valueOf(map.get("sub")))
.socialType(socialType)
.createdAt(LocalDateTime.now())
.updatedAt(LocalDateTime.now())
.build();
} else {
return User.builder()
.name(String.valueOf(map.get("name")))
.email(String.valueOf(map.get("email")))
.principal(String.valueOf(map.get("id")))
.socialType(socialType)
.createdAt(LocalDateTime.now())
.updatedAt(LocalDateTime.now())
.build();
}
} }
/** /**
@@ -116,10 +139,21 @@ public class UserArgumentResolver implements HandlerMethodArgumentResolver {
* @param map * @param map
*/ */
private void setRoleIfNotSame(User user, OAuth2AuthenticationToken authentication, Map<String, Object> map) { private void setRoleIfNotSame(User user, OAuth2AuthenticationToken authentication, Map<String, Object> map) {
Map<String, Object> principalMap = new HashMap<>();
if (user.getSocialType().getVaule().equals("google")) {
principalMap.put("id", map.get("sub"));
principalMap.put("name", map.get("name"));
principalMap.put("email", map.get("email"));
} else {
principalMap = map;
}
// spring security authentiaction params setting
// 후.. 찾기 힘들었다..
if (!authentication.getAuthorities().contains( if (!authentication.getAuthorities().contains(
new SimpleGrantedAuthority(user.getSocialType().getRoleType()))) { new SimpleGrantedAuthority(user.getSocialType().getRoleType()))) {
SecurityContextHolder.getContext().setAuthentication( SecurityContextHolder.getContext().setAuthentication(
new UsernamePasswordAuthenticationToken(map, "N/A", AuthorityUtils.createAuthorityList(user.getSocialType().getRoleType())) new UsernamePasswordAuthenticationToken(principalMap, "N/A", AuthorityUtils.createAuthorityList(user.getSocialType().getRoleType()))
); );
} }
} }