Improve logout

okfn · Jul 23, 2024 · e738d36 · e738d36
1 parent 6d14a80
commit e738d36
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/ckanext/saml2auth/plugin.py b/ckanext/saml2auth/plugin.py
@@ -97,11 +97,7 @@ def update_config(self, config_):
 
     def logout(self):
 
-        config = sp_config()
-        if config.get('logout_expected_binding') == 'skip-external-logout':
-            response = None
-        else:
-            response = _perform_slo()
+        response = _perform_slo()
 
         if response:
             domain = h.get_site_domain_for_cookie()
@@ -124,9 +120,12 @@ def _perform_slo():
 
     response = None
 
-    client = h.saml_client(
-        sp_config()
-    )
+    config = sp_config()
+    if config.get('logout_expected_binding') == 'skip-external-logout':
+        log.debug('Skipping external logout')
+        return
+
+    client = h.saml_client(config)
     saml_session_info = get_saml_session_info(session)
     subject_id = get_subject_id(session)