diff --git a/pom.xml b/pom.xml index 9b2c38f..024ab08 100755 --- a/pom.xml +++ b/pom.xml @@ -32,17 +32,19 @@ org.springframework.boot - spring-boot-starter-security + spring-boot-starter-web + org.springframework.boot - spring-boot-starter-web + spring-boot-starter-security org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure 2.1.4.RELEASE + com.h2database h2 diff --git a/src/main/java/com/example/template/config/OAuth2AuthorizationServerConfig.java b/src/main/java/com/example/template/config/OAuth2AuthorizationServerConfig.java index 2551041..55ee9c1 100755 --- a/src/main/java/com/example/template/config/OAuth2AuthorizationServerConfig.java +++ b/src/main/java/com/example/template/config/OAuth2AuthorizationServerConfig.java @@ -166,10 +166,12 @@ public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigur if(authentication.isAuthenticated()) { Map additionalInfo = new HashMap<>(); additionalInfo.put("company", "Uengine"); + if( !CLIENT_CREDENTIALS.equals(authentication.getOAuth2Request().getGrantType()) ){ + User user = (User)authentication.getPrincipal(); + additionalInfo.put("nickname", user.getNickName()); + additionalInfo.put("address", user.getAddress()); + } - User user = (User)authentication.getPrincipal(); - additionalInfo.put("nickname", user.getNickName()); - additionalInfo.put("address", user.getAddress()); // String clientId = authentication.getOAuth2Request().getClientId(); // logger.debug("client ID : " + clientId); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e9485d5..838a228 100755 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,6 +22,9 @@ spring: server: port: 8090 +#logging: +# level: +# org.springframework: debug --- spring: profiles: docker