libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #2188 from ahus1/logout_should_keep_fragement_KEYCLOAK-2323

Browse source 
Don't encode URL fragment for logout URL / KEYCLOAK-2323
This commit is contained in:
Stian Thorgersen 2016-02-10 13:16:51 +01:00
commit 8ed1677249
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adapters/oidc/js/src/main/resources/keycloak.js
View file

@ -236,7 +236,7 @@
kc.createLogoutUrl = function(options) { kc.createLogoutUrl = function(options) {
var url = getRealmUrl() var url = getRealmUrl()
+ '/protocol/openid-connect/logout' + '/protocol/openid-connect/logout'
+ '?redirect_uri=' + encodeURIComponent(adapter.redirectUri(options)); + '?redirect_uri=' + encodeURIComponent(adapter.redirectUri(options, false));
return url; return url;
} }
@ -842,14 +842,18 @@
return createPromise().promise; return createPromise().promise;
}, },
redirectUri: function(options) { redirectUri: function(options, encodeHash) {
if (arguments.length == 1) {
encodeHash = true;
}
if (options && options.redirectUri) { if (options && options.redirectUri) {
return options.redirectUri; return options.redirectUri;
} else if (kc.redirectUri) { } else if (kc.redirectUri) {
return kc.redirectUri; return kc.redirectUri;
} else { } else {
var redirectUri = location.href; var redirectUri = location.href;
if (location.hash) { if (location.hash && encodeHash) {
redirectUri = redirectUri.substring(0, location.href.indexOf('#')); redirectUri = redirectUri.substring(0, location.href.indexOf('#'));
redirectUri += (redirectUri.indexOf('?') == -1 ? '?' : '&') + 'redirect_fragment=' + encodeURIComponent(location.hash.substring(1)); redirectUri += (redirectUri.indexOf('?') == -1 ? '?' : '&') + 'redirect_fragment=' + encodeURIComponent(location.hash.substring(1));
} }