Merge branch 'release/4.1.1'

AtlasOfLivingAustralia · Jul 27, 2022 · e94c614 · e94c614
2 parents 2988570 + 0be2938
commit e94c614
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-version "4.1.0"
+version "4.1.1"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

diff --git a/src/main/groovy/au/ala/org/ws/security/AlaWsSecurityGrailsPluginConfiguration.groovy b/src/main/groovy/au/ala/org/ws/security/AlaWsSecurityGrailsPluginConfiguration.groovy
@@ -116,7 +116,7 @@ class AlaWsSecurityGrailsPluginConfiguration {
         securityFilter.setSecurityLogic(new DefaultSecurityLogic().tap { loadProfilesFromSession = false })
         frb.filter = securityFilter
         frb.dispatcherTypes = EnumSet.of(DispatcherType.REQUEST)
-        frb.order = filterOrder() + 10
+        frb.order = filterOrder() + 1
         frb.urlPatterns = jwtProperties.urlPatterns
         frb.enabled = !frb.urlPatterns.empty
         frb.asyncSupported = true
@@ -128,7 +128,7 @@ class AlaWsSecurityGrailsPluginConfiguration {
     FilterRegistrationBean pac4jHttpRequestWrapper(Config config) {
         FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean()
         filterRegistrationBean.filter = new Pac4jProfileManagerHttpRequestWrapperFilter(config)
-        filterRegistrationBean.order = filterOrder() + 11
+        filterRegistrationBean.order = filterOrder() + 6 // This is to place this filter after the request wrapper filter in the ala-auth-plugin
         filterRegistrationBean.initParameters = [:]
         filterRegistrationBean.addUrlPatterns('/*')
         filterRegistrationBean