Remove LDAP dependency

Author: jmgasper

docker/README.md

@@ -54,7 +54,7 @@ If you want to conenct to the database with JDBC, the connection spec is followi
     password: informix
 
 
-### Other services (MySQL,OpenLDAP,Kafka,Redis)
+### Other services (MySQL,Kafka,Redis)
 
 Identity service needs several services to work. They can be run in the docker with docker-compose. 
 Before doing docker-compose, set the environment variable "DOCKER_IP" which is supposed to have valid IP address or hostname assigned to your Docker service. 

docker/docker-compose.yml

@@ -13,13 +13,6 @@ services:
      - MYSQL_ROOT_PASSWORD=topcoder
     volumes:
      - .:/data
-  ldap:
-    image: "appiriodevops/tc-openldap:0.1.0"
-    container_name: "tc-ldap"
-    ports:
-     - "389:389"
-    volumes:
-     - .:/data
   kafka:
     image: "spotify/kafka"
     container_name: "tc-kafka"

pom.xml

@@ -216,21 +216,6 @@
       <artifactId>db_connection_factory</artifactId>
       <version>1.0.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.topcoder.legacy</groupId>
-      <artifactId>ldap</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.topcoder.legacy</groupId>
-      <artifactId>ldap_sdk_interface</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.topcoder.legacy</groupId>
-      <artifactId>ldapjdk</artifactId>
-      <version>1.0.0</version>
-    </dependency>
     <dependency>
       <groupId>com.topcoder.legacy</groupId>
       <artifactId>shared</artifactId>

src/main/docker/Dockerfile

@@ -15,8 +15,6 @@ COPY tech.core.service.identity.jar ./tech.core.service.identity.jar
 
 COPY config.yml ./config.yml
 
-COPY TC.prod.ldap.keystore ./TC.prod.ldap.keystore
-
 COPY run-service.sh ./run-service.sh
 
 #RUN yum install wget -y; \

src/main/java/com/appirio/tech/core/service/identity/IdentityApplication.java

@@ -55,7 +55,6 @@
 import com.appirio.tech.core.service.identity.util.auth.Auth0Client;
 import com.appirio.tech.core.service.identity.util.auth.ServiceAccountAuthenticator;
 import com.appirio.tech.core.service.identity.util.cache.CacheService;
-import com.appirio.tech.core.service.identity.util.ldap.LDAPService;
 import com.appirio.tech.core.service.identity.util.shiro.Shiro;
 import com.appirio.tech.core.service.identity.util.store.AuthDataStore;
 import com.appirio.tech.core.service.identity.util.zendesk.ZendeskAuthPlugin;
@@ -183,10 +182,6 @@ public void run(IdentityConfiguration configuration, Environment environment) th
 		final UserDAO userDao = jdbi.onDemand(UserDAO.class);
 		final IdentityProviderDAO identityProviderDAO = jdbi.onDemand(IdentityProviderDAO.class);
 
-		// LDAP Utility
-		LDAPService ldapService = configuration.getLdap().createLDAPService();
-		userDao.setLdapService(ldapService);
-		
 		// DynamoDB based DAO
 		AmazonDynamoDBClient dynamoDbClient = new AmazonDynamoDBClient(new DefaultAWSCredentialsProviderChain());
 		ExternalAccountDAO externalAccountDao = new ExternalAccountDAO(dynamoDbClient, Jackson.newObjectMapper()); // TODO: how to create object mapper

src/main/java/com/appirio/tech/core/service/identity/IdentityConfiguration.java

@@ -15,7 +15,6 @@
 import com.appirio.tech.core.service.identity.util.auth.ServiceAccountAuthenticatorFactory;
 import com.appirio.tech.core.service.identity.util.cache.CacheServiceFactory;
 import com.appirio.tech.core.service.identity.util.event.EventSystemFactory;
-import com.appirio.tech.core.service.identity.util.ldap.LDAPServiceFactory;
 import com.appirio.tech.core.service.identity.util.shiro.Shiro;
 import com.appirio.tech.core.service.identity.util.store.AuthDataStoreFactory;
 import com.appirio.tech.core.service.identity.util.zendesk.ZendeskFactory;
@@ -71,11 +70,7 @@ public class IdentityConfiguration extends APIBaseConfiguration {
 	@NotNull
 	@JsonProperty
 	private EventSystemFactory eventSystem = new EventSystemFactory();
-	
-	@Valid
-	@JsonProperty
-	private LDAPServiceFactory ldap = new LDAPServiceFactory();
-	
+
 	@Valid
 	@NotNull
 	@JsonProperty
@@ -144,11 +139,7 @@ public Auth0Client getAuth0New() {
 	public DICEAuth getDiceAuth() {
         return diceAuth;
     }
-	
-	public LDAPServiceFactory getLdap() {
-		return ldap;
-	}
-	
+
 	public EventSystemFactory getEventSystem() {
 		return eventSystem;
 	}