Adds method to look for accounts missing a subject

hms-dbmi · Jan 19, 2024 · 083e980 · 083e980
1 parent 8d6572c
commit 083e980
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java b/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java
@@ -42,6 +42,19 @@ public User findBySubject(String subject) {
                 .getSingleResult();
     }
 
+    public User findByEmailAndConnection(String email, String connectionId) {
+        CriteriaQuery<User> query = em.getCriteriaBuilder().createQuery(User.class);
+        Root<User> queryRoot = query.from(User.class);
+        query.select(queryRoot);
+        CriteriaBuilder cb = cb();
+        return em.createQuery(query
+            .where(
+                cb.equal(queryRoot.join("connection")
+                        .get("id"), connectionId),
+                eq(cb, queryRoot, "email", email)))
+            .getSingleResult();
+    }
+
     public User findBySubjectAndConnection(String subject, String connectionId) {
         CriteriaQuery<User> query = em.getCriteriaBuilder().createQuery(User.class);
         Root<User> queryRoot = query.from(User.class);
@@ -86,8 +99,16 @@ public User findOrCreate(User inputUser) {
                     + ", subject: " + user.getSubject());
         } catch (NoResultException e) {
             logger.debug("findOrCreate() subject " + subject +
-                    " could not be found by `entityManager`, going to create a new user.");
-            user = createUser(inputUser);
+                    " could not be found by `entityManager`, checking by email and connection");
+           try {
+               // If the user isn't found by subject then check by email and connection just
+               // in case they were created by jenkins
+               user = findByEmailAndConnection(inputUser.getEmail(), inputUser.getConnection().getId());
+           } catch (NoResultException ex) {
+               logger.debug("findOrCreate() email " + inputUser.getEmail() +
+                       " could not be found by `entityManager`, creating a new user");
+               user = createUser(inputUser);
+           }
         } catch (NonUniqueResultException e) {
             logger.error("findOrCreate() " + e.getClass().getSimpleName() + ": " + e.getMessage());
         }