keycloak-aplcache
Merge pull request #2188 from ahus1/logout_should_keep_fragement_KEYCLOAK-2323 Don't …
2/10/2016 10:16:51 AM
Changes
Details
diff --git a/adapters/oidc/js/src/main/resources/keycloak.js b/adapters/oidc/js/src/main/resources/keycloak.js
index dad522e..4bfec59 100755
--- a/adapters/oidc/js/src/main/resources/keycloak.js
+++ b/adapters/oidc/js/src/main/resources/keycloak.js
@@ -236,7 +236,7 @@
kc.createLogoutUrl = function(options) {
var url = getRealmUrl()
+ '/protocol/openid-connect/logout'
- + '?redirect_uri=' + encodeURIComponent(adapter.redirectUri(options));
+ + '?redirect_uri=' + encodeURIComponent(adapter.redirectUri(options, false));
return url;
}
@@ -842,14 +842,18 @@
return createPromise().promise;
},
- redirectUri: function(options) {
+ redirectUri: function(options, encodeHash) {
+ if (arguments.length == 1) {
+ encodeHash = true;
+ }
+
if (options && options.redirectUri) {
return options.redirectUri;
} else if (kc.redirectUri) {
return kc.redirectUri;
} else {
var redirectUri = location.href;
- if (location.hash) {
+ if (location.hash && encodeHash) {
redirectUri = redirectUri.substring(0, location.href.indexOf('#'));
redirectUri += (redirectUri.indexOf('?') == -1 ? '?' : '&') + 'redirect_fragment=' + encodeURIComponent(location.hash.substring(1));
}