From b6be37151a8501ebd97d556e38ed8dec8fae9096 Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Mon, 10 Aug 2015 16:44:05 -0700
Subject: [PATCH] Story ac2 rework. Changed method name from 'loginUser' to
'doLogin'.
---
.../src/ca/nrc/cadc/ac/server/UserPersistence.java | 2 +-
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 4 ++--
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java | 4 ++--
.../src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java | 2 +-
.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
index 720d6d68..f0fab8b6 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
@@ -147,7 +147,7 @@ public interface UserPersistence<T extends Principal>
* @throws TransientException If an temporary, unexpected problem occurred.
* @throws AccessControlException If the operation is not permitted.
*/
- Boolean loginUser(String userID, String password)
+ Boolean doLogin(String userID, String password)
throws UserNotFoundException, TransientException,
AccessControlException;
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index d3d21770..15850110 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -182,7 +182,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
* @throws TransientException
* @throws UserNotFoundException
*/
- public Boolean loginUser(final String username, final String password)
+ public Boolean doLogin(final String username, final String password)
throws TransientException, UserNotFoundException
{
try
@@ -201,7 +201,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
}
catch (LDAPException e)
{
- logger.debug("loginUser Exception: " + e, e);
+ logger.debug("doLogin Exception: " + e, e);
if (e.getResultCode() == ResultCode.INVALID_CREDENTIALS)
{
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
index b0a3c5b3..bacfe86a 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
@@ -214,14 +214,14 @@ public class LdapUserPersistence<T extends Principal>
* @throws TransientException If an temporary, unexpected problem occurred.
* @throws AccessControlException If the operation is not permitted.
*/
- public Boolean loginUser(String userID, String password)
+ public Boolean doLogin(String userID, String password)
throws UserNotFoundException, TransientException, AccessControlException
{
LdapUserDAO<T> userDAO = null;
try
{
userDAO = new LdapUserDAO<T>(this.config);
- return userDAO.loginUser(userID, password);
+ return userDAO.doLogin(userID, password);
}
finally
{
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java
index 260933be..f1daa9db 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java
@@ -106,7 +106,7 @@ public class LoginServlet extends HttpServlet
{
if (StringUtil.hasText(password))
{
- if (new LdapUserPersistence().loginUser(userID, password))
+ if (new LdapUserPersistence().doLogin(userID, password))
{
String token = new SSOCookieManager().generate(new HttpPrincipal(userID));
response.setContentType(CONTENT_TYPE);
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
index 48d6a142..68c0c646 100644
--- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
+++ b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
@@ -454,7 +454,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
{
try
{
- getUserDAO().loginUser(username, password);
+ getUserDAO().doLogin(username, password);
}
catch (Exception e)
{
@@ -510,7 +510,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
{
try
{
- getUserDAO().loginUser(username, password);
+ getUserDAO().doLogin(username, password);
}
catch (Exception e)
{
--
GitLab