use email to find valid and pending users

expose pending georchestraUser attribute

Author: gaetanbrl

commons/src/main/java/org/georchestra/security/api/UsersApi.java

@@ -40,6 +40,11 @@ public interface UsersApi {
      */
     Optional<GeorchestraUser> findByEmail(String email);
 
+    /**
+     * Find pending and validated user by {@link GeorchestraUser#getEmail() email}
+     */
+    Optional<GeorchestraUser> findByEmail(String email, boolean filterPending);
+
     default Optional<GeorchestraUser> findByOAuth2Uid(String oauth2Provider, String oauth2Uid) {
         return Optional.empty();
     };

commons/src/main/java/org/georchestra/security/model/GeorchestraUser.java

@@ -89,6 +89,9 @@ public class GeorchestraUser implements Serializable {
     /** Maps to Account.getOAuth2Provider */
     private String oAuth2Provider;
 
+    /** Maps to Account.isPending */
+    private Boolean pending;
+
     /** Maps to Account.getOAuth2Uid */
     private String oAuth2Uid;
 
@@ -101,4 +104,8 @@ public class GeorchestraUser implements Serializable {
     public void setRoles(List<String> roles) {
         this.roles = roles == null ? new ArrayList<>() : roles;
     }
+
+    public Boolean isPending() {
+        return this.pending;
+    }
 }

ldap-account-management/src/main/java/org/georchestra/ds/security/UsersApiImpl.java

@@ -98,10 +98,17 @@ public Optional<GeorchestraUser> findByOAuth2Uid(String oauth2Provider, String o
 
     @Override
     public Optional<GeorchestraUser> findByEmail(String email) {
+        return findByEmail(email, true);
+    }
+
+    public Optional<GeorchestraUser> findByEmail(String email, boolean filterPending) {
         try {
-            return Optional.of(this.accountsDao.findByEmail(email))//
-                    .filter(notPending().and(notProtected()))//
-                    .map(mapper::map);
+            Predicate<Account> predicate = notProtected();
+            if (filterPending) {
+                predicate = predicate.and(notPending());
+            }
+
+            return Optional.ofNullable(accountsDao.findByEmail(email)).filter(predicate).map(mapper::map);
         } catch (NameNotFoundException e) {
             return Optional.empty();
         } catch (DataServiceException e) {

ldap-account-management/src/main/java/org/georchestra/ds/users/AccountImpl.java

@@ -169,6 +169,8 @@ public class AccountImpl implements Serializable, Account {
     // Json export is defined on the getter getOrg()
     private String org;
     private String orgDisplayName;
+
+    @JsonProperty(UserSchema.PENDING)
     private boolean pending;
     private boolean isExternalAuth;
 

security-proxy-spring-integration/src/main/java/org/georchestra/security/client/console/GeorchestraConsoleUsersApiImpl.java

@@ -67,4 +67,10 @@ public Optional<GeorchestraUser> findByEmail(String email) {
         Objects.requireNonNull(email);
         return client.get("/console/internal/users/email/{email}", GeorchestraUser.class, email);
     }
+
+    @Override
+    public Optional<GeorchestraUser> findByEmail(String email, boolean filterPending) {
+        Objects.requireNonNull(email);
+        return client.get("/console/internal/users/all/email/{email}", GeorchestraUser.class, email);
+    }
 }