Fixes for regression introduced by KEYCLOAK-923
This commit is contained in:
parent
37d6a79205
commit
b7dae5c88f
1 changed files with 4 additions and 2 deletions
|
@ -51,7 +51,7 @@
|
||||||
var configPromise = loadConfig(config);
|
var configPromise = loadConfig(config);
|
||||||
|
|
||||||
function processInit() {
|
function processInit() {
|
||||||
var callback = parseCallback(window.location.search);
|
var callback = parseCallback(window.location.href);
|
||||||
|
|
||||||
if (callback) {
|
if (callback) {
|
||||||
window.history.replaceState({}, null, callback.newUrl);
|
window.history.replaceState({}, null, callback.newUrl);
|
||||||
|
@ -534,6 +534,7 @@
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
oauth.newUrl += (oauth.newUrl.indexOf('?') == -1 ? '?' : '&') + p[0] + '=' + p[1];
|
oauth.newUrl += (oauth.newUrl.indexOf('?') == -1 ? '?' : '&') + p[0] + '=' + p[1];
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -688,8 +689,9 @@
|
||||||
} else if (kc.redirectUri) {
|
} else if (kc.redirectUri) {
|
||||||
return kc.redirectUri;
|
return kc.redirectUri;
|
||||||
} else {
|
} else {
|
||||||
var redirectUri = location.href.substring(0, location.href.indexOf('#'));
|
var redirectUri = location.href;
|
||||||
if (location.hash) {
|
if (location.hash) {
|
||||||
|
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));
|
||||||
}
|
}
|
||||||
return redirectUri;
|
return redirectUri;
|
||||||
|
|
Loading…
Reference in a new issue