1217 - Update tutorial to mention a single property to disable Spring Security

Mario · Mario · commit 080ef4398df3 · 2017-01-18T22:43:54.000-03:00
diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst
@@ -239,10 +239,14 @@ disable it. That's where the ``application.properties`` files comes in:
 .. code-block:: java
     :linenos:
 
-    stormpath.spring.security.enabled = false
     security.basic.enabled = false
 
-The first line disables Stormpath's hooks into Spring Security and the second line disables Spring Security itself.
+That property disables Spring Security and avoids our Spring Security integration to be loaded.
+
+.. note::
+   Alternatively you can disable the Stormpath Spring Security integration while keeping Spring Security enabled. Such setup will allow you
+   to take full control of Spring Security's configuration without having Stormath's integration in the mix. This can be
+   achieved by having `stormpath.spring.security.enabled = false` in your configuration file.
 
 Pretty simple setup, right? In the next section, we'll layer in some flow logic based on logged-in state. And then we
 will refine that to make use of all the Spring Security has to offer in making our lives easier.
diff --git a/tutorials/spring-boot/00-the-basics/src/main/resources/application.properties b/tutorials/spring-boot/00-the-basics/src/main/resources/application.properties
@@ -19,5 +19,4 @@
 #
 #stormpath.application.href = https://api.stormpath.com/v1/applications/YOUR_APPLICATION_ID_HERE
 
-stormpath.spring.security.enabled = false
 security.basic.enabled = false
diff --git a/tutorials/spring-boot/01-some-access-controls/src/main/resources/application.properties b/tutorials/spring-boot/01-some-access-controls/src/main/resources/application.properties
@@ -19,5 +19,4 @@
 #
 #stormpath.application.href = https://api.stormpath.com/v1/applications/YOUR_APPLICATION_ID_HERE
 
-stormpath.spring.security.enabled = false
 security.basic.enabled = false
diff --git a/tutorials/spring/00-the-basics/src/main/resources/application.properties b/tutorials/spring/00-the-basics/src/main/resources/application.properties
@@ -19,5 +19,4 @@
 #
 #stormpath.application.href = https://api.stormpath.com/v1/applications/YOUR_APPLICATION_ID_HERE
 
-stormpath.spring.security.enabled = false
 security.basic.enabled = false
diff --git a/tutorials/spring/01-some-access-controls/src/main/resources/application.properties b/tutorials/spring/01-some-access-controls/src/main/resources/application.properties
@@ -20,4 +20,3 @@
 #stormpath.application.href = https://api.stormpath.com/v1/applications/YOUR_APPLICATION_ID_HERE
 
 stormpath.spring.security.enabled = false
-security.basic.enabled = false

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,4 @@`
`19`	`19`	`#`
`20`	`20`	`#stormpath.application.href = https://api.stormpath.com/v1/applications/YOUR_APPLICATION_ID_HERE`
`21`	`21`
`22`		`-stormpath.spring.security.enabled = false`
`23`	`22`	`security.basic.enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,3 @@`
`20`	`20`	`#stormpath.application.href = https://api.stormpath.com/v1/applications/YOUR_APPLICATION_ID_HERE`
`21`	`21`
`22`	`22`	`stormpath.spring.security.enabled = false`
`23`		`-security.basic.enabled = false`