libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Fix redirect uri for Cordova adapter (#24708)

Browse source 
Closes #24732

Signed-off-by: Bogdan-Cosmin Chifor <bogdan.chifor@tii.ae>
This commit is contained in:
Bogdan-Cosmin Chifor 2023-11-14 16:11:49 +04:00 committed by GitHub
parent 73ea1ad966
commit 11bcec4906
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
js/libs/keycloak-js/src/keycloak.js
View file

@ -1391,7 +1391,9 @@ function Keycloak (config) {
return formatCordovaOptions(cordovaOptions);
};
var cordovaRedirectUri = kc.redirectUri || 'http://localhost';
var getCordovaRedirectUri = function() {
return kc.redirectUri || 'http://localhost';
}
return {
login: function(options) {
@ -1409,7 +1411,7 @@ function Keycloak (config) {
};
ref.addEventListener('loadstart', function(event) {
if (event.url.indexOf(cordovaRedirectUri) == 0) {
if (event.url.indexOf(getCordovaRedirectUri()) == 0) {
var callback = parseCallback(event.url);
processCallback(callback, promise);
closeBrowser();
@ -1419,7 +1421,7 @@ function Keycloak (config) {
ref.addEventListener('loaderror', function(event) {
if (!completed) {
if (event.url.indexOf(cordovaRedirectUri) == 0) {
if (event.url.indexOf(getCordovaRedirectUri()) == 0) {
var callback = parseCallback(event.url);
processCallback(callback, promise);
closeBrowser();
@ -1451,13 +1453,13 @@ function Keycloak (config) {
var error;
ref.addEventListener('loadstart', function(event) {
if (event.url.indexOf(cordovaRedirectUri) == 0) {
if (event.url.indexOf(getCordovaRedirectUri()) == 0) {
ref.close();
}
});
ref.addEventListener('loaderror', function(event) {
if (event.url.indexOf(cordovaRedirectUri) == 0) {
if (event.url.indexOf(getCordovaRedirectUri()) == 0) {
ref.close();
} else {
error = true;
@ -1483,7 +1485,7 @@ function Keycloak (config) {
var cordovaOptions = createCordovaOptions(options);
var ref = cordovaOpenWindowWrapper(registerUrl, '_blank', cordovaOptions);
ref.addEventListener('loadstart', function(event) {
if (event.url.indexOf(cordovaRedirectUri) == 0) {
if (event.url.indexOf(getCordovaRedirectUri()) == 0) {
ref.close();
var oauth = parseCallback(event.url);
processCallback(oauth, promise);
@ -1497,7 +1499,7 @@ function Keycloak (config) {
if (typeof accountUrl !== 'undefined') {
var ref = cordovaOpenWindowWrapper(accountUrl, '_blank', 'location=no');
ref.addEventListener('loadstart', function(event) {
if (event.url.indexOf(cordovaRedirectUri) == 0) {
if (event.url.indexOf(getCordovaRedirectUri()) == 0) {
ref.close();
}
});
@ -1507,7 +1509,7 @@ function Keycloak (config) {
},
redirectUri: function(options) {
return cordovaRedirectUri;
return getCordovaRedirectUri();
}
}
}