Commit 0359a191 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1869. Update LdapUserDAO to throw a UserAlreadyExistsException if the... 

Story 1869. Update LdapUserDAO to throw a UserAlreadyExistsException if the email address is associated with more than one user when we attempt to append a user.
parent 0d4ce557

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java

+16 −3
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ import com.unboundid.ldap.sdk.extensions.PasswordModifyExtendedResult; 
 */

public class LdapUserDAO<T extends Principal> extends LdapDAO

{

    public static final String EMAIL_ADDRESS_CONFLICT_MESSAGE = 

            "More than one user with email address ";

    

    private static final Logger logger = Logger.getLogger(LdapUserDAO.class);



    private final Profiler profiler = new Profiler(LdapUserDAO.class);
@@ -312,7 +315,17 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
                                 " found in " + usersDN;

            throw new UserAlreadyExistsException(error);

        }

        catch (UserNotFoundException ok) { }

        catch (UserNotFoundException unfe) 

        { 

            if (unfe.getMessage().contains(EMAIL_ADDRESS_CONFLICT_MESSAGE))

            {

                throw new UserAlreadyExistsException(unfe.getMessage());

            }

            else

            {

                // ok, user not found

            }

        }

    }

    

    /**
@@ -580,7 +593,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
        {

            if (e.getResultCode() == ResultCode.SIZE_LIMIT_EXCEEDED)

            {

                String msg = "More than one user with email address " + emailAddress + " found";

                String msg = EMAIL_ADDRESS_CONFLICT_MESSAGE + emailAddress + " found";

                logger.debug(msg);

                throw new UserNotFoundException(msg);

            }
@@ -608,7 +621,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
            {

                if (e.getResultCode() == ResultCode.SIZE_LIMIT_EXCEEDED)

                {

                    String msg = "More than one user with email address " + emailAddress + " found";

                    String msg = EMAIL_ADDRESS_CONFLICT_MESSAGE + emailAddress + " found";

                    logger.debug(msg);

                    throw new UserNotFoundException(msg);

                }

cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest 
                Exception e = pae.getException();

                Throwable t = e.getCause();

                assertTrue(e.getCause() instanceof UserNotFoundException);

                assertTrue(e.getCause().getMessage().contains("More than one user"));

                assertTrue(e.getCause().getMessage().contains(LdapUserDAO.EMAIL_ADDRESS_CONFLICT_MESSAGE));

            }

            finally

            {