From d002ed6ee0548a94966e348ad1d5152a77149cad Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 16 Nov 2010 14:31:59 +0000
Subject: [PATCH] consentSimpleAdmin: Retrieve IdP and attributes from current
authsource.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2646 44740490-163a-0410-bde0-09ae8108e29a
---
modules/consentSimpleAdmin/www/consentAdmin.php | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/modules/consentSimpleAdmin/www/consentAdmin.php b/modules/consentSimpleAdmin/www/consentAdmin.php
index 67226db71..0d748998a 100644
--- a/modules/consentSimpleAdmin/www/consentAdmin.php
+++ b/modules/consentSimpleAdmin/www/consentAdmin.php
@@ -16,15 +16,12 @@
$config = SimpleSAML_Configuration::getInstance();
$consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
-// Get session object
-$session = SimpleSAML_Session::getInstance();
-
$as = $consentconfig->getValue('auth');
$as = new SimpleSAML_Auth_Simple($as);
$as->requireAuth();
// Get all attributes
-$attributes = $session->getAttributes();
+$attributes = $as->getAttributes();
@@ -43,9 +40,9 @@ $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
/*
* Get IdP id and metadata
*/
-if($session->getIdP() != null) {
+if($as->getAuthData('saml:sp:IdP') != null) {
// From a remote idp (as bridge)
- $idp_entityid = $session->getIdP();
+ $idp_entityid = $as->getAuthData('saml:sp:IdP');
$idp_metadata = $metadata->getMetaData($idp_entityid, 'saml20-idp-remote');
} else {
// from the local idp
--
GitLab