Simplify oauth2login sample

Fixes gh-5384

samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle

@@ -6,11 +6,9 @@ dependencies {
 	compile project(':spring-security-config')
 	compile project(':spring-security-oauth2-client')
 	compile project(':spring-security-oauth2-jose')
-	compile 'org.springframework:spring-webflux'
 	compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	compile 'org.springframework.boot:spring-boot-starter-web'
 	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'
-	compile 'io.projectreactor.ipc:reactor-netty'
 
 	testCompile project(':spring-security-test')
 	testCompile 'net.sourceforge.htmlunit:htmlunit'

samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java

@@ -32,7 +32,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -58,7 +57,6 @@ import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
-import sample.WebClientConfig;
 
 import java.net.URI;
 import java.net.URL;
@@ -403,7 +401,6 @@ public class OAuth2LoginApplicationTests {
 	@SpringBootConfiguration
 	@EnableAutoConfiguration
 	@ComponentScan(basePackages = "sample.web")
-	@Import(WebClientConfig.class)
 	public static class SpringBootApplicationTestConfig {
 
 		@Autowired

samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class OAuth2LoginApplication {
 
-	public OAuth2LoginApplication() {
-	}
-
 	public static void main(String[] args) {
 		SpringApplication.run(OAuth2LoginApplication.class, args);
 	}
-
 }

samples/boot/oauth2login/src/main/java/sample/WebClientConfig.java

@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.oauth2.client.web.reactive.function.client.OAuth2AuthorizedClientExchangeFilterFunction;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author Rob Winch
- * @since 5.1
- */
-@Configuration
-public class WebClientConfig {
-
-	@Bean
-	WebClient webClient() {
-		return WebClient.builder()
-				.filter(new OAuth2AuthorizedClientExchangeFilterFunction())
-				.build();
-	}
-}

samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java

@@ -15,18 +15,13 @@
  */
 package sample.web;
 
-import static org.springframework.security.oauth2.client.web.reactive.function.client.OAuth2AuthorizedClientExchangeFilterFunction.oauth2AuthorizedClient;
-
-import java.util.Collections;
-import java.util.Map;
-
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
 import org.springframework.security.oauth2.client.annotation.OAuth2Client;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * @author Joe Grandja
@@ -34,34 +29,14 @@ import org.springframework.web.reactive.function.client.WebClient;
  */
 @Controller
 public class OAuth2LoginController {
-	private final WebClient webClient;
-
-	public OAuth2LoginController(WebClient webClient) {
-		this.webClient = webClient;
-	}
 
 	@GetMapping("/")
-	public String index(Model model, @OAuth2Client OAuth2AuthorizedClient authorizedClient) {
-		model.addAttribute("userName", authorizedClient.getPrincipalName());
+	public String index(Model model,
+						@OAuth2Client OAuth2AuthorizedClient authorizedClient,
+						@AuthenticationPrincipal OAuth2User oauth2User) {
+		model.addAttribute("userName", oauth2User.getName());
 		model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName());
+		model.addAttribute("userAttributes", oauth2User.getAttributes());
 		return "index";
 	}
-
-	@GetMapping("/userinfo")
-	public String userinfo(Model model, @OAuth2Client OAuth2AuthorizedClient authorizedClient) {
-		Map userAttributes = Collections.emptyMap();
-		String userInfoEndpointUri = authorizedClient.getClientRegistration()
-			.getProviderDetails().getUserInfoEndpoint().getUri();
-		if (!StringUtils.isEmpty(userInfoEndpointUri)) {	// userInfoEndpointUri is optional for OIDC Clients
-			userAttributes = this.webClient
-				.get()
-				.uri(userInfoEndpointUri)
-				.attributes(oauth2AuthorizedClient(authorizedClient))
-				.retrieve()
-				.bodyToMono(Map.class)
-				.block();
-		}
-		model.addAttribute("userAttributes", userAttributes);
-		return "userinfo";
-	}
 }

samples/boot/oauth2login/src/main/resources/templates/index.html

@@ -23,7 +23,12 @@
 </div>
 <div>&nbsp;</div>
 <div>
-	<a href="/userinfo" th:href="@{/userinfo}">Display User Info</a>
+	<span style="font-weight:bold">User Attributes:</span>
+	<ul>
+		<li th:each="userAttribute : ${userAttributes}">
+			<span style="font-weight:bold" th:text="${userAttribute.key}"></span>: <span th:text="${userAttribute.value}"></span>
+		</li>
+	</ul>
 </div>
 </body>
 </html>

samples/boot/oauth2login/src/main/resources/templates/userinfo.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">
-<head>
-	<title>Spring Security - OAuth 2.0 User Info</title>
-	<meta charset="utf-8" />
-</head>
-<body>
-<div th:substituteby="index::logout"></div>
-<h1>OAuth 2.0 User Info</h1>
-<div>
-	<span style="font-weight:bold">User Attributes:</span>
-	<ul>
-		<li th:each="userAttribute : ${userAttributes}">
-			<span style="font-weight:bold" th:text="${userAttribute.key}"></span>: <span th:text="${userAttribute.value}"></span>
-		</li>
-	</ul>
-</div>
-</body>
-</html>