Now using Auth and Resource servers from Baeldung/spring-security-oauth (eugenp#6128)

rozagerardo · maibin · commit b395dc1d418f · 2019-01-12T12:57:19.000-08:00
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java
@@ -6,9 +6,9 @@
 
 /**
  * 
- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth
+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo
  * 
- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (bael-user/bael-password) and client configurations (bael-client-id/bael-secret) handled by the auth server
+ * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (john/123) and client configurations handled by the auth server
  * 
  * @author rozagerardo
  *
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java
@@ -15,7 +15,7 @@
 @RestController
 public class ClientRestController {
 
-    private static final String RESOURCE_URI = "http://localhost:8084/retrieve-resource";
+    private static final String RESOURCE_URI = "http://localhost:8082/spring-security-oauth-resource/foos/1";
 
     @Autowired
     WebClient webClient;
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java
@@ -6,19 +6,19 @@
 
 /**
  * 
- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth
+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo
  * 
- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (bael-user/bael-password) and client configurations (bael-client-id/bael-secret) handled by the auth server
+ * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (john/123) and client configurations handled by the auth server
  * 
  * @author rozagerardo
  *
  */
 @PropertySource("classpath:webclient-auth-code-login-application.properties")
 @SpringBootApplication
-public class OauthClientApplication {
+public class OauthClientLoginApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(OauthClientApplication.class, args);
+        SpringApplication.run(OauthClientLoginApplication.class, args);
     }
 
 }
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java
@@ -16,7 +16,7 @@
 @RestController
 public class ClientRestController {
 
-    private static final String RESOURCE_URI = "http://localhost:8084/retrieve-resource";
+    private static final String RESOURCE_URI = "http://localhost:8082/spring-security-oauth-resource/foos/1";
 
     @Autowired
     WebClient webClient;
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java
@@ -7,9 +7,7 @@
 
 /**
  * 
- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth
- * 
- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using credentials handled by the auth server (bael-user/bael-password)
+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo
  * 
  * @author rozagerardo
  *
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java
@@ -4,8 +4,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
-import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 
@@ -14,12 +12,12 @@ public class WebClientChonJob {
 
     Logger logger = LoggerFactory.getLogger(WebClientChonJob.class);
 
-    private static final String RESOURCE_URI = "http://localhost:8084/retrieve-resource";
+    private static final String RESOURCE_URI = "localhost:8082/spring-security-oauth-resource/foos/1";
 
     @Autowired
     private WebClient webClient;
 
-    @Scheduled(fixedRate = 1000)
+    @Scheduled(fixedRate = 5000)
     public void logResourceServiceResponse() {
 
         webClient.get()
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java
@@ -6,13 +6,12 @@
 
 /**
  * 
- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth
- * 
- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (bael-user/bael-password) and client configurations (bael-client-id/bael-secret) handled by the auth server
+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo
  * 
  * @author rozagerardo
  *
  */
+@PropertySource("classpath:webclient-manual-request-oauth-application.properties")
 @SpringBootApplication
 public class ManualRequestApplication {
 
diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java b/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
@@ -3,8 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,10 +22,16 @@ public class ManualOauthRequestController {
 
     private static Logger logger = LoggerFactory.getLogger(ManualOauthRequestController.class);
 
-    private static final String TOKEN_ENDPOINT = "localhost:8085/oauth/token";
-    private static final String RESOURCE_ENDPOINT = "localhost:8084/retrieve-resource";
-    private static final String CLIENT_ID = "bael-client-id";
-    private static final String CLIENT_SECRET = "bael-secret";
+    private static final String RESOURCE_ENDPOINT = "localhost:8082/spring-security-oauth-resource/foos/1";
+    
+    @Value("${the.authorization.client-id}")
+    private String clientId;
+    
+    @Value("${the.authorization.client-secret}")
+    private String clientSecret;
+    
+    @Value("${the.authorization.token-uri}")
+    private String tokenUri;
     
     @Autowired
     WebClient client;
@@ -34,8 +40,8 @@ public class ManualOauthRequestController {
     public Mono<String> obtainSecuredResource() {
         logger.info("Creating web client...");
         Mono<String> resource = client.post()
-            .uri(TOKEN_ENDPOINT)
-            .header(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString((CLIENT_ID + ":" + CLIENT_SECRET).getBytes()))
+            .uri(tokenUri)
+            .header(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString((clientId + ":" + clientSecret).getBytes()))
             .body(BodyInserters.fromFormData(OAuth2ParameterNames.GRANT_TYPE, GrantType.CLIENT_CREDENTIALS.getValue()))
             .retrieve()
             .bodyToMono(JsonNode.class)
diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties b/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties
@@ -1,10 +1,10 @@
 spring.security.oauth2.client.registration.bael.client-name=bael
-spring.security.oauth2.client.registration.bael.client-id=bael-client-id
-spring.security.oauth2.client.registration.bael.client-secret=bael-secret
+spring.security.oauth2.client.registration.bael.client-id=fooClientIdPassword
+spring.security.oauth2.client.registration.bael.client-secret=secret
 spring.security.oauth2.client.registration.bael.authorization-grant-type=authorization_code
 spring.security.oauth2.client.registration.bael.redirect-uri=http://localhost:8080/authorize/oauth2/code/bael
 
-spring.security.oauth2.client.provider.bael.token-uri=http://localhost:8085/oauth/token
-spring.security.oauth2.client.provider.bael.authorization-uri=http://localhost:8085/oauth/authorize
+spring.security.oauth2.client.provider.bael.token-uri=http://localhost:8081/spring-security-oauth-server/oauth/token
+spring.security.oauth2.client.provider.bael.authorization-uri=http://localhost:8081/spring-security-oauth-server/oauth/authorize
 
 spring.security.user.password=pass
diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties b/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties
@@ -1,10 +1,10 @@
 spring.security.oauth2.client.registration.bael.client-name=bael
-spring.security.oauth2.client.registration.bael.client-id=bael-client-id
-spring.security.oauth2.client.registration.bael.client-secret=bael-secret
+spring.security.oauth2.client.registration.bael.client-id=fooClientIdPassword
+spring.security.oauth2.client.registration.bael.client-secret=secret
 spring.security.oauth2.client.registration.bael.authorization-grant-type=authorization_code
 spring.security.oauth2.client.registration.bael.redirect-uri=http://localhost:8080/login/oauth2/code/bael
 
-spring.security.oauth2.client.provider.bael.token-uri=http://localhost:8085/oauth/token
-spring.security.oauth2.client.provider.bael.authorization-uri=http://localhost:8085/oauth/authorize
-spring.security.oauth2.client.provider.bael.user-info-uri=http://localhost:8084/user
-spring.security.oauth2.client.provider.bael.user-name-attribute=name
+spring.security.oauth2.client.provider.bael.token-uri=http://localhost:8081/spring-security-oauth-server/oauth/token
+spring.security.oauth2.client.provider.bael.authorization-uri=http://localhost:8081/spring-security-oauth-server/oauth/authorize
+spring.security.oauth2.client.provider.bael.user-info-uri=http://localhost:8082/spring-security-oauth-resource/users/extra
+spring.security.oauth2.client.provider.bael.user-name-attribute=user_name
diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties b/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties
@@ -1,4 +1,4 @@
 spring.security.oauth2.client.registration.bael.authorization-grant-type=client_credentials
-spring.security.oauth2.client.registration.bael.client-id=bael-client-id
-spring.security.oauth2.client.registration.bael.client-secret=bael-secret
-spring.security.oauth2.client.provider.bael.token-uri=http://localhost:8085/oauth/token
+spring.security.oauth2.client.registration.bael.client-id=fooClientIdPassword
+spring.security.oauth2.client.registration.bael.client-secret=secret
+spring.security.oauth2.client.provider.bael.token-uri=http://localhost:8081/spring-security-oauth-server/oauth/token
diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties b/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties
@@ -0,0 +1,3 @@
+the.authorization.client-id=fooClientIdPassword
+the.authorization.client-secret=secret
+the.authorization.token-uri=http://localhost:8081/spring-security-oauth-server/oauth/token
diff --git a/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java b/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java
@@ -19,9 +19,9 @@
 
 /**
  * 
- * Note: this Live test requires the Authorization Service and the Resource service located in the spring-5-security-oauth module 
+ * Note: this Live test requires the Authorization Service and the Resource service located in the Baeldung/spring-security-oauth repo 
  * 
- * @author ger
+ * @author rozagerardo
  *
  */
 @RunWith(SpringRunner.class)
@@ -46,7 +46,7 @@ public void givenFooWithNullId_whenProcessFoo_thenLogsWithDebugTrace() throws Ex
             .stream()
             .map(ILoggingEvent::getFormattedMessage)
             .collect(Collectors.toList());
-        assertThat(allLoggedEntries).anyMatch(entry -> entry.contains("We retrieved the following resource using Client Credentials Grant Type: This is the resource!"));
+        assertThat(allLoggedEntries).anyMatch(entry -> entry.contains("We retrieved the following resource using Client Credentials Grant Type: {\"id\""));
     }
 
 }
diff --git a/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java b/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.webclient.manualrequest;
 
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -8,7 +9,7 @@
 /**
  * 
  * Note: this Live test requires not only the corresponding application running,
- * but also the Authorization Service and the Resource service located in the spring-5-security-oauth module.
+ * but also the Authorization Service and the Resource service located in the Baeldung/spring-security-oauth repo
  * 
  * 
  * @author ger
@@ -37,7 +38,7 @@ public void whenRequestingDebugHookOn_thenObtainExpectedMessage() {
         response.expectStatus()
             .isOk()
             .expectBody(String.class)
-            .isEqualTo("Retrieved the resource using a manual approach: This is the resource!");
+            .value(Matchers.containsString("Retrieved the resource using a manual approach: {\"id\""));
     }
 
 }
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/webclient/authorizationserver/AuthorizationServerApplication.java b/spring-5-security-oauth/src/main/java/com/baeldung/webclient/authorizationserver/AuthorizationServerApplication.java
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/webclient/authorizationserver/configuration/WebSecurityConfig.java b/spring-5-security-oauth/src/main/java/com/baeldung/webclient/authorizationserver/configuration/WebSecurityConfig.java
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/webclient/resourceserver/ResourceServerApplication.java b/spring-5-security-oauth/src/main/java/com/baeldung/webclient/resourceserver/ResourceServerApplication.java
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/webclient/resourceserver/configuration/AuthorizationConfigs.java b/spring-5-security-oauth/src/main/java/com/baeldung/webclient/resourceserver/configuration/AuthorizationConfigs.java
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/webclient/resourceserver/web/ResourceRestController.java b/spring-5-security-oauth/src/main/java/com/baeldung/webclient/resourceserver/web/ResourceRestController.java
diff --git a/spring-5-security-oauth/src/main/resources/webclient-authorization-application.properties b/spring-5-security-oauth/src/main/resources/webclient-authorization-application.properties
diff --git a/spring-5-security-oauth/src/main/resources/webclient-resources-application.properties b/spring-5-security-oauth/src/main/resources/webclient-resources-application.properties

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`*`
`9`		`- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth`
	`9`	`+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo`
`10`	`10`	`*`
`11`		`- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (bael-user/bael-password) and client configurations (bael-client-id/bael-secret) handled by the auth server`
	`11`	`+ * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (john/123) and client configurations handled by the auth server`
`12`	`12`	`*`
`13`	`13`	`* @author rozagerardo`
`14`	`14`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,19 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`*`
`9`		`- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth`
	`9`	`+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo`
`10`	`10`	`*`
`11`		`- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (bael-user/bael-password) and client configurations (bael-client-id/bael-secret) handled by the auth server`
	`11`	`+ * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (john/123) and client configurations handled by the auth server`
`12`	`12`	`*`
`13`	`13`	`* @author rozagerardo`
`14`	`14`	`*`
`15`	`15`	`*/`
`16`	`16`	`@PropertySource("classpath:webclient-auth-code-login-application.properties")`
`17`	`17`	`@SpringBootApplication`
`18`		`-public class OauthClientApplication {`
	`18`	`+public class OauthClientLoginApplication {`
`19`	`19`
`20`	`20`	`public static void main(String[] args) {`
`21`		`- SpringApplication.run(OauthClientApplication.class, args);`
	`21`	`+ SpringApplication.run(OauthClientLoginApplication.class, args);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,7 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`*`
`10`		`- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth`
`11`		`- *`
`12`		`- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using credentials handled by the auth server (bael-user/bael-password)`
	`10`	`+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo`
`13`	`11`	`*`
`14`	`12`	`* @author rozagerardo`
`15`	`13`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,12 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`*`
`9`		`- * Note: This app is configured to use the authorization service and the resource service located in module spring-5-security-oauth`
`10`		`- *`
`11`		`- * As we usually do with other well-known auth providers (github/facebook/...) we have to log-in using user credentials (bael-user/bael-password) and client configurations (bael-client-id/bael-secret) handled by the auth server`
	`9`	`+ * Note: This app is configured to use the authorization service and the resource service located in Baeldung/spring-security-oauth repo`
`12`	`10`	`*`
`13`	`11`	`* @author rozagerardo`
`14`	`12`	`*`
`15`	`13`	`*/`
	`14`	`+@PropertySource("classpath:webclient-manual-request-oauth-application.properties")`
`16`	`15`	`@SpringBootApplication`
`17`	`16`	`public class ManualRequestApplication {`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+the.authorization.client-id=fooClientIdPassword`
	`2`	`+the.authorization.client-secret=secret`
	`3`	`+the.authorization.token-uri=http://localhost:8081/spring-security-oauth-server/oauth/token`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`*`
`22`		`- * Note: this Live test requires the Authorization Service and the Resource service located in the spring-5-security-oauth module`
	`22`	`+ * Note: this Live test requires the Authorization Service and the Resource service located in the Baeldung/spring-security-oauth repo`
`23`	`23`	`*`
`24`		`- * @author ger`
	`24`	`+ * @author rozagerardo`
`25`	`25`	`*`
`26`	`26`	`*/`
`27`	`27`	`@RunWith(SpringRunner.class)`
`@@ -46,7 +46,7 @@ public void givenFooWithNullId_whenProcessFoo_thenLogsWithDebugTrace() throws Ex`
`46`	`46`	`.stream()`
`47`	`47`	`.map(ILoggingEvent::getFormattedMessage)`
`48`	`48`	`.collect(Collectors.toList());`
`49`		`- assertThat(allLoggedEntries).anyMatch(entry -> entry.contains("We retrieved the following resource using Client Credentials Grant Type: This is the resource!"));`
	`49`	`+ assertThat(allLoggedEntries).anyMatch(entry -> entry.contains("We retrieved the following resource using Client Credentials Grant Type: {\"id\""));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.baeldung.webclient.manualrequest;`
`2`	`2`
	`3`	`+import org.hamcrest.Matchers;`
`3`	`4`	`import org.junit.Before;`
`4`	`5`	`import org.junit.Test;`
`5`	`6`	`import org.springframework.test.web.reactive.server.WebTestClient;`
`@@ -8,7 +9,7 @@`
`8`	`9`	`/**`
`9`	`10`	`*`
`10`	`11`	`* Note: this Live test requires not only the corresponding application running,`
`11`		`- * but also the Authorization Service and the Resource service located in the spring-5-security-oauth module.`
	`12`	`+ * but also the Authorization Service and the Resource service located in the Baeldung/spring-security-oauth repo`
`12`	`13`	`*`
`13`	`14`	`*`
`14`	`15`	`* @author ger`
`@@ -37,7 +38,7 @@ public void whenRequestingDebugHookOn_thenObtainExpectedMessage() {`
`37`	`38`	`response.expectStatus()`
`38`	`39`	`.isOk()`
`39`	`40`	`.expectBody(String.class)`
`40`		`- .isEqualTo("Retrieved the resource using a manual approach: This is the resource!");`
	`41`	`+ .value(Matchers.containsString("Retrieved the resource using a manual approach: {\"id\""));`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`}`