Create UserInfoTokenServices with an explicit RestTemplate

It's actually optional for most providers, but it doesn't hurt to make it explicit incase it is needed. Fixes spring-guidesgh-44

Author: Dave Syer

auth-server/README.adoc

@@ -36,8 +36,10 @@ private Filter ssoFilter(ClientResources client, String path) {
  OAuth2ClientAuthenticationProcessingFilter filter = new OAuth2ClientAuthenticationProcessingFilter(path);
  OAuth2RestTemplate template = new OAuth2RestTemplate(client.getClient(), oauth2ClientContext);
  filter.setRestTemplate(template);
- filter.setTokenServices(new UserInfoTokenServices(
- client.getResource().getUserInfoUri(), client.getClient().getClientId()));
+ UserInfoTokenServices tokenServices = new UserInfoTokenServices(
+ client.getResource().getUserInfoUri(), client.getClient().getClientId());
+ tokenServices.setRestTemplate(template);
+ filter.setTokenServices(tokenServices);
  return filter;
 }
 ----

auth-server/src/main/java/com/example/SocialApplication.java

@@ -40,7 +40,6 @@
 import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientAuthenticationProcessingFilter;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientContextFilter;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
@@ -131,8 +130,10 @@ private Filter ssoFilter(ClientResources client, String path) {
 path);
 OAuth2RestTemplate template = new OAuth2RestTemplate(client.getClient(), oauth2ClientContext);
 filter.setRestTemplate(template);
-filter.setTokenServices(new UserInfoTokenServices(
-client.getResource().getUserInfoUri(), client.getClient().getClientId()));
+UserInfoTokenServices tokenServices = new UserInfoTokenServices(
+client.getResource().getUserInfoUri(), client.getClient().getClientId());
+tokenServices.setRestTemplate(template);
+filter.setTokenServices(tokenServices);
 return filter;
 }
 

github/README.adoc

@@ -45,13 +45,17 @@ private Filter ssoFilter() {
  OAuth2ClientAuthenticationProcessingFilter facebookFilter = new OAuth2ClientAuthenticationProcessingFilter("/login/facebook");
  OAuth2RestTemplate facebookTemplate = new OAuth2RestTemplate(facebook(), oauth2ClientContext);
  facebookFilter.setRestTemplate(facebookTemplate);
- facebookFilter.setTokenServices(new UserInfoTokenServices(facebookResource().getUserInfoUri(), facebook().getClientId()));
+ UserInfoTokenServices tokenServices = new UserInfoTokenServices(facebook.getUserInfoUri(), facebook().getClientId());
+ tokenServices.setRestTemplate(oAuth2RestTemplate);
+ facebookFilter.setTokenServices(tokenServices);
  filters.add(facebookFilter);
 
  OAuth2ClientAuthenticationProcessingFilter githubFilter = new OAuth2ClientAuthenticationProcessingFilter("/login/github");
  OAuth2RestTemplate githubTemplate = new OAuth2RestTemplate(github(), oauth2ClientContext);
  githubFilter.setRestTemplate(githubTemplate);
- githubFilter.setTokenServices(new UserInfoTokenServices(githubResource().getUserInfoUri(), github().getClientId()));
+ tokenServices = new UserInfoTokenServices(github().getUserInfoUri(), github().getClientId());
+ tokenServices.setRestTemplate(oAuth2RestTemplate);
+ githubFilter.setTokenServices(tokenServices);
  filters.add(githubFilter);
 
  filter.setFilters(filters);

github/src/main/java/com/example/SocialApplication.java

@@ -40,7 +40,6 @@
 import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientAuthenticationProcessingFilter;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientContextFilter;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
@@ -127,8 +126,7 @@ private Filter ssoFilter() {
 }
 
 private Filter ssoFilter(ClientResources client, String path) {
-OAuth2ClientAuthenticationProcessingFilter oAuth2ClientAuthenticationFilter = new OAuth2ClientAuthenticationProcessingFilter(
-path);
+OAuth2ClientAuthenticationProcessingFilter oAuth2ClientAuthenticationFilter = new OAuth2ClientAuthenticationProcessingFilter(path);
 OAuth2RestTemplate oAuth2RestTemplate = new OAuth2RestTemplate(client.getClient(), oauth2ClientContext);
 oAuth2ClientAuthenticationFilter.setRestTemplate(oAuth2RestTemplate);
 UserInfoTokenServices tokenServices = new UserInfoTokenServices(client.getResource().getUserInfoUri(),

manual/README.adoc

@@ -70,7 +70,9 @@ private Filter ssoFilter() {
  OAuth2ClientAuthenticationProcessingFilter facebookFilter = new OAuth2ClientAuthenticationProcessingFilter("/login/facebook");
  OAuth2RestTemplate facebookTemplate = new OAuth2RestTemplate(facebook(), oauth2ClientContext);
  facebookFilter.setRestTemplate(facebookTemplate);
- facebookFilter.setTokenServices(new UserInfoTokenServices(facebookResource().getUserInfoUri(), facebook().getClientId()));
+ UserInfoTokenServices tokenServices = new UserInfoTokenServices(facebookResource().getUserInfoUri(), facebook().getClientId());
+ tokenServices.setRestTemplate(facebookTemplate);
+ facebookFilter.setTokenServices(tokenServices);
  return facebookFilter;
 }
 ----

manual/src/main/java/com/example/SocialApplication.java

@@ -33,7 +33,6 @@
 import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientAuthenticationProcessingFilter;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientContextFilter;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
@@ -84,6 +83,9 @@ private Filter ssoFilter() {
 "/login/facebook");
 OAuth2RestTemplate facebookTemplate = new OAuth2RestTemplate(facebook(), oauth2ClientContext);
 facebookFilter.setRestTemplate(facebookTemplate);
+UserInfoTokenServices tokenServices = new UserInfoTokenServices(facebookResource().getUserInfoUri(),
+facebook().getClientId());
+tokenServices.setRestTemplate(facebookTemplate);
 facebookFilter.setTokenServices(
 new UserInfoTokenServices(facebookResource().getUserInfoUri(), facebook().getClientId()));
 return facebookFilter;