From a7a9271313f50205c89dd8a91f815ab9c15a1308 Mon Sep 17 00:00:00 2001 From: Stephen Doxsee Date: Fri, 8 Feb 2019 08:41:03 -0500 Subject: [PATCH] Client OAuth2 properties to use scope not scopes 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 --- .../docs/asciidoc/_includes/reactive/oauth2/access-token.adoc | 2 +- samples/boot/oauth2webclient-webflux/README.adoc | 2 +- .../oauth2webclient-webflux/src/main/resources/application.yml | 2 +- samples/boot/oauth2webclient/README.adoc | 2 +- samples/boot/oauth2webclient/src/main/resources/application.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 index 79456b9284..a58f08c282 100644 --- 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 index a9778ca442..ea984aa684 100644 --- 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 index 7144c09a0f..8528a06d0d 100644 --- 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 index db032bde94..b234f34f7e 100644 --- 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 index 7144c09a0f..8528a06d0d 100644 --- 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