use GrailsUserDetailsService get authorities. (#25)

* use GrailsUserDetailsService get authorities.

* Update SpringSecurityOauth2BaseService.groovy

Remove commented code

---------

Co-authored-by: chenmin25 <chenmin25@gt.cn>
Co-authored-by: Puneet Behl <behlp@unityfoundation.io>

Author: 3 people

grails-app/services/grails/plugin/springsecurity/oauth2/SpringSecurityOauth2BaseService.groovy

@@ -25,26 +25,29 @@ import grails.plugin.springsecurity.oauth2.token.OAuth2SpringToken
 import grails.plugin.springsecurity.oauth2.util.OAuth2ProviderConfiguration
 import grails.plugin.springsecurity.userdetails.GormUserDetailsService
 import grails.plugin.springsecurity.userdetails.GrailsUser
+import grails.plugin.springsecurity.userdetails.GrailsUserDetailsService
 import groovy.util.logging.Slf4j
 import org.apache.commons.lang.exception.ExceptionUtils
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.AuthenticationException
-import org.springframework.security.core.authority.SimpleGrantedAuthority
+import org.springframework.security.core.userdetails.UserDetails
 
 @Transactional
 @Slf4j
 class SpringSecurityOauth2BaseService {
 
-/**
- * Map for storing the different OAuth2Provider
- */
+    /**
+     * Map for storing the different OAuth2Provider
+     */
     Map<String, OAuth2AbstractProviderService> providerServiceMap = new HashMap<>()
     private Map<String, OAuth2ProviderConfiguration> _providerConfigurationMap = new HashMap<>()
 
     GrailsApplication grailsApplication
     AuthenticationManager authenticationManager
 
+    GrailsUserDetailsService userDetailsService
+
     OAuth2SpringToken createAuthToken(String providerName, OAuth2AccessToken scribeToken) {
         def providerService = getProviderService(providerName)
         OAuth2SpringToken oAuthToken = providerService.createSpringAuthToken(scribeToken)
@@ -108,11 +111,8 @@ class SpringSecurityOauth2BaseService {
         boolean passwordExpired = passwordExpiredPropertyName ? user."${passwordExpiredPropertyName}" : false
 
         // authorities
-
-        String authoritiesPropertyName = conf.userLookup.authoritiesPropertyName
-        String authorityPropertyName = conf.authority.nameField
-        Collection<?> userAuthorities = user."${authoritiesPropertyName}"
-        def authorities = userAuthorities.collect { new SimpleGrantedAuthority(it."${authorityPropertyName}") }
+        UserDetails userDetails = userDetailsService.loadUserByUsername(username,true)
+        def authorities= userDetails.authorities
 
         oAuthToken.principal = new GrailsUser(username, password, enabled, !accountExpired, !passwordExpired,
                 !accountLocked, authorities ?: [GormUserDetailsService.NO_ROLE], user.id)