From 413b30b9cbde1ed237850d98798fbc50f3d07847 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 26 Oct 2010 08:44:22 +0000
Subject: [PATCH] SimpleSAML_IdP: Use SimpleSAML_Auth_Simple.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2608 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/IdP.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index ca03d58e2..c2b0bd499 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -408,7 +408,9 @@ class SimpleSAML_IdP {
}
$state['IdPMetadata'] = $this->getConfig()->toArray();
- SimpleSAML_Auth_Default::initLogin($auth, array('SimpleSAML_IdP', 'postAuth'), NULL, $state);
+ $state['ReturnCallback'] = array('SimpleSAML_IdP', 'postAuth');
+ $as = new SimpleSAML_Auth_Simple($auth);
+ $as->login($state);
}
@@ -534,7 +536,8 @@ class SimpleSAML_IdP {
if ($authority === $this->config->getString('auth')) {
/* This is probably an authentication source. */
- SimpleSAML_Auth_Default::initLogoutReturn($returnTo);
+ $as = new SimpleSAML_Auth_Simple($authority);
+ $as->logout($returnTo);
} elseif ($authority === 'saml2') {
/* SAML 2 SP which isn't an authentication source. */
$config = SimpleSAML_Configuration::getInstance();
--
GitLab