mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KEYCLOAK-3961 Fix wrong conflict merge

Browse Source
This commit is contained in:
mhajas committed 2017-05-19 12:08:19 +02:00
1 parent 1e15119f4e
commit d64fb69fac
1 file changed
-3
Download Patch File Download Diff File Expand all files Collapse all files
testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html
-3
View File
@@ -194,9 +194,6 @@ TimeSkew:
function sendBearerToKeycloak() { function sendBearerToKeycloak() {
var url = 'http://localhost:8180/auth/admin/realms/example/roles'; var url = 'http://localhost:8180/auth/admin/realms/example/roles';
if (window.location.href.indexOf("8643") > -1) { if (window.location.href.indexOf("8643") > -1) {
url = url.replace("8180","8543");
url = url.replace("http","https");
if (window.location.href.indexOf("8543") > -1) {
url = url.replace("8180", "8543"); url = url.replace("8180", "8543");
url = url.replace("http", "https"); url = url.replace("http", "https");
} }