fixup! Apply OpenShift OAuth provider

eclipse-che · Feb 10, 2020 · b08d082 · b08d082
1 parent 677161e
commit b08d082
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
@@ -430,7 +430,6 @@
                                 <dep>com.h2database:h2</dep>
                                 <dep>org.eclipse.che.core:che-core-db-vendor-mysql</dep>
                                 <dep>org.eclipse.che.core:che-core-sql-schema</dep>
-                                <dep>org.eclipse.che.core:che-core-api-auth-openshift</dep>
                                 <dep>org.eclipse.che.core:che-core-api-ssh-shared</dep>
                                 <dep>org.eclipse.che.multiuser:che-multiuser-sql-schema</dep>
                                 <dep>org.jgroups:jgroups</dep>

diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
@@ -88,6 +88,7 @@
 import org.eclipse.che.security.PasswordEncryptor;
 import org.eclipse.che.security.oauth.EmbeddedOAuthAPI;
 import org.eclipse.che.security.oauth.OAuthAPI;
+import org.eclipse.che.security.oauth.OpenShiftModule;
 import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfraModule;
 import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesInfrastructure;
 import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment;
@@ -264,6 +265,8 @@ protected void configure() {
       install(new TracingMetricsModule());
     }
     install(new ExecutorWrapperModule());
+
+    install(new OpenShiftModule());
   }
 
   private void configureSingleUserMode(Map<String, String> persistenceProperties) {

diff --git a/wsmaster/che-core-api-auth-openshift/pom.xml b/wsmaster/che-core-api-auth-openshift/pom.xml
@@ -51,9 +51,5 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-commons-inject</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...core-api-auth-openshift/src/main/java/org/eclipse/che/security/oauth/OpenShiftModule.java b/...core-api-auth-openshift/src/main/java/org/eclipse/che/security/oauth/OpenShiftModule.java
@@ -13,14 +13,12 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.multibindings.Multibinder;
-import org.eclipse.che.inject.DynaModule;
 
 /**
  * Setup OpenShiftOAuthAuthenticator in guice container.
  *
  * @author Igor Vinokur
  */
-@DynaModule
 public class OpenShiftModule extends AbstractModule {
   @Override
   protected void configure() {