ensure delegated clients can be reloaded on change

zzg · Jul 18, 2019 · 1d5ff12 · 1d5ff12
1 parent d315604
commit 1d5ff12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/...nts/src/main/java/org/apereo/cas/support/events/config/CasConfigurationModifiedEvent.java b/...nts/src/main/java/org/apereo/cas/support/events/config/CasConfigurationModifiedEvent.java
@@ -4,6 +4,7 @@
 
 import lombok.Getter;
 import lombok.ToString;
+import lombok.val;
 
 import java.nio.file.Path;
 import java.util.regex.Pattern;
@@ -68,6 +69,7 @@ public boolean isEligibleForContextRefresh() {
         if (this.override) {
             return true;
         }
-        return getFile() != null && CONFIG_FILE_PATTERN.matcher(getFile().toFile().getName()).find();
+        val fileName = getFile().toFile().getName();
+        return getFile() != null && CONFIG_FILE_PATTERN.matcher(fileName).find();
     }
 }
diff --git a/...ava/org/apereo/cas/configuration/config/CasCoreBootstrapStandaloneWatchConfiguration.java b/...ava/org/apereo/cas/configuration/config/CasCoreBootstrapStandaloneWatchConfiguration.java
@@ -10,7 +10,6 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -37,7 +36,6 @@ public class CasCoreBootstrapStandaloneWatchConfiguration {
     private ObjectProvider<CasConfigurationPropertiesEnvironmentManager> configurationPropertiesEnvironmentManager;
 
     @ConditionalOnProperty(value = "cas.events.trackConfigurationModifications", havingValue = "true")
-    @RefreshScope
     @Bean
     public CasConfigurationWatchService casConfigurationWatchService() {
         return new CasConfigurationWatchService(configurationPropertiesEnvironmentManager.getIfAvailable(), eventPublisher);

diff --git a/gradle.properties b/gradle.properties
@@ -197,7 +197,7 @@ reflectionsVersion=0.9.11
 guavaVersion=28.0-jre
 
 pac4jSpringWebmvcVersion=3.3.0-SNAPSHOT
-pac4jVersion=4.0.0-SNAPSHOT
+pac4jVersion=4.0.0-RC1
 
 statsdVersion=3.1.0
 amazonSdkVersion=1.11.589

diff --git a/...t-pac4j-webflow/src/main/java/org/apereo/cas/web/DelegatedClientNavigationController.java b/...t-pac4j-webflow/src/main/java/org/apereo/cas/web/DelegatedClientNavigationController.java
@@ -83,6 +83,7 @@ public View redirectToProvider(final HttpServletRequest request, final HttpServl
                 throw new UnauthorizedServiceException("Unable to locate client " + clientName);
             }
             val client = IndirectClient.class.cast(clientResult.get());
+            client.init();
             val webContext = new JEEContext(request, response, this.sessionStore);
             val ticket = delegatedClientWebflowManager.store(webContext, client);
 
@@ -108,7 +109,8 @@ public View redirectToProvider(final HttpServletRequest request, final HttpServl
      */
     @RequestMapping(value = ENDPOINT_RESPONSE, method = {RequestMethod.GET, RequestMethod.POST})
     public View redirectResponseToFlow(@PathVariable("clientName") final String clientName,
-                                       final HttpServletRequest request, final HttpServletResponse response) {
+                                       final HttpServletRequest request,
+                                       final HttpServletResponse response) {
         return buildRedirectViewBackToFlow(clientName, request);
     }
 
@@ -146,6 +148,7 @@ protected View buildRedirectViewBackToFlow(final String clientName, final HttpSe
      */
     @SneakyThrows
     protected View getResultingView(final IndirectClient<Credentials> client, final JEEContext webContext, final Ticket ticket) {
+        client.init();
         val actionResult = client.getRedirectionActionBuilder().redirect(webContext);
         if (actionResult.isPresent()) {
             val action = actionResult.get();