diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index f71de72317..7445e37651 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -83,20 +83,23 @@ *** xref:servlet/appendix/faq.adoc[FAQ] * xref:reactive/index.adoc[Reactive Applications] ** xref:reactive/getting-started.adoc[Getting Started] -** xref:reactive/webflux.adoc[WebFlux Security] -** xref:reactive/exploits/index.adoc[Protection Against Exploits] -*** xref:reactive/exploits/csrf.adoc[CSRF] -*** xref:reactive/exploits/headers.adoc[Headers] -*** xref:reactive/exploits/http.adoc[HTTP Requests] +** Authentication +*** xref:reactive/authentication/x509.adoc[X.509 Authentication] +*** xref:reactive/authentication/logout.adoc[Logout] +** Authorization +*** xref:reactive/authorization/method.adoc[EnableReactiveMethodSecurity] ** xref:reactive/oauth2/index.adoc[OAuth2] *** xref:reactive/oauth2/login.adoc[OAuth 2.0 Login] *** xref:reactive/oauth2/access-token.adoc[OAuth2 Client] *** xref:reactive/oauth2/resource-server.adoc[OAuth 2.0 Resource Server] -** xref:reactive/registered-oauth2-authorized-client.adoc[@RegisteredOAuth2AuthorizedClient] -** xref:reactive/x509.adoc[X.509 Authentication] -** xref:reactive/logout.adoc[Logout] -** xref:reactive/webclient.adoc[WebClient] -** xref:reactive/method.adoc[EnableReactiveMethodSecurity] -** xref:reactive/cors.adoc[CORS] +*** xref:reactive/registered-oauth2-authorized-client.adoc[@RegisteredOAuth2AuthorizedClient] +** xref:reactive/exploits/index.adoc[Protection Against Exploits] +*** xref:reactive/exploits/csrf.adoc[CSRF] +*** xref:reactive/exploits/headers.adoc[Headers] +*** xref:reactive/exploits/http.adoc[HTTP Requests] +** Integrations +*** xref:reactive/integrations/cors.adoc[CORS] +*** xref:reactive/integrations/rsocket.adoc[RSocket] +*** xref:reactive/integrations/webclient.adoc[WebClient] ** xref:reactive/test.adoc[Testing] -** xref:reactive/rsocket.adoc[RSocket] +** xref:reactive/configuration/webflux.adoc[WebFlux Security] diff --git a/docs/modules/ROOT/pages/reactive/logout.adoc b/docs/modules/ROOT/pages/reactive/authentication/logout.adoc similarity index 100% rename from docs/modules/ROOT/pages/reactive/logout.adoc rename to docs/modules/ROOT/pages/reactive/authentication/logout.adoc diff --git a/docs/modules/ROOT/pages/reactive/x509.adoc b/docs/modules/ROOT/pages/reactive/authentication/x509.adoc similarity index 100% rename from docs/modules/ROOT/pages/reactive/x509.adoc rename to docs/modules/ROOT/pages/reactive/authentication/x509.adoc diff --git a/docs/modules/ROOT/pages/reactive/method.adoc b/docs/modules/ROOT/pages/reactive/authorization/method.adoc similarity index 96% rename from docs/modules/ROOT/pages/reactive/method.adoc rename to docs/modules/ROOT/pages/reactive/authorization/method.adoc index 46502fe1a3..dc04d46be6 100644 --- a/docs/modules/ROOT/pages/reactive/method.adoc +++ b/docs/modules/ROOT/pages/reactive/authorization/method.adoc @@ -162,7 +162,7 @@ It is important to note that any of the expressions in standard method security However, at this time we only support return type of `Boolean` or `boolean` of the expression. This means that the expression must not block. -When integrating with xref:reactive/webflux.adoc#jc-webflux[WebFlux Security], the Reactor Context is automatically established by Spring Security according to the authenticated user. +When integrating with xref:reactive/configuration/webflux.adoc#jc-webflux[WebFlux Security], the Reactor Context is automatically established by Spring Security according to the authenticated user. ==== .Java diff --git a/docs/modules/ROOT/pages/reactive/webflux.adoc b/docs/modules/ROOT/pages/reactive/configuration/webflux.adoc similarity index 100% rename from docs/modules/ROOT/pages/reactive/webflux.adoc rename to docs/modules/ROOT/pages/reactive/configuration/webflux.adoc diff --git a/docs/modules/ROOT/pages/reactive/cors.adoc b/docs/modules/ROOT/pages/reactive/integrations/cors.adoc similarity index 100% rename from docs/modules/ROOT/pages/reactive/cors.adoc rename to docs/modules/ROOT/pages/reactive/integrations/cors.adoc diff --git a/docs/modules/ROOT/pages/reactive/rsocket.adoc b/docs/modules/ROOT/pages/reactive/integrations/rsocket.adoc similarity index 100% rename from docs/modules/ROOT/pages/reactive/rsocket.adoc rename to docs/modules/ROOT/pages/reactive/integrations/rsocket.adoc diff --git a/docs/modules/ROOT/pages/reactive/webclient.adoc b/docs/modules/ROOT/pages/reactive/integrations/webclient.adoc similarity index 100% rename from docs/modules/ROOT/pages/reactive/webclient.adoc rename to docs/modules/ROOT/pages/reactive/integrations/webclient.adoc diff --git a/docs/modules/ROOT/pages/reactive/test.adoc b/docs/modules/ROOT/pages/reactive/test.adoc index 183558b136..53156d110a 100644 --- a/docs/modules/ROOT/pages/reactive/test.adoc +++ b/docs/modules/ROOT/pages/reactive/test.adoc @@ -4,7 +4,7 @@ [[test-erms]] == Testing Reactive Method Security -For example, we can test our example from xref:reactive/method.adoc#jc-erms[EnableReactiveMethodSecurity] using the same setup and annotations we did in xref:servlet/test/method.adoc#test-method[Testing Method Security]. +For example, we can test our example from xref:reactive/authorization/method.adoc#jc-erms[EnableReactiveMethodSecurity] using the same setup and annotations we did in xref:servlet/test/method.adoc#test-method[Testing Method Security]. Here is a minimal sample of what we can do: ====