From 8f6c3f0d83eb6ebcc6ddc29d8962599f03ccc384 Mon Sep 17 00:00:00 2001
From: yaroslavtir <yaroslav.molodkov@odysseusinc.com>
Date: Tue, 22 Dec 2020 17:07:13 +0100
Subject: [PATCH 01/12] ARACHNE-2901 support the latest java 8 version

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0ace8039b..dc793137c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
         <commonsCsv.version>1.7</commonsCsv.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.io.version>2.5</commons.io.version>
+        <bcprov-jdk15on.version>1.67</bcprov-jdk15on.version>
     </properties>
 
     <profiles>
@@ -139,6 +140,13 @@
             <artifactId>arachne-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>${bcprov-jdk15on.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.odysseusinc.arachne</groupId>
             <artifactId>arachne-no-handler-found-exception-util</artifactId>

From 70205bd6e9b15d0508ee059fc6e0bededb6bc320 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Tue, 19 Jan 2021 12:45:27 +0100
Subject: [PATCH 02/12] update version to 1.17.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b8737305..251f0c470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>portal</artifactId>
     <groupId>com.odysseusinc.arachne</groupId>
-    <version>1.17.0</version>
+    <version>1.17.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>

From 45bb257be9f6f1f2d2f5cf2f8a2b831d2c7206c3 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Wed, 27 Jan 2021 17:58:55 +0100
Subject: [PATCH 03/12] jackson-databind version update

---
 pom.xml                                       | 27 ++++++++++---------
 .../portal/repository/CommentRepository.java  |  2 +-
 .../impl/AchillesImportServiceImpl.java       |  4 +--
 .../service/impl/BaseUserServiceImpl.java     |  6 ++---
 .../service/impl/CommentServiceImpl.java      |  3 +--
 .../impl/BaseSubmissionServiceImpl.java       |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 251f0c470..bb1fc6d24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,23 +21,24 @@
         <start-class>com.odysseusinc.arachne.portal.PortalStarter</start-class>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <jjwt.version>0.10.5</jjwt.version>
+        <jjwt.version>0.10.8</jjwt.version>
+        <assertj.version>3.13.2</assertj.version>
+        <build.id>${BUILD_TIMESTAMP}</build.id>
+        <build.number>${BUILD_NUMBER}</build.number>
+        <clamav.version>2.0.1</clamav.version>
+        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <commons.io.version>2.8.0</commons.io.version>
+        <commons.lang3.version>3.11</commons.lang3.version>
+        <commonsCsv.version>1.7</commonsCsv.version>
+        <dockerImagePrefix>hub.arachnenetwork.com</dockerImagePrefix>
         <ehcache.version>1.3.0</ehcache.version>
-        <postgresql.version>42.2.1</postgresql.version>
         <gson.version>2.7</gson.version>
-        <commons.lang3.version>3.8.1</commons.lang3.version>
+        <hibernate.version>5.2.12.Final</hibernate.version>
         <hikaricp.version>2.6.3</hikaricp.version>
-        <build.number>${BUILD_NUMBER}</build.number>
-        <build.id>${BUILD_TIMESTAMP}</build.id>
-        <dockerImagePrefix>hub.arachnenetwork.com</dockerImagePrefix>
+        <jackson.version>2.10.5</jackson.version>
         <jodConverter.version>4.2.0</jodConverter.version>
-        <hibernate.version>5.2.12.Final</hibernate.version>
-        <clamav.version>2.0.1</clamav.version>
+        <postgresql.version>42.2.15</postgresql.version>
         <springRetryVersion>1.2.4.RELEASE</springRetryVersion>
-        <assertj.version>3.13.2</assertj.version>
-        <commonsCsv.version>1.7</commonsCsv.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
-        <commons.io.version>2.5</commons.io.version>
     </properties>
 
     <profiles>
@@ -263,7 +264,7 @@
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>2.1.1</version>
+            <version>2.6.4</version>
         </dependency>
         <dependency>
             <groupId>edu.vt.middleware</groupId>
diff --git a/src/main/java/com/odysseusinc/arachne/portal/repository/CommentRepository.java b/src/main/java/com/odysseusinc/arachne/portal/repository/CommentRepository.java
index 268754504..3d4c26e9d 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/repository/CommentRepository.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/repository/CommentRepository.java
@@ -26,10 +26,10 @@
 import com.odysseusinc.arachne.portal.model.CommentTopic;
 import java.util.List;
 import java.util.Set;
-import javax.transaction.Transactional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.transaction.annotation.Transactional;
 
 public interface CommentRepository extends PagingAndSortingRepository<Comment, Long> {
 
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/AchillesImportServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/AchillesImportServiceImpl.java
index e5d56f938..610826f6f 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/AchillesImportServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/AchillesImportServiceImpl.java
@@ -47,7 +47,6 @@
 import java.util.zip.ZipFile;
 import javax.persistence.EntityManager;
 import javax.persistence.FlushModeType;
-import javax.transaction.Transactional;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +54,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class AchillesImportServiceImpl implements AchillesImportService {
@@ -62,7 +62,7 @@ public class AchillesImportServiceImpl implements AchillesImportService {
     private static final String IMPORT_ACHILLES_RESULT_LOG =
             "{} import Achilles result for Data Source with id='{}', name='{}', Data Node with id='{}' name='{}'";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AchillesImportService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AchillesImportServiceImpl.class);
 
     @Value("${spring.jpa.properties.hibernate.jdbc.batch_size}")
     private int batchSize = 1000;
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
index 3a03c9ab2..fea90c8a5 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
@@ -121,7 +121,6 @@
 import java.util.stream.Stream;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
 import javax.validation.constraints.NotNull;
 
 import org.apache.commons.io.FilenameUtils;
@@ -149,6 +148,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -325,7 +325,7 @@ public List<U> getByIdsInAnyTenant(final List<Long> ids) {
 
     @Override
     @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @Transactional(rollbackOn = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void remove(Long id) throws ValidationException, UserNotFoundException, NotExistException, IOException, SolrServerException {
 
         if (id == null) {
@@ -601,7 +601,7 @@ public U updateInAnyTenant(U user) throws NotExistException {
 
     @Override
     @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @Transactional(rollbackOn = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void saveUsers(List<U> users, Set<Tenant> tenants, boolean emailConfirmationRequired) {
 
         users.forEach(user -> {
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/CommentServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/CommentServiceImpl.java
index 9c90cbc5a..10f593461 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/CommentServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/CommentServiceImpl.java
@@ -33,17 +33,16 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.transaction.Transactional;
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/submission/impl/BaseSubmissionServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/submission/impl/BaseSubmissionServiceImpl.java
index c4946eecf..86f125807 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/submission/impl/BaseSubmissionServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/submission/impl/BaseSubmissionServiceImpl.java
@@ -99,12 +99,12 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;

From 0cded3ee2f40e4189e8bbcb71a8508e39f3892e3 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Thu, 28 Jan 2021 11:10:33 +0100
Subject: [PATCH 04/12] update to patch version jackson-databind:2.7.5.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bb1fc6d24..6b71b06d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <gson.version>2.7</gson.version>
         <hibernate.version>5.2.12.Final</hibernate.version>
         <hikaricp.version>2.6.3</hikaricp.version>
-        <jackson.version>2.10.5</jackson.version>
+        <jackson.version>2.10.5.20201202</jackson.version>
         <jodConverter.version>4.2.0</jodConverter.version>
         <postgresql.version>42.2.15</postgresql.version>
         <springRetryVersion>1.2.4.RELEASE</springRetryVersion>

From 36004f69ad3154edf253645b2ed35454d062d9a0 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Fri, 5 Feb 2021 11:16:38 +0100
Subject: [PATCH 05/12] activemq dependency update

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 6b71b06d4..9f2b8448c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <jjwt.version>0.10.8</jjwt.version>
+        <activemq.version>5.15.14</activemq.version>
         <assertj.version>3.13.2</assertj.version>
         <build.id>${BUILD_TIMESTAMP}</build.id>
         <build.number>${BUILD_NUMBER}</build.number>

From 994329197b3972c925c9f54a557fd9f03baee4c6 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Mon, 15 Feb 2021 10:41:24 +0100
Subject: [PATCH 06/12] switch to the new base docker image

---
 pom.xml                         | 8 ++++----
 solr_config/conf/solrconfig.xml | 2 +-
 src/main/docker/Dockerfile      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9f2b8448c..8af1432d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <commons.io.version>2.8.0</commons.io.version>
         <commons.lang3.version>3.11</commons.lang3.version>
         <commonsCsv.version>1.7</commonsCsv.version>
-        <dockerImagePrefix>hub.arachnenetwork.com</dockerImagePrefix>
+        <dockerImagePrefix>hub.odysseusinc.com</dockerImagePrefix>
         <ehcache.version>1.3.0</ehcache.version>
         <gson.version>2.7</gson.version>
         <hibernate.version>5.2.12.Final</hibernate.version>
@@ -109,7 +109,7 @@
             <dependency>
                 <artifactId>solr-solrj</artifactId>
                 <groupId>org.apache.solr</groupId>
-                <version>7.2.1</version>
+                <version>7.7.3</version>
             </dependency>
             <dependency>
                 <groupId>org.flywaydb</groupId>
@@ -491,8 +491,8 @@
                             <include>${project.build.finalName}-exec.${project.packaging}</include>
                         </resource>
                     </resources>
-                    <serverId>arachne-hub</serverId>
-                    <registryUrl>https://hub.arachnenetwork.com/v2/</registryUrl>
+                    <serverId>hub.odysseusinc.com</serverId>
+                    <registryUrl>https://hub.odysseusinc.com/v2/</registryUrl>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/solr_config/conf/solrconfig.xml b/solr_config/conf/solrconfig.xml
index de1e15f6b..a539b2dbe 100755
--- a/solr_config/conf/solrconfig.xml
+++ b/solr_config/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>7.2.1</luceneMatchVersion>
+  <luceneMatchVersion>7.7.1</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index eba28cc0f..c4f16ff26 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
-FROM hub.arachnenetwork.com/portal_env:1.0.13
-MAINTAINER alexandr.ryabokon@odysseusinc.com
+FROM hub.odysseusinc.com/portal_env:1.1.0
+MAINTAINER alexandr.cumarav@odysseusinc.com
 USER root
 VOLUME /tmp
 ADD portal-exec.jar /portal.jar

From e85e4db5efc8bf588ddd5a049cbd3285b2d041f7 Mon Sep 17 00:00:00 2001
From: Alex Cumarav <7705583+acumarav@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:27:49 +0100
Subject: [PATCH 07/12] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dc793137c..28c9a057b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <commonsCsv.version>1.7</commonsCsv.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.io.version>2.5</commons.io.version>
-        <bcprov-jdk15on.version>1.67</bcprov-jdk15on.version>
+        <bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
     </properties>
 
     <profiles>

From f35672847f78931e34a23a9d06bf538ad302cb00 Mon Sep 17 00:00:00 2001
From: Alex Cumarav <7705583+acumarav@users.noreply.github.com>
Date: Tue, 2 Mar 2021 13:34:26 +0100
Subject: [PATCH 08/12] Case Insensitive Login (#721)

---
 .../portal/repository/BaseRawUserRepository.java      |  4 ++--
 .../portal/service/impl/BaseUserServiceImpl.java      | 11 +++++------
 src/main/resources/application-base.yml               |  2 +-
 src/test/resources/application.properties             |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java
index 12cfc9753..2a2272ca1 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java
@@ -44,7 +44,7 @@ public interface BaseRawUserRepository<U extends IUser> extends EntityGraphJpaRe
 
     U findByIdAndEnabledTrue(Long id);
 
-    U findByOriginAndUsername(String userOrigin, String username);
+    U findByOriginAndUsernameIgnoreCase(String userOrigin, String username);
 
     U findByRegistrationCode(String activateCode);
 
@@ -56,7 +56,7 @@ public interface BaseRawUserRepository<U extends IUser> extends EntityGraphJpaRe
 
     U findByEmailAndEnabledTrue(String email);
 
-    U findByOriginAndUsernameAndEnabledTrue(String userOrigin, String username);
+    U findByOriginAndUsernameIgnoreCaseAndEnabledTrue(String userOrigin, String username);
 
     @Query(nativeQuery = true, value = "SELECT * FROM users_data "
             + " WHERE "
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
index fea90c8a5..44ed65baf 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
@@ -124,6 +124,7 @@
 import javax.validation.constraints.NotNull;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -149,7 +150,6 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -263,9 +263,9 @@ public U getByUsernameInAnyTenant(final String username) {
     public U getByUsernameInAnyTenant(final String username, boolean includeDeleted) {
 
         if (includeDeleted) {
-            return rawUserRepository.findByOriginAndUsername(this.authenticationHelperService.getCurrentMethodType(), username);
+            return rawUserRepository.findByOriginAndUsernameIgnoreCase(this.authenticationHelperService.getCurrentMethodType(), username);
         } else {
-            return rawUserRepository.findByOriginAndUsernameAndEnabledTrue(this.authenticationHelperService.getCurrentMethodType(), username);
+            return rawUserRepository.findByOriginAndUsernameIgnoreCaseAndEnabledTrue(this.authenticationHelperService.getCurrentMethodType(), username);
         }
     }
 
@@ -297,7 +297,7 @@ public U getByUnverifiedEmailIgnoreCaseInAnyTenant(final String email) {
     @Override
     public U getByEmailInAnyTenant(final String email) {
 
-        return rawUserRepository.findByOriginAndUsername(this.authenticationHelperService.getCurrentMethodType(), email);
+        return rawUserRepository.findByOriginAndUsernameIgnoreCase(this.authenticationHelperService.getCurrentMethodType(), email);
     }
 
     @Override
@@ -588,9 +588,8 @@ public U update(final U user)
     }
 
     @Override
-    @PreAuthorize("@rawUserRepository.findOne(#user.id)?.getUsername() == authentication.principal.username || hasRole('ROLE_ADMIN')")
+    @PreAuthorize("T(String).CASE_INSENSITIVE_ORDER.compare(@rawUserRepository.findOne(#user.id)?.getUsername(), authentication.principal.username)==0 || hasRole('ROLE_ADMIN')")
     public U updateInAnyTenant(U user) throws NotExistException {
-
         U forUpdate = getByIdInAnyTenant(user.getId());
         forUpdate = baseUpdate(forUpdate, user);
         U savedUser = rawUserRepository.saveAndFlush(forUpdate);
diff --git a/src/main/resources/application-base.yml b/src/main/resources/application-base.yml
index 61ed2099a..a4d6b4635 100644
--- a/src/main/resources/application-base.yml
+++ b/src/main/resources/application-base.yml
@@ -166,7 +166,7 @@ authenticator:
         jdbcUrl: ${spring.datasource.url}
         username: ${spring.datasource.username}
         password: ${spring.datasource.password}
-        query: SELECT password, firstname, middlename, lastname FROM users_data WHERE email = :username
+        query: SELECT password, firstname, middlename, lastname FROM users_data WHERE lower(email) = lower(:username)
         passwordEncoder: org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
         fieldsToExtract:
           firstName: firstname
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index ba40dbbe2..5f5646ec3 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -99,7 +99,7 @@ authenticator.methods.db.service=org.ohdsi.authenticator.service.jdbc.JdbcAuthSe
 authenticator.methods.db.config.jdbcUrl=${spring.datasource.url}
 authenticator.methods.db.config.username=${spring.datasource.username}
 authenticator.methods.db.config.password=${spring.datasource.password}
-authenticator.methods.db.config.query=SELECT password, firstname, middlename, lastname FROM users_data WHERE email = :username
+authenticator.methods.db.config.query=SELECT password, firstname, middlename, lastname FROM users_data WHERE lower(email) = lower(:username)
 authenticator.methods.db.config.passwordEncoder=org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
 authenticator.methods.db.config.fieldsToExtract.firstName=firstname
 authenticator.methods.db.config.fieldsToExtract.middleName=middlename

From c599ca584e760cf99ab1bee0d7b10616e45ff424 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Tue, 2 Mar 2021 15:08:58 +0100
Subject: [PATCH 09/12] case insensitive password reset

---
 .../arachne/portal/repository/BaseRawUserRepository.java        | 2 --
 .../arachne/portal/service/impl/BaseUserServiceImpl.java        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java
index 2a2272ca1..466c84e82 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawUserRepository.java
@@ -48,8 +48,6 @@ public interface BaseRawUserRepository<U extends IUser> extends EntityGraphJpaRe
 
     U findByRegistrationCode(String activateCode);
 
-    U findByEmail(String email, EntityGraph entityGraph);
-
     U findByEmailIgnoreCase(String email, EntityGraph entityGraph);
 
     U findByEmail(String email);
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
index 44ed65baf..235057c9b 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
@@ -284,7 +284,7 @@ public U getByUnverifiedEmail(final String email) {
     @Override
     public U getByUnverifiedEmailInAnyTenant(final String email) {
 
-        return rawUserRepository.findByEmail(email, EntityUtils.fromAttributePaths("roles", "professionalType"));
+        return rawUserRepository.findByEmailIgnoreCase(email, EntityUtils.fromAttributePaths("roles", "professionalType"));
     }
 
     @Override

From f0bf8b5013f96b1d6b430280cfa64bc9a76a5358 Mon Sep 17 00:00:00 2001
From: Alex Cumarav <7705583+acumarav@users.noreply.github.com>
Date: Thu, 18 Mar 2021 17:12:49 +0100
Subject: [PATCH 10/12] External auth mode support (#723)

Add  External auth mode support.
---
 .../BaseAuthenticationController.java         |  14 +-
 .../BaseExpertFinderController.java           |   4 +-
 .../portal/component/ldap/ImportResult.java   |  79 ++++++++
 .../portal/repository/BaseUserRepository.java |   6 -
 .../impl/AuthenticationServiceImpl.java       |  94 +++++++++-
 .../impl/BaseAuthenticationServiceImpl.java   |  64 -------
 .../service/impl/BaseUserServiceImpl.java     |  71 ++++----
 .../service/impl/UserImportService.java       | 168 ++++++++++++++++++
 8 files changed, 382 insertions(+), 118 deletions(-)
 create mode 100644 src/main/java/com/odysseusinc/arachne/portal/component/ldap/ImportResult.java
 delete mode 100644 src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseAuthenticationServiceImpl.java
 create mode 100644 src/main/java/com/odysseusinc/arachne/portal/service/impl/UserImportService.java

diff --git a/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseAuthenticationController.java b/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseAuthenticationController.java
index 5dffc55e0..798b2c012 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseAuthenticationController.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseAuthenticationController.java
@@ -164,12 +164,14 @@ private void checkIfUserBlocked(String username) throws PermissionDeniedExceptio
 
     protected void checkIfUserHasTenant(String username) throws AuthenticationException {
 
-        IUser user = userService.getByUsernameInAnyTenant(username);
-        if (user == null) {
-            throw new BadCredentialsException(ErrorMessages.BAD_CREDENTIALS.getMessage());
-        }
-        if (user.getTenants() == null || user.getTenants().isEmpty()) {
-            throw new NoDefaultTenantException("Request admin to add you into a tenant.");
+        if (authenticationHelperService.isNative()) {
+            IUser user = userService.getByUsernameInAnyTenant(username);
+            if (user == null) {
+                throw new BadCredentialsException(ErrorMessages.BAD_CREDENTIALS.getMessage());
+            }
+            if (user.getTenants() == null || user.getTenants().isEmpty()) {
+                throw new NoDefaultTenantException("Request admin to add you into a tenant.");
+            }
         }
     }
 
diff --git a/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseExpertFinderController.java b/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseExpertFinderController.java
index 5a3815884..a8c85b005 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseExpertFinderController.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/api/v1/controller/BaseExpertFinderController.java
@@ -89,12 +89,12 @@ public JsonResult<UserProfileDTO> viewProfile(
             Principal principal,
             @PathVariable("userId") String userId) {
 
-        IUser logginedUser = userService.getByUsername(principal.getName());
+        IUser loggedInUser = userService.getByUsername(principal.getName());
         JsonResult<UserProfileDTO> result;
         IUser user = userService.getByUuidAndInitializeCollections(userId);
 
         UserProfileDTO userProfileDTO = conversionService.convert(user, UserProfileDTO.class);
-        userProfileDTO.setIsEditable(logginedUser.getUuid().equals(userId));
+        userProfileDTO.setIsEditable(loggedInUser.getUuid().equals(userId));
         result = new JsonResult<>(JsonResult.ErrorCode.NO_ERROR);
         result.setResult(userProfileDTO);
         return result;
diff --git a/src/main/java/com/odysseusinc/arachne/portal/component/ldap/ImportResult.java b/src/main/java/com/odysseusinc/arachne/portal/component/ldap/ImportResult.java
new file mode 100644
index 000000000..947964973
--- /dev/null
+++ b/src/main/java/com/odysseusinc/arachne/portal/component/ldap/ImportResult.java
@@ -0,0 +1,79 @@
+/*
+ *
+ * Copyright 2021 Odysseus Data Services, inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Company: Odysseus Data Services, Inc.
+ * Product Owner/Architecture: Gregory Klebanov
+ * Authors: Yaroslav Molodkov, Alexandr Cumarav, Vitaliy Kulakov
+ * Created: March 17, 2021
+ *
+ */
+
+package com.odysseusinc.arachne.portal.component.ldap;
+
+public class ImportResult {
+
+    public enum ImportResultState {
+        CREATED,
+        UPDATED,
+        ERROR
+    }
+
+    private String id;
+    private ImportResultState state;
+    private String message;
+
+    public ImportResult(String id, ImportResultState state) {
+
+        this.id = id;
+        this.state = state;
+    }
+
+    public ImportResult(String id, ImportResultState state, String message) {
+
+        this.id = id;
+        this.state = state;
+        this.message = message;
+    }
+
+    public String getId() {
+
+        return id;
+    }
+
+    public void setId(String id) {
+
+        this.id = id;
+    }
+
+    public ImportResultState getState() {
+
+        return state;
+    }
+
+    public void setState(ImportResultState state) {
+
+        this.state = state;
+    }
+
+    public String getMessage() {
+
+        return message;
+    }
+
+    public void setMessage(String message) {
+
+        this.message = message;
+    }
+}
diff --git a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseUserRepository.java b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseUserRepository.java
index 6a62699d4..8d5fa473b 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseUserRepository.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseUserRepository.java
@@ -40,12 +40,8 @@ public interface BaseUserRepository<U extends IUser> extends EntityGraphJpaRepos
 
     List<U> findByIdIn(List<Long> idList);
 
-    U findByEmail(String email);
-
     U findByEmailAndEnabledTrue(String email);
 
-    U findByEmailAndEmailConfirmedFalse(String email);
-
     U findByOriginAndUsername(String userOrigin, String username);
 
     U findByOriginAndUsernameAndEnabledTrue(String userOrigin, String username);
@@ -87,8 +83,6 @@ List<U> suggestToPaper(@Param("suggestRequest") String suggestRequest,
     @Query(nativeQuery = true, value = "SELECT * FROM users_data u WHERE enabled = TRUE")
     List<U> findAllEnabledFromAllTenants();
 
-    Page<U> findAllBy(Pageable pageable);
-
     List<U> findAllByUsernameInAndEnabledTrue(List<String> userNames);
 
     @Query(nativeQuery = true, value = "SELECT DISTINCT u.* FROM users u "
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/AuthenticationServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/AuthenticationServiceImpl.java
index ed42e144b..c7c9525c0 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/AuthenticationServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/AuthenticationServiceImpl.java
@@ -1,14 +1,102 @@
+/*
+ *
+ * Copyright 2021 Odysseus Data Services, inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Company: Odysseus Data Services, Inc.
+ * Product Owner/Architecture: Gregory Klebanov
+ * Authors: Yaroslav Molodkov, Alexandr Cumarav, Vitaliy Kulakov
+ * Created: March 17, 2021
+ *
+ */
+
 package com.odysseusinc.arachne.portal.service.impl;
 
+import com.odysseusinc.arachne.commons.api.v1.dto.CommonAuthenticationRequest;
+import com.odysseusinc.arachne.portal.model.User;
+import com.odysseusinc.arachne.portal.model.factory.ArachneUserFactory;
+import com.odysseusinc.arachne.portal.model.security.ArachneUser;
+import com.odysseusinc.arachne.portal.service.AuthenticationService;
+import java.util.Collections;
+import org.ohdsi.authenticator.model.UserInfo;
 import org.ohdsi.authenticator.service.authentication.Authenticator;
+import org.pac4j.core.credentials.UsernamePasswordCredentials;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
-public class AuthenticationServiceImpl extends BaseAuthenticationServiceImpl {
+public class AuthenticationServiceImpl implements AuthenticationService {
+
+    private final Authenticator authenticator;
+    private final UserDetailsService userDetailsService;
+    private final UserImportService userImportService;
+
+
+    @Value("${security.method}")
+    protected String authMethodName;
+
+    public AuthenticationServiceImpl(Authenticator authenticator, UserDetailsService userDetailsService, UserImportService userImportService) {
+
+        this.authenticator = authenticator;
+        this.userDetailsService = userDetailsService;
+        this.userImportService = userImportService;
+    }
+
+    @Transactional(rollbackFor = Exception.class, readOnly = false)
+    public String authenticateAndGetAuthToken(CommonAuthenticationRequest authenticationRequest) {
+
+        String username = authenticationRequest.getUsername();
+        String password = authenticationRequest.getPassword();
+        try {
+
+            UserInfo userInfo = authenticator.authenticate(
+                    authMethodName,
+                    new UsernamePasswordCredentials(username, password)
+            );
+            authenticate(userInfo.getUsername(), password);
+            return userInfo.getToken();
+        } catch (Exception e) {
+            SecurityContextHolder.clearContext();
+            throw e;
+        }
+    }
+
+    @Override
+    public void authenticate(String username, String password) {
+        authenticateBaseOnExternalUser(username, password);
+        userImportService.synchronizeUserWithExternalSourceIfPossible(username);
+
+        UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, password, userDetails.getAuthorities());
+        authentication.setDetails(userDetails);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
+
+    private void authenticateBaseOnExternalUser(String username, String password) {
 
-    public AuthenticationServiceImpl(Authenticator authenticator, UserDetailsService userDetailsService) {
+        User user = new User();
+        user.setUsername(username);
+        user.setRoles(Collections.emptyList());
 
-        super(authenticator, userDetailsService);
+        ArachneUser arachneUser = ArachneUserFactory.create(user);
+        UsernamePasswordAuthenticationToken authentication =
+                new UsernamePasswordAuthenticationToken(arachneUser, password, arachneUser.getAuthorities());
+        authentication.setDetails(arachneUser);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
     }
 }
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseAuthenticationServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseAuthenticationServiceImpl.java
deleted file mode 100644
index 1d29492be..000000000
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseAuthenticationServiceImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.odysseusinc.arachne.portal.service.impl;
-
-import com.odysseusinc.arachne.commons.api.v1.dto.CommonAuthenticationRequest;
-import com.odysseusinc.arachne.portal.service.AuthenticationService;
-import java.util.Collections;
-import java.util.List;
-import org.ohdsi.authenticator.model.UserInfo;
-import org.ohdsi.authenticator.service.authentication.Authenticator;
-import org.ohdsi.authenticator.service.jdbc.JdbcAuthService;
-import org.pac4j.core.credentials.UsernamePasswordCredentials;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.transaction.annotation.Transactional;
-
-public class BaseAuthenticationServiceImpl implements AuthenticationService {
-
-    private static final List<String> NATIVE_AUTH_METHOD_TYPES = Collections.singletonList(JdbcAuthService.AUTH_METHOD_NAME);
-
-    protected Authenticator authenticator;
-    private UserDetailsService userDetailsService;
-
-    @Value("${security.method}")
-    protected String authMethodName;
-
-
-    public BaseAuthenticationServiceImpl(Authenticator authenticator, UserDetailsService userDetailsService) {
-
-        this.authenticator = authenticator;
-        this.userDetailsService = userDetailsService;
-    }
-
-    @Transactional(rollbackFor = Exception.class, readOnly = false)
-    public String authenticateAndGetAuthToken(CommonAuthenticationRequest authenticationRequest) {
-
-        String username = authenticationRequest.getUsername();
-        String password = authenticationRequest.getPassword();
-        try {
-
-            UserInfo userInfo = authenticator.authenticate(
-                    authMethodName,
-                    new UsernamePasswordCredentials(username, password)
-            );
-            authenticate(userInfo.getUsername(), password);
-            return userInfo.getToken();
-        } catch (Exception e) {
-            SecurityContextHolder.clearContext();
-            throw e;
-        }
-    }
-
-    @Override
-    public void authenticate(String username, String password) {
-
-        UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
-        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, password, userDetails.getAuthorities());
-        authentication.setDetails(userDetails);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-    }
-
-
-}
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
index 235057c9b..502f39d1a 100644
--- a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseUserServiceImpl.java
@@ -22,17 +22,6 @@
 
 package com.odysseusinc.arachne.portal.service.impl;
 
-import static com.odysseusinc.arachne.portal.model.ParticipantStatus.APPROVED;
-import static com.odysseusinc.arachne.portal.model.ParticipantStatus.DECLINED;
-import static com.odysseusinc.arachne.portal.repository.UserSpecifications.emailConfirmed;
-import static com.odysseusinc.arachne.portal.repository.UserSpecifications.userStatus;
-import static com.odysseusinc.arachne.portal.repository.UserSpecifications.usersIn;
-import static com.odysseusinc.arachne.portal.repository.UserSpecifications.withNameOrEmailLike;
-import static com.odysseusinc.arachne.portal.service.RoleService.ROLE_ADMIN;
-import static java.lang.Boolean.TRUE;
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
-import static org.springframework.data.jpa.domain.Specifications.where;
-
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
 import com.drew.metadata.Metadata;
@@ -81,6 +70,7 @@
 import com.odysseusinc.arachne.portal.security.passwordvalidator.ArachnePasswordData;
 import com.odysseusinc.arachne.portal.security.passwordvalidator.ArachnePasswordValidationResult;
 import com.odysseusinc.arachne.portal.security.passwordvalidator.ArachnePasswordValidator;
+import com.odysseusinc.arachne.portal.service.AuthenticationHelperService;
 import com.odysseusinc.arachne.portal.service.BaseSkillService;
 import com.odysseusinc.arachne.portal.service.BaseSolrService;
 import com.odysseusinc.arachne.portal.service.BaseUserLinkService;
@@ -88,7 +78,6 @@
 import com.odysseusinc.arachne.portal.service.BaseUserService;
 import com.odysseusinc.arachne.portal.service.ProfessionalTypeService;
 import com.odysseusinc.arachne.portal.service.TenantService;
-import com.odysseusinc.arachne.portal.service.AuthenticationHelperService;
 import com.odysseusinc.arachne.portal.service.UserRegistrantService;
 import com.odysseusinc.arachne.portal.service.impl.solr.FieldList;
 import com.odysseusinc.arachne.portal.service.impl.solr.SearchResult;
@@ -99,30 +88,6 @@
 import com.odysseusinc.arachne.portal.service.mail.RemindPasswordMailMessage;
 import com.odysseusinc.arachne.portal.util.EntityUtils;
 import edu.vt.middleware.password.Password;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Paths;
-import java.security.Principal;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
-
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -152,6 +117,38 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Paths;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.odysseusinc.arachne.portal.model.ParticipantStatus.APPROVED;
+import static com.odysseusinc.arachne.portal.model.ParticipantStatus.DECLINED;
+import static com.odysseusinc.arachne.portal.repository.UserSpecifications.*;
+import static com.odysseusinc.arachne.portal.service.RoleService.ROLE_ADMIN;
+import static java.lang.Boolean.TRUE;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.springframework.data.jpa.domain.Specifications.where;
+
 
 public abstract class BaseUserServiceImpl<
         U extends IUser,
@@ -250,7 +247,7 @@ public U getByUsername(final String username) {
     @Override
     public U getByUsername(final String userOrigin, final String username) {
 
-        return userRepository.findByEmail(username);
+        return rawUserRepository.findByOriginAndUsernameIgnoreCase(userOrigin, username);
     }
 
     @Override
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/UserImportService.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/UserImportService.java
new file mode 100644
index 000000000..e674da054
--- /dev/null
+++ b/src/main/java/com/odysseusinc/arachne/portal/service/impl/UserImportService.java
@@ -0,0 +1,168 @@
+/*
+ *
+ * Copyright 2021 Odysseus Data Services, inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Company: Odysseus Data Services, Inc.
+ * Product Owner/Architecture: Gregory Klebanov
+ * Authors: Yaroslav Molodkov, Alexandr Cumarav, Vitaliy Kulakov
+ * Created: March 17, 2021
+ *
+ */
+
+
+package com.odysseusinc.arachne.portal.service.impl;
+
+import com.google.common.collect.Lists;
+import com.odysseusinc.arachne.portal.api.v1.dto.converters.UserInfoToUserConverter;
+import com.odysseusinc.arachne.portal.component.ldap.ImportResult;
+import com.odysseusinc.arachne.portal.exception.NotExistException;
+import com.odysseusinc.arachne.portal.model.IUser;
+import com.odysseusinc.arachne.portal.model.ProfessionalType;
+import com.odysseusinc.arachne.portal.model.Skill;
+import com.odysseusinc.arachne.portal.model.User;
+import com.odysseusinc.arachne.portal.service.AuthenticationHelperService;
+import com.odysseusinc.arachne.portal.service.BaseUserService;
+import com.odysseusinc.arachne.portal.service.ProfessionalTypeService;
+import org.apache.commons.lang3.StringUtils;
+import org.ohdsi.authenticator.exception.AuthenticationException;
+import org.ohdsi.authenticator.service.AuthService;
+import org.ohdsi.authenticator.service.authentication.UserService;
+import org.ohdsi.authenticator.service.directory.ad.AdAuthService;
+import org.ohdsi.authenticator.service.directory.ldap.LdapAuthService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+public class UserImportService {
+
+    private static Collection<String> supportedMethodTypes = Arrays.asList(LdapAuthService.AUTH_METHOD_NAME, AdAuthService.AUTH_METHOD_NAME);
+
+    private BaseUserService<IUser, Skill> userService;
+
+    private UserService authUserService;
+
+    private ProfessionalTypeService professionalTypeService;
+
+    private UserInfoToUserConverter converter;
+
+    private AuthenticationHelperService authenticationHelperService;
+
+    public UserImportService(BaseUserService<IUser, Skill> userService, UserService authUserService, ProfessionalTypeService professionalTypeService, UserInfoToUserConverter converter, AuthenticationHelperService authenticationHelperService) {
+
+        this.userService = userService;
+        this.authUserService = authUserService;
+        this.professionalTypeService = professionalTypeService;
+        this.converter = converter;
+        this.authenticationHelperService = authenticationHelperService;
+    }
+
+
+    public List<ImportResult> doImport(ProfessionalType professionalType, List<User> users) throws NotExistException {
+
+        return users.stream()
+                .map(userForImport -> doImport(professionalType, userForImport))
+                .collect(Collectors.toList());
+    }
+
+    public ImportResult doImport(ProfessionalType professionalType, User userForImport) {
+
+        try {
+            userForImport.setProfessionalType(professionalType);
+            IUser existedUser = userService.getByUsernameInAnyTenant(userForImport.getUsername());
+
+            if (existedUser != null) {
+                userForImport.setId(existedUser.getId());
+                userService.updateInAnyTenant(userForImport);
+                return new ImportResult(userForImport.getUsername(), ImportResult.ImportResultState.UPDATED);
+            } else {
+
+                AuthService authService = authenticationHelperService.getCurrentAuthService();
+                String authMethodType = authService.getMethodType();
+                userForImport.setOrigin(authMethodType);
+                userForImport.setPassword(generateRandomFakePasswordBecausePasswordCannotBeNullInBD());
+                userForImport.setEmailConfirmed(true);
+
+                //The createWithValidation method does not call the indexing of a new user, so we call it explicitly.
+                IUser newUser = userService.createWithValidation(userForImport);
+                userService.indexBySolr(newUser);
+                return new ImportResult(userForImport.getUsername(), ImportResult.ImportResultState.CREATED);
+            }
+        } catch (Exception ex) {
+
+            return new ImportResult(
+                    userForImport.getUsername(),
+                    ImportResult.ImportResultState.ERROR,
+                    ex.getMessage()
+            );
+        }
+    }
+
+    private String generateRandomFakePasswordBecausePasswordCannotBeNullInBD() {
+
+        return String.format("MockPass-%s", UUID.randomUUID().toString());
+    }
+
+    public ImportResult importOne(ProfessionalType professionalType, String username) {
+
+
+
+        org.ohdsi.authenticator.model.User authUser = authUserService
+                .findUser(authenticationHelperService.getCurrentMethodType(), username)
+                .orElseThrow(() -> new IllegalStateException(String.format("Cannot synchronize user, there is no (%s) user", username)));
+
+        User user = converter.convert(authUser);
+        return doImport(professionalType, user);
+    }
+
+    public List<ImportResult> importAll(ProfessionalType defaultProfessionalType) {
+
+        List<User> users = authUserService
+                .findAllUsers(authenticationHelperService.getCurrentMethodType())
+                .stream()
+                .map(this.converter::convert)
+                .collect(Collectors.toList());
+        return doImport(defaultProfessionalType, users);
+    }
+
+    public void synchronizeUserWithExternalSourceIfPossible(String username) {
+
+        AuthService authService = authenticationHelperService.getCurrentAuthService();
+        String authMethodType = authService.getMethodType();
+        if (!supportedMethodTypes.contains(StringUtils.upperCase(authMethodType))) {
+            return;
+        }
+
+        ProfessionalType professionalType = getRandomProfessionalType()
+                .orElseThrow(() -> new AuthenticationException("There is no any profession type."));
+        ImportResult importResult = importOne(professionalType, username);
+        if (importResult.getState() == ImportResult.ImportResultState.ERROR) {
+            throw new UsernameNotFoundException("Cannot import user from an external source");
+        }
+    }
+
+    private Optional<ProfessionalType> getRandomProfessionalType() {
+
+        return Lists.newArrayList(professionalTypeService.list())
+                .stream()
+                .findAny();
+    }
+
+}

From cc4e1301c269dc763ca8d2e3fd3b9b9495e3387c Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Thu, 1 Apr 2021 12:33:15 +0200
Subject: [PATCH 11/12] Arachne RC 1.17.1-QA

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cf55b38ae..086483ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>portal</artifactId>
     <groupId>com.odysseusinc.arachne</groupId>
-    <version>1.17.1-SNAPSHOT</version>
+    <version>1.17.1-QA</version>
     <packaging>jar</packaging>
 
     <parent>

From 2b4324614929a785f9268548ec989b20bfc91e03 Mon Sep 17 00:00:00 2001
From: alex cumarav <tsumarev@gmail.com>
Date: Thu, 8 Apr 2021 13:01:55 +0200
Subject: [PATCH 12/12] Arachne Release 1.17.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 086483ced..6a04acd55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>portal</artifactId>
     <groupId>com.odysseusinc.arachne</groupId>
-    <version>1.17.1-QA</version>
+    <version>1.17.1</version>
     <packaging>jar</packaging>
 
     <parent>