diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php index e4487eff2e27ae89ff50e434a347f8fe30597914..d6455cb820bb21e1c6bd165fe7a03fa870519037 100644 --- a/lib/SimpleSAML/Session.php +++ b/lib/SimpleSAML/Session.php @@ -536,24 +536,6 @@ class SimpleSAML_Session { } - /** - * If the user is authenticated, how much time is left of the session. - * - * @return int The number of seconds until the session expires. - * @deprecated - */ - public function remainingTime() { - - if (!isset($this->authData[$this->authority])) { - /* Not authenticated. */ - return -1; - } - - assert('isset($this->authData[$this->authority]["Expire"])'); - return $this->authData[$this->authority]['Expire'] - time(); - } - - /** * Retrieve the attributes associated with this session. * diff --git a/modules/oauth/www/authorize.php b/modules/oauth/www/authorize.php index b8e5bf3b77df72c2cbf044383a5cfa3a2eaddb36..79eba5ded648716433bfa8f5e4817f9e639a5824 100644 --- a/modules/oauth/www/authorize.php +++ b/modules/oauth/www/authorize.php @@ -68,7 +68,7 @@ try { $t = new SimpleSAML_XHTML_Template($config, 'oauth:authorized.php'); $t->data['header'] = '{status:header_saml20_sp}'; - $t->data['remaining'] = $session->remainingTime(); + $t->data['remaining'] = $session->getAuthData($as, "Expire") - time(); $t->data['sessionsize'] = $session->getSize(); $t->data['attributes'] = $attributes; $t->data['logouturl'] = SimpleSAML_Utilities::selfURLNoQuery() . '?logout';