consentSimpleAdmin: Change to use SimpleSAML_Auth_Simple.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2603 44740490-163a-0410-bde0-09ae8108e29a

modules/consentSimpleAdmin/www/consentAdmin.php

@@ -20,28 +20,26 @@ $consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.
 $session = SimpleSAML_Session::getInstance();
 
 $as = $consentconfig->getValue('auth');
-if (!$session->isValid($as)) {
-	SimpleSAML_Auth_Default::initLogin($as, SimpleSAML_Utilities::selfURL());
-}
+$as = new SimpleSAML_Auth_Simple($as);
+$as->requireAuth();
+
+// Get all attributes
+$attributes = $session->getAttributes();
+
 
 
 // Get user ID
 $userid_attributename = $consentconfig->getValue('userid', 'eduPersonPrincipalName');
-$userids = ($session->getAttribute($userid_attributename));
-		
-if (empty($userids)) {
+if (empty($attributes[$userid_attributename])) {
 	throw new Exception('Could not generate useridentifier for storing consent. Attribute [' .
 		$userid_attributename . '] was not available.');
 }
 
-$userid = $userids[0];
+$userid = $attributes[$userid_attributename][0];
 
 // Get metadata storage handler
 $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
 
-// Get all attributes
-$attributes = $session->getAttributes();
-
 /*
  * Get IdP id and metadata
  */