Skip to content

Commit 4825507

Browse files
committed
Add NameId Format support
1 parent 0ba6f67 commit 4825507

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

onelogin-saml-sso/php/functions.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,20 @@ function saml_slo() {
8686
} else {
8787
$nameId = null;
8888
$sessionIndex = null;
89+
$nameIdFormat = null;
90+
8991
if (isset($_COOKIE['saml_nameid'])) {
9092
$nameId = $_COOKIE['saml_nameid'];
9193
}
9294
if (isset($_COOKIE['saml_sessionindex'])) {
9395
$sessionIndex = $_COOKIE['saml_sessionindex'];
9496
}
95-
97+
if (isset($_COOKIE['saml_nameid_format'])) {
98+
$nameIdFormat = $_COOKIE['saml_nameid_format'];
99+
}
100+
96101
$auth = initialize_saml();
97-
$auth->logout(home_url(), array(), $nameId, $sessionIndex);
102+
$auth->logout(home_url(), array(), $nameId, $sessionIndex, false, $nameIdFormat);
98103
return false;
99104
}
100105
}
@@ -146,6 +151,7 @@ function saml_acs() {
146151

147152
setcookie('saml_nameid', $auth->getNameId(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
148153
setcookie('saml_sessionindex', $auth->getSessionIndex(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
154+
setcookie('saml_nameid_format', $auth->getNameIdFormat(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
149155

150156
$attrs = $auth->getAttributes();
151157

@@ -315,6 +321,7 @@ function saml_sls() {
315321
setcookie('saml_login', 0, time() - 3600, SITECOOKIEPATH );
316322
setcookie('saml_nameid', null, time() - 3600, SITECOOKIEPATH );
317323
setcookie('saml_sessionindex', null, time() - 3600, SITECOOKIEPATH );
324+
setcookie('saml_nameid_format', null, time() - 3600, SITECOOKIEPATH );
318325

319326
if (get_option('onelogin_saml_forcelogin') && get_option('onelogin_saml_customize_stay_in_wordpress_after_slo')) {
320327
wp_redirect(home_url().'/wp-login.php?loggedout=true');

0 commit comments

Comments
 (0)