From 30def2c140f1166df2eb5294e23cce1a270619d9 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Wed, 5 Mar 2014 18:29:02 +0100
Subject: [PATCH] Remove getAuthInstant() from SimpleSAML_Session.
---
lib/SimpleSAML/Session.php | 18 ------------------
modules/saml/lib/IdP/SAML2.php | 4 ----
2 files changed, 22 deletions(-)
diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index 307ebedf4..e4487eff2 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -554,24 +554,6 @@ class SimpleSAML_Session {
}
- /**
- * Retrieve the time the user was authenticated.
- *
- * @return int|NULL The timestamp for when the user was authenticated. NULL if the user hasn't authenticated.
- * @deprecated
- */
- public function getAuthnInstant() {
-
- if (!isset($this->authData[$this->authority])) {
- /* Not authenticated. */
- return NULL;
- }
-
- assert('isset($this->authData[$this->authority]["AuthnInstant"])');
- return $this->authData[$this->authority]['AuthnInstant'];
- }
-
-
/**
* Retrieve the attributes associated with this session.
*
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index e48b3eada..148d04c53 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -804,10 +804,6 @@ class sspmod_saml_IdP_SAML2 {
if (isset($state['AuthnInstant'])) {
$a->setAuthnInstant($state['AuthnInstant']);
- } else {
- /* For backwards compatibility. Remove in version 1.8. */
- $session = SimpleSAML_Session::getSessionFromRequest();
- $a->setAuthnInstant($session->getAuthnInstant());
}
$sessionLifetime = $config->getInteger('session.duration', 8*60*60);
--
GitLab