Client OAuth2 properties to use scope not scopes

sdoxsee · jgrandja · commit a7a9271313f5 · 2019-02-08T11:54:18.000-05:00
OAuth2ClientProperties.Registration (which captures .properties and .yml for OAuth2 Client) has a member `scope` but not `scopes`. Samples and documentation were using `scopes` and have now been updated to use `scope`. Fixes gh-6510
diff --git a/docs/manual/src/docs/asciidoc/_includes/reactive/oauth2/access-token.adoc b/docs/manual/src/docs/asciidoc/_includes/reactive/oauth2/access-token.adoc
@@ -14,7 +14,7 @@ spring:
           github:
             client-id: replace-with-client-id
             client-secret: replace-with-client-secret
-            scopes: read:user,public_repo
+            scope: read:user,public_repo
 ----
 
 You will need to replace the `client-id` and `client-secret` with values registered with GitHub.
diff --git a/samples/boot/oauth2webclient-webflux/README.adoc b/samples/boot/oauth2webclient-webflux/README.adoc
@@ -40,7 +40,7 @@ spring:
             client-id: replace-with-client-id
             client-secret: replace-with-client-secret
             provider: github
-            scopes: read:user,public_repo
+            scope: read:user,public_repo
 ----
 +
 .OAuth Client properties
diff --git a/samples/boot/oauth2webclient-webflux/src/main/resources/application.yml b/samples/boot/oauth2webclient-webflux/src/main/resources/application.yml
@@ -16,6 +16,6 @@ spring:
             client-id: replace-with-client-id
             client-secret: replace-with-client-secret
             provider: github
-            scopes: read:user,public_repo
+            scope: read:user,public_repo
 
 resource-uri: https://api.github.com/user/repos
diff --git a/samples/boot/oauth2webclient/README.adoc b/samples/boot/oauth2webclient/README.adoc
@@ -40,7 +40,7 @@ spring:
             client-id: replace-with-client-id
             client-secret: replace-with-client-secret
             provider: github
-            scopes: read:user,public_repo
+            scope: read:user,public_repo
 ----
 +
 .OAuth Client properties
diff --git a/samples/boot/oauth2webclient/src/main/resources/application.yml b/samples/boot/oauth2webclient/src/main/resources/application.yml
@@ -16,6 +16,6 @@ spring:
             client-id: replace-with-client-id
             client-secret: replace-with-client-secret
             provider: github
-            scopes: read:user,public_repo
+            scope: read:user,public_repo
 
 resource-uri: https://api.github.com/user/repos

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ spring:`
`40`	`40`	`client-id: replace-with-client-id`
`41`	`41`	`client-secret: replace-with-client-secret`
`42`	`42`	`provider: github`
`43`		`- scopes: read:user,public_repo`
	`43`	`+ scope: read:user,public_repo`
`44`	`44`	`----`
`45`	`45`	`+`
`46`	`46`	`.OAuth Client properties`