Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Commit

Permalink
Clean formatting-only changes
Browse files Browse the repository at this point in the history
Signed-off-by: David Festal <dfestal@redhat.com>
  • Loading branch information
davidfestal committed Jul 7, 2017
1 parent 867acca commit 748a479
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
+++ src/main/webapp/IDE.jsp
@@ -55,7 +55,37 @@
};

</script>
+ <script type="text/javascript" language="javascript" src="/_app/keycloak/keycloak.js"></script>
+ <script>
Expand Down Expand Up @@ -37,4 +37,4 @@
+ </script>
<script type="text/javascript" language="javascript" src="/_app/browserNotSupported.js"></script>
<script type="text/javascript" language="javascript" async="true" src="/_app/_app.nocache.js"></script>
</head>
</head>
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@
*******************************************************************************/
package org.eclipse.che.wsagent.server;

import javax.inject.Singleton;
import com.google.inject.servlet.ServletModule;

import org.eclipse.che.api.core.cors.CheCorsFilter;
import org.eclipse.che.inject.DynaModule;
import org.everrest.guice.servlet.GuiceEverrestServlet;

import com.google.inject.name.Names;
import com.google.inject.servlet.ServletModule;
import com.redhat.che.keycloak.server.KeycloakAuthenticationFilter;
import javax.inject.Singleton;
import org.eclipse.che.api.core.cors.CheCorsFilter;
import com.redhat.che.keycloak.server.KeycloakPropertiesProvider;
import org.everrest.guice.servlet.GuiceEverrestServlet;
import com.google.inject.name.Names;

/** @author andrew00x */
@DynaModule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@

import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.name.Names;
import com.redhat.che.keycloak.server.KeycloakHttpJsonRequestFactory;
import com.redhat.che.keycloak.server.KeycloakPropertiesProvider;

import org.eclipse.che.UriApiEndpointProvider;
import org.eclipse.che.api.core.rest.ApiInfoService;
import org.eclipse.che.api.core.rest.HttpJsonRequestFactory;
import org.eclipse.che.commons.lang.Pair;
import org.eclipse.che.inject.DynaModule;

import com.google.inject.name.Names;
import java.net.URI;
import com.redhat.che.keycloak.server.KeycloakPropertiesProvider;
import org.eclipse.che.UriApiEndpointProvider;

import javax.inject.Named;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
# Endpoints for obtiaining Github / OpenShift Online tokens based on Keycloak token
che.keycloak.oso.endpoint=NULL
che.keycloak.github.endpoint=NULL

che.keycloak.disabled=true
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.eclipse.che.ide.rest.AsyncRequest;
import org.eclipse.che.ide.rest.AsyncRequestFactory;
import org.eclipse.che.ide.rest.HTTPHeader;

import com.google.common.base.Preconditions;
import com.google.gwt.http.client.RequestBuilder;
import com.google.inject.Inject;
Expand Down Expand Up @@ -41,7 +40,6 @@ protected AsyncRequest doCreateRequest(RequestBuilder.Method method, String url,
}

AsyncRequest asyncRequest = new KeycloakAsyncRequest(method, url, async);

if (dtoBody != null) {
if (dtoBody instanceof List) {
asyncRequest.data(dtoFactory.toJson((List)dtoBody));
Expand All @@ -68,7 +66,7 @@ protected AsyncRequest doCreateRequest(RequestBuilder.Method method, String url,
return asyncRequest;
}

public static native String getBearerToken() /*-{
public static native String getBearerToken() /*-{
//$wnd.keycloak.updateToken(10);
return "Bearer " + $wnd.keycloak.token;
}-*/;
Expand Down

0 comments on commit 748a479

Please sign in to comment.