keycloak-uncached

KEYCLOAK-3961 Fix wrong conflict merge

3/20/2017 11:04:32 AM

mhajas

Commit: d64fb69

Tree: 86ddfa4

Parents: 1e15119

Changes

testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html 3(+0 -3)

Details

testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html 3(+0 -3)

diff --git a/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html b/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html
index f34878a..0f1d3f2 100755
--- a/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html
+++ b/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html
@@ -194,9 +194,6 @@ TimeSkew:
     function sendBearerToKeycloak() {
         var url = 'http://localhost:8180/auth/admin/realms/example/roles';
         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("http", "https");
         }