Skip to content
Snippets Groups Projects
Commit e24639d9 authored by Olav Morken's avatar Olav Morken
Browse files

Session: Remove uses of SimpleSAML_Session::init(...).

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@566 44740490-163a-0410-bde0-09ae8108e29a
parent d02053c7
No related branches found
No related tags found
No related merge requests found
...@@ -509,8 +509,8 @@ class SimpleSAML_XML_SAML20_AuthnResponse extends SimpleSAML_XML_AuthnResponse { ...@@ -509,8 +509,8 @@ class SimpleSAML_XML_SAML20_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
} }
/* Update the session information */ /* Update the session information */
SimpleSAML_Session::init(true, 'saml2');
$session = SimpleSAML_Session::getInstance(); $session = SimpleSAML_Session::getInstance();
$session->doLogin('saml2');
$session->setAttributes($this->attributes); $session->setAttributes($this->attributes);
$session->setNameID($this->nameid); $session->setNameID($this->nameid);
...@@ -519,8 +519,8 @@ class SimpleSAML_XML_SAML20_AuthnResponse extends SimpleSAML_XML_AuthnResponse { ...@@ -519,8 +519,8 @@ class SimpleSAML_XML_SAML20_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
} elseif ($status == 'urn:oasis:names:tc:SAML:2.0:status:NoPassive') { } elseif ($status == 'urn:oasis:names:tc:SAML:2.0:status:NoPassive') {
/* Do not process the authResponse when NoPassive is sent - we continue with an empty set of attributes. /* Do not process the authResponse when NoPassive is sent - we continue with an empty set of attributes.
Some day we will be able to tell the application what happened */ Some day we will be able to tell the application what happened */
SimpleSAML_Session::init(true, 'saml2');
$session = SimpleSAML_Session::getInstance(); $session = SimpleSAML_Session::getInstance();
$session->doLogin('saml2');
$session->setAttributes(array()); $session->setAttributes(array());
} else { } else {
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'RESPONSESTATUSNOSUCCESS', new Exception("Status = " . $status)); SimpleSAML_Utilities::fatalError($session->getTrackID(), 'RESPONSESTATUSNOSUCCESS', new Exception("Status = " . $status));
......
...@@ -115,8 +115,8 @@ class SimpleSAML_XML_Shib13_AuthnResponse extends SimpleSAML_XML_AuthnResponse { ...@@ -115,8 +115,8 @@ class SimpleSAML_XML_Shib13_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
public function createSession() { public function createSession() {
SimpleSAML_Session::init(true, 'shib13');
$session = SimpleSAML_Session::getInstance(); $session = SimpleSAML_Session::getInstance();
$session->doLogin('shib13');
$session->setAttributes($this->getAttributes()); $session->setAttributes($this->getAttributes());
$nameid = $this->getNameID(); $nameid = $this->getNameID();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment