From bbc6909457d843f55a4e232d63c38c7ea0695a94 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 20 Jan 2015 10:42:50 +0000 Subject: [PATCH] Finish adding prefix to oauth2 --- src/main/asciidoc/intro.adoc | 2 +- src/main/asciidoc/spring-cloud-cloudfoundry.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/asciidoc/intro.adoc b/src/main/asciidoc/intro.adoc index d853abd..913ef7b 100644 --- a/src/main/asciidoc/intro.adoc +++ b/src/main/asciidoc/intro.adoc @@ -9,7 +9,7 @@ username to use for the service). Add this project as a dependency to any Spring Cloud UI app or REST service and deploy to Cloudfoundry. If you use Spring Cloud Security OAuth2 features this will make them bindable to Cloud Foundry services -instead of enironment properties in `oauth2.*`. For a UI app you can +instead of enironment properties in `spring.oauth2.*`. For a UI app you can declare `@EnableOAuth2Sso` and bind to a service called "sso", and for a service you can add `@EnableOAuth2Resource` and bind to a service called "resource" (see below for how to change the names). diff --git a/src/main/asciidoc/spring-cloud-cloudfoundry.adoc b/src/main/asciidoc/spring-cloud-cloudfoundry.adoc index 77d675c..8faa3b5 100644 --- a/src/main/asciidoc/spring-cloud-cloudfoundry.adoc +++ b/src/main/asciidoc/spring-cloud-cloudfoundry.adoc @@ -16,7 +16,7 @@ for Cloud Foundry just sets up default environment properties so that it all just works if you bind to a Cloud Foundry service instance called "sso". The service credentials are mapped to the SSO properties, i.e. (from `spring.oauth2.client.*`) `clientId`, `clientSecret`, -`tokenUri`, `authorizationUri`, (and from `oauth2.resource.*`) +`tokenUri`, `authorizationUri`, (and from `spring.oauth2.resource.*`) `userInfoUri`, `tokenInfoUri`, `keyValue`, `keyUri`. Refer to the Spring Cloud Security documentation for details of which combinations will work together. The main thing is that in Cloud Foundry you only