CHE-6463 Remove machine auth code that is outdated in spi

Author: sleshchenko

assembly-multiuser/assembly-wsmaster-war/pom.xml

@@ -103,10 +103,10 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-activity-wsmaster</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-docker-machine-auth</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.eclipse.che.plugin</groupId>-->
+            <!--<artifactId>che-plugin-docker-machine-auth</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>

assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/CheWsMasterModule.java

@@ -27,12 +27,6 @@ protected void configure() {
 
     bind(TokenValidator.class).to(org.eclipse.che.api.local.DummyTokenValidator.class);
 
-    bind(org.eclipse.che.api.agent.server.WsAgentHealthChecker.class)
-        .to(org.eclipse.che.api.agent.server.WsAgentHealthCheckerImpl.class);
-
-    bind(org.eclipse.che.api.environment.server.MachineInstanceProvider.class)
-        .to(org.eclipse.che.plugin.docker.machine.MachineProviderImpl.class);
-
     bind(org.eclipse.che.api.workspace.server.stack.StackLoader.class);
     bind(DataSource.class).toProvider(org.eclipse.che.core.db.h2.H2DataSourceProvider.class);
 

multiuser/keycloak/che-multiuser-keycloak-ide/src/main/java/org/eclipse/che/multiuser/keycloak/ide/KeycloakProvider.java

@@ -40,7 +40,7 @@ public class KeycloakProvider {
   public KeycloakProvider(AppContext appContext, PromiseProvider promiseProvider) {
     this.appContext = appContext;
     String keycloakSettings =
-        getKeycloakSettings(KeycloakConstants.getEndpoint(appContext.getMasterEndpoint()));
+        getKeycloakSettings(KeycloakConstants.getEndpoint(appContext.getMasterApiEndpoint()));
     Map<String, String> settings = JsonHelper.toMap(keycloakSettings);
     Log.info(getClass(), "Keycloak settings: ", settings);
 

multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml

@@ -41,10 +41,6 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-dto</artifactId>

multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/CheAuthMachineLinksModifier.java

@@ -25,7 +25,6 @@
 import org.eclipse.che.api.promises.client.Promise;
 import org.eclipse.che.api.promises.client.js.Promises;
 import org.eclipse.che.ide.api.app.AppContext;
-import org.eclipse.che.ide.api.machine.DevMachine;
 import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent;
 import org.eclipse.che.ide.commons.exception.UnmarshallerException;
 import org.eclipse.che.ide.dto.DtoFactory;
@@ -49,7 +48,6 @@ public class MachineAsyncRequestFactory extends AsyncRequestFactory
   private final AppContext appContext;
 
   private String machineToken;
-  private String wsAgentBaseUrl;
   private String csrfToken;
 
   @Inject
@@ -101,7 +99,6 @@ private Promise<String> getMachineToken() {
   @Override
   public void onWorkspaceStopped(WorkspaceStoppedEvent event) {
     machineToken = null;
-    wsAgentBaseUrl = null;
   }
 
   /**
@@ -115,22 +112,14 @@ protected boolean isWsAgentRequest(String url) {
         || !RUNNING.equals(appContext.getWorkspace().getStatus())) {
       return false; //ws-agent not started
     }
-    if (isNullOrEmpty(wsAgentBaseUrl)) {
-      final DevMachine devMachine = appContext.getDevMachine();
-      if (devMachine != null) {
-        wsAgentBaseUrl = devMachine.getWsAgentBaseUrl();
-      } else {
-        return false;
-      }
-    }
-    return url.contains(nullToEmpty(wsAgentBaseUrl));
+    return url.contains(nullToEmpty(appContext.getWsAgentServerApiEndpoint()));
   }
 
   private Promise<String> requestCsrfToken() {
     if (csrfToken != null) {
       return Promises.resolve(csrfToken);
     }
-    return createGetRequest(appContext.getMasterEndpoint() + "/profile")
+    return createGetRequest(appContext.getMasterApiEndpoint() + "/profile")
         .header(CSRF_TOKEN_HEADER_NAME, "Fetch")
         .send(
             new Unmarshallable<String>() {

multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineAsyncRequestFactory.java

@@ -16,7 +16,6 @@
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.multiuser.machine.authentication.shared.dto.MachineTokenDto;
 
 /**
@@ -34,14 +33,13 @@ public class MachineTokenServiceClientImpl implements MachineTokenServiceClient
 
   @Inject
   public MachineTokenServiceClientImpl(
-      @RestContext String restContext,
       AppContext appContext,
       AsyncRequestFactory asyncRequestFactory,
       DtoUnmarshallerFactory dtoUnmarshallerFactory) {
     this.appContext = appContext;
     this.asyncRequestFactory = asyncRequestFactory;
     this.dtoUnmarshallerFactory = dtoUnmarshallerFactory;
-    this.baseUrl = restContext + MACHINE_TOKEN_SERVICE_PATH;
+    this.baseUrl = appContext.getMasterApiEndpoint() + MACHINE_TOKEN_SERVICE_PATH;
   }
 
   public Promise<MachineTokenDto> getMachineToken() {

multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineTokenServiceClientImpl.java

@@ -13,8 +13,6 @@
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.inject.Singleton;
 import org.eclipse.che.ide.api.extension.ExtensionGinModule;
-import org.eclipse.che.ide.api.machine.CheWsAgentLinksModifier;
-import org.eclipse.che.multiuser.machine.authentication.ide.CheAuthMachineLinksModifier;
 import org.eclipse.che.multiuser.machine.authentication.ide.MachineTokenServiceClient;
 import org.eclipse.che.multiuser.machine.authentication.ide.MachineTokenServiceClientImpl;
 
@@ -24,10 +22,8 @@ public class MachineAuthGinModule extends AbstractGinModule {
 
   @Override
   protected void configure() {
-    //bind(AsyncRequestFactory.class).to(MachineAsyncRequestFactory.class);
     bind(MachineTokenServiceClient.class)
         .to(MachineTokenServiceClientImpl.class)
         .in(Singleton.class);
-    bind(CheWsAgentLinksModifier.class).to(CheAuthMachineLinksModifier.class);
   }
 }

multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/inject/MachineAuthGinModule.java

@@ -113,10 +113,6 @@
             <groupId>org.everrest</groupId>
             <artifactId>everrest-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-api-permission</artifactId>