diff --git a/www/aselect/handler.php b/www/aselect/handler.php
index c843fbac14c416ee185fd1b02ab0ae9a9940f02d..1e333023487cf69da7004e3bc314eb2ca47d5e9b 100644
--- a/www/aselect/handler.php
+++ b/www/aselect/handler.php
@@ -416,7 +416,7 @@ function as_request_bridge_return() {
$parms = as_call($url);
$session = SimpleSAML_Session::getInstance(true);
- $session->setAuthenticated(true, 'aselect');
+ $session->doLogin('aselect');
if (array_key_exists('attributes', $parms)) {
$decoded = base64_decode($parms['attributes']);
diff --git a/www/auth/login-admin.php b/www/auth/login-admin.php
index b62bf1d59c233c8f99e63888446d02ab62ff8afd..cab57e6d3241ba8bb54d3ff1616fad57db1b3d1e 100644
--- a/www/auth/login-admin.php
+++ b/www/auth/login-admin.php
@@ -55,7 +55,7 @@ if (isset($_POST['password'])) {
$attributes = array('user' => array('admin'));
- $session->setAuthenticated(true, 'login-admin');
+ $session->doLogin('login-admin');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/auth/login-auto.php b/www/auth/login-auto.php
index 85b36bd53852ae5f65de420df02fb5c628b331e0..037ca237b2f8c4a81fbae7377834df46f35a5230 100644
--- a/www/auth/login-auto.php
+++ b/www/auth/login-auto.php
@@ -74,7 +74,7 @@ if($session == NULL) {
/* Set the user as authenticated and add the attributes from the
* configuration.
*/
-$session->setAuthenticated(true, 'login-auto');
+$session->doLogin('login-auto');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/auth/login-cas-ldap.php b/www/auth/login-cas-ldap.php
index 8e5f9a361239077b621b4818936b4ed9d8fece67..28362d40fc0b11d3deec08ffa53ea244e26b32e1 100755
--- a/www/auth/login-cas-ldap.php
+++ b/www/auth/login-cas-ldap.php
@@ -130,7 +130,7 @@ try {
$ldapattributes = $ldap->validate($ldapconfig, $username);
}
$attributes = array_merge_recursive($casattributes, $ldapattributes);
- $session->setAuthenticated(true, 'login-cas-ldap');
+ $session->doLogin('login-cas-ldap');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index aefd1514884ace2a8d4b2e0db99909d51ebae210..7c488582fd8325c6b4ed8e5eb1fee92de6c17f9c 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -205,7 +205,7 @@ if (isset($_REQUEST['username'])) {
//SimpleSAML_Logger::debug('AUTH - ldap-feide: '. $orgattributes . ' successfully authenticated');
SimpleSAML_Logger::info('AUTH - ldap-feide: '. $requestedUser . ' successfully authenticated');
- $session->setAuthenticated(true, 'login-feide');
+ $session->doLogin('login-feide');
$session->setAttributes($attributes);
diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index e7ad280eace1194267cbfe966db07af7949d5ab0..a0765d42b89707dcc11653d901da3a77e67c833d 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -90,7 +90,7 @@ if (isset($_POST['username'])) {
SimpleSAML_Logger::info('AUTH - ldap-multi: '. $_POST['username'] . ' successfully authenticated');
- $session->setAuthenticated(true, 'login-ldapmulti');
+ $session->doLogin('login-ldapmulti');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index c207fde056674a7d91179088f8bea17ba319c891..82cf7ea0f68690a0aa8599cad30a53a97ef034df 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -91,7 +91,7 @@ if (isset($_POST['username'])) {
SimpleSAML_Logger::info('AUTH - radius: '. $_POST['username'] . ' successfully authenticated');
- $session->setAuthenticated(true, 'login-radius');
+ $session->doLogin('login-radius');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/auth/login-tlsclient.php b/www/auth/login-tlsclient.php
index cd5a5da8982c9c7947a8477c9e6950fb7c201bf4..a1b6e4c640a16c814018ce7d33e983a2c0c0704c 100644
--- a/www/auth/login-tlsclient.php
+++ b/www/auth/login-tlsclient.php
@@ -54,7 +54,7 @@ try {
$attributes['CertificateDN'] = array($userid);
$attributes['CertificateDNCN'] = array($_SERVER['SSL_CLIENT_S_DN_CN']);
- $session->setAuthenticated(true, 'tlsclient');
+ $session->doLogin('tlsclient');
$session->setAttributes($attributes);
#echo '<pre>';
diff --git a/www/auth/login-wayf-ldap.php b/www/auth/login-wayf-ldap.php
index b631aee6a91924d778de4b2c9686b668d59bf859..ac29fa66515232e01167939436ab8b680db6a161 100755
--- a/www/auth/login-wayf-ldap.php
+++ b/www/auth/login-wayf-ldap.php
@@ -58,7 +58,7 @@ if ($username = $_POST['username']) {
if ($attributes === FALSE) {
$error = "LDAP_INVALID_CREDENTIALS";
} else {
- $session->setAuthenticated(true, 'login-wayf-ldap');
+ $session->doLogin('login-wayf-ldap');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/auth/login.php b/www/auth/login.php
index 604c91f65bd05e0c3c9e6dd04a030f5d72ba7062..57cea79e39c5221b39f4f442693815ad73ba32d4 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -89,7 +89,7 @@ if (isset($_POST['username'])) {
SimpleSAML_Logger::info('AUTH - ldap: '. $ldapusername . ' successfully authenticated');
- $session->setAuthenticated(true, 'login');
+ $session->doLogin('login');
$session->setAttributes($attributes);
$session->setNameID(array(
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index 59f30f6020c78cc78bdc1df2fa12794c8e78f04e..18f27a91791fd1aa24323097cccee1a279ee9892 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -148,7 +148,7 @@ if (isset($_GET['SAMLRequest'])) {
}
- $session->setAuthenticated(false, $session->getAuthority() );
+ $session->doLogout();
/* Fill in the $logoutInfo associative array with information about this logout request. */
diff --git a/www/saml2/idp/initSLO.php b/www/saml2/idp/initSLO.php
index 95dbdc4d8137c6b4071bdf394b2a356a51f63165..36869e9b33549ebff86c0a4a9787e791ef676072 100644
--- a/www/saml2/idp/initSLO.php
+++ b/www/saml2/idp/initSLO.php
@@ -49,7 +49,7 @@ if (isset($_GET['RelayState'])) {
}
// Set local IdP session to invalid.
- $session->setAuthenticated(false, $session->getAuthority() );
+ $session->doLogout(false);
/*
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index dc4ff722572564228e86c8d371154cf1b9ec6a57..b42dfb21c1fcdc8c21753e9c2d16abffa7784ae6 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -29,7 +29,7 @@ if (!$config->getValue('enable.saml20-sp', false))
// Destroy local session if exists.
if (isset($session) ) {
- $session->setAuthenticated(false);
+ $session->doLogout();
$session->clean();
}