logout works

Author: Regzox

cas/cas-server/src/main/java/fr/gouv/vitamui/cas/config/WebflowConfig.java

@@ -303,7 +303,8 @@ public Action terminateSessionAction(
         final CasApi casApi,
         final ServicesManager servicesManager,
         final TicketRegistry ticketRegistry,
-        @Qualifier(CasWebflowConstants.ACTION_ID_FRONT_CHANNEL_LOGOUT) final Action frontChannelLogoutAction
+        @Qualifier(CasWebflowConstants.ACTION_ID_FRONT_CHANNEL_LOGOUT) final Action frontChannelLogoutAction,
+        @Qualifier(SingleLogoutRequestExecutor.BEAN_NAME) final SingleLogoutRequestExecutor defaultSingleLogoutRequestExecutor
     ) {
         return WebflowActionBeanSupplier.builder()
             .withApplicationContext(applicationContext)
@@ -321,7 +322,8 @@ public Action terminateSessionAction(
                     servicesManager,
                     casProperties,
                     frontChannelLogoutAction,
-                    ticketRegistry
+                    ticketRegistry,
+                    defaultSingleLogoutRequestExecutor
                 )
             )
             .withId(CasWebflowConstants.ACTION_ID_TERMINATE_SESSION)

cas/cas-server/src/main/java/fr/gouv/vitamui/cas/logout/TerminateApiSessionAction.java

@@ -49,6 +49,7 @@
 import org.apereo.cas.logout.LogoutManager;
 import org.apereo.cas.logout.slo.SingleLogoutExecutionRequest;
 import org.apereo.cas.logout.slo.SingleLogoutRequestContext;
+import org.apereo.cas.logout.slo.SingleLogoutRequestExecutor;
 import org.apereo.cas.services.BaseRegisteredService;
 import org.apereo.cas.services.RegisteredService;
 import org.apereo.cas.services.ServicesManager;
@@ -67,6 +68,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static fr.gouv.vitamui.commons.api.CommonConstants.AUTHTOKEN_ATTRIBUTE;
 import static fr.gouv.vitamui.commons.api.CommonConstants.SUPER_USER_ATTRIBUTE;
@@ -95,10 +97,11 @@ public TerminateApiSessionAction(
         final ServicesManager servicesManager,
         final CasConfigurationProperties casProperties,
         final Action frontChannelLogoutAction,
-        final TicketRegistry ticketRegistry
+        final TicketRegistry ticketRegistry,
+        final SingleLogoutRequestExecutor singleLogoutRequestExecutor
     ) {
         super(centralAuthenticationService, ticketGrantingTicketCookieGenerator, warnCookieGenerator, logoutProperties,
-            logoutManager, applicationContext, null);
+            logoutManager, applicationContext, singleLogoutRequestExecutor);
         this.utils = utils;
         this.casApi = casApi;
         this.servicesManager = servicesManager;
@@ -126,8 +129,8 @@ public Event terminate(final RequestContext context) {
                     final Principal principal = ticket.getAuthentication().getPrincipal();
                     final Map<String, List<Object>> attributes = principal.getAttributes();
                     final String authToken = (String) utils.getAttributeValue(attributes, AUTHTOKEN_ATTRIBUTE);
-                    final String superUserEmail = (String) utils.getAttributeValue(attributes, SUPER_USER_ATTRIBUTE);
-                    final String superUserCustomerId = (String) utils.getAttributeValue(attributes, SUPER_USER_CUSTOMER_ID_ATTRIBUTE);
+                    final String superUserEmail = Optional.ofNullable((String) utils.getAttributeValue(attributes, SUPER_USER_ATTRIBUTE)).orElse("");
+                    final String superUserCustomerId = Optional.ofNullable((String) utils.getAttributeValue(attributes, SUPER_USER_CUSTOMER_ID_ATTRIBUTE)).orElse("");
 
                     LOGGER.debug("Calling logout for authToken={} and superUser={}, superUserCustomerId={}",
                         authToken, superUserEmail, superUserCustomerId);

cas/cas-server/src/test/java/fr/gouv/vitamui/cas/webflow/actions/TerminateApiSessionActionTest.java

@@ -116,7 +116,7 @@ public TestableTerminateApiSessionAction(
         ) {
             super(cas, ticketCookie, warnCookie, logoutProps, logoutManager,
                 ctx, utils, casApi, servicesManager, casProperties,
-                frontChannelLogoutAction, ticketRegistry);
+                frontChannelLogoutAction, ticketRegistry, null);
         }
 
         // Expose protected method as public for testing