From 37e838a0f516f2194b10ae712f9fd9e1e72654f6 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 18 Mar 2009 07:43:52 +0000
Subject: [PATCH] SAML2:SSOService: Simplify authentication processing.

Now that consent only exists in a module, we can simplify the
authentication processing chain operations.


git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1418 44740490-163a-0410-bde0-09ae8108e29a
---
 www/saml2/idp/SSOService.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index f2f4c0911..14100ef32 100644
--- a/www/saml2/idp/SSOService.php
+++ b/www/saml2/idp/SSOService.php
@@ -280,15 +280,7 @@ if($needAuth && !$isPassive) {
 		$attributes = $session->getAttributes();
 		
 		/* Authentication processing operations. */
-		if (array_key_exists('AuthProcState', $requestcache)) {
-			/* Processed earlier, saved in requestcache. */
-			$authProcState = $requestcache['AuthProcState'];
-
-		} elseif (isset($authProcState)) {
-			/* Returned from redirect during processing. */
-			$requestcache['AuthProcState'] = $authProcState;
-
-		} else {
+		if (!isset($authProcState)) {
 			/* Not processed. */
 			$pc = new SimpleSAML_Auth_ProcessingChain($idpmetadata, $spmetadata, 'idp');
 
-- 
GitLab