Merge pull request #419 from alvarosanchez/feature/issue-389

Fix for #389
grails · Feb 13, 2020 · 0b28eb4 · 0b28eb4
2 parents f10a8ca + 8750f0a
commit 0b28eb4
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/...t/src/main/groovy/grails/plugin/springsecurity/rest/SpringSecurityRestGrailsPlugin.groovy b/...t/src/main/groovy/grails/plugin/springsecurity/rest/SpringSecurityRestGrailsPlugin.groovy
@@ -91,18 +91,14 @@ class SpringSecurityRestGrailsPlugin extends Plugin {
     GrailsApplication grailsApplication
 
     Closure doWithSpring() { {->
-        def conf = SpringSecurityUtils.securityConfig
-        if (!conf || !conf.active) {
+        if (!springSecurityPluginsAreActive()){
             return
         }
 
+        def conf = SpringSecurityUtils.securityConfig
         SpringSecurityUtils.loadSecondaryConfig 'DefaultRestSecurityConfig'
         conf = SpringSecurityUtils.securityConfig
 
-        if (!conf.rest.active) {
-            return
-        }
-
         boolean printStatusMessages = (conf.printStatusMessages instanceof Boolean) ? conf.printStatusMessages : true
 
         if (printStatusMessages) {
@@ -297,6 +293,9 @@ class SpringSecurityRestGrailsPlugin extends Plugin {
 
     @Override
     void doWithApplicationContext() {
+        if (!springSecurityPluginsAreActive()){
+            return
+        }
         def customClaimProvidersList = applicationContext.getBeanNamesForType(CustomClaimProvider).collect {
             applicationContext.getBean(it, CustomClaimProvider)
         }
@@ -358,5 +357,19 @@ class SpringSecurityRestGrailsPlugin extends Plugin {
          "sha256": new StandardPasswordEncoder()]
     }
 
+    private boolean springSecurityPluginsAreActive() {
+        def conf = SpringSecurityUtils.securityConfig
+        if (!conf || !conf.active) {
+            return false
+        }
+
+        SpringSecurityUtils.loadSecondaryConfig 'DefaultRestSecurityConfig'
+        conf = SpringSecurityUtils.securityConfig
+
+        if (!conf.rest.active) {
+            return false
+        }
+        return true
+    }
 
 }