From 2d9fdf714955e3b4fca7da392638c7dbebd9bf05 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Sun, 30 Aug 2015 21:31:03 +0200
Subject: [PATCH] Move SimpleSAML_Auth_Default::logoutCompleted() to
SimpleSAML_Auth_Source and deprecate the former.
---
lib/SimpleSAML/Auth/Default.php | 14 ++------------
lib/SimpleSAML/Auth/Source.php | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/lib/SimpleSAML/Auth/Default.php b/lib/SimpleSAML/Auth/Default.php
index 2d7a3d33b..8298c4ddc 100644
--- a/lib/SimpleSAML/Auth/Default.php
+++ b/lib/SimpleSAML/Auth/Default.php
@@ -105,20 +105,10 @@ class SimpleSAML_Auth_Default {
/**
- * Called when logout operation completes.
- *
- * This function never returns.
- *
- * @param array $state The state after the logout.
+ * @deprecated This method will be removed in SSP 2.0. Please use SimpleSAML_Auth_Source::logoutCompleted() instead.
*/
public static function logoutCompleted($state) {
- assert('is_array($state)');
- assert('array_key_exists("SimpleSAML_Auth_Default.ReturnURL", $state)');
-
- $returnURL = $state['SimpleSAML_Auth_Default.ReturnURL'];
-
- /* Redirect... */
- \SimpleSAML\Utils\HTTP::redirectTrustedURL($returnURL);
+ SimpleSAML_Auth_Source::logoutCompleted($state);
}
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 9009fb100..2ad82a725 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -247,6 +247,22 @@ abstract class SimpleSAML_Auth_Source
}
+ /**
+ * Called when logout operation completes.
+ *
+ * This function never returns.
+ *
+ * @param array $state The state after the logout.
+ */
+ public static function logoutCompleted($state)
+ {
+ assert('is_array($state)');
+ assert('array_key_exists("SimpleSAML_Auth_Default.ReturnURL", $state)');
+
+ \SimpleSAML\Utils\HTTP::redirectTrustedURL($state['SimpleSAML_Auth_Default.ReturnURL']);
+ }
+
+
/**
* Complete logout.
*
--
GitLab