From 63b0633e3531d379d2f5add8d298b9ca7cb7f2dd Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 6 May 2011 14:53:47 +0000 Subject: [PATCH] NIHVIVO-2279 First stab at UserAccountsListController --- webapp/config/web.xml | 10 + .../webapp/auth/permissions/Permission.java | 11 + .../auth/permissions/PermissionSet.java | 40 +++ .../webapp/controller/VitroHttpServlet.java | 13 + .../accounts/BogusPermissionSetDao.java | 81 +++++ .../accounts/UserAccountsListController.java | 307 ++++++++++++++++++ .../accounts/UserAccountsOrdering.java | 41 ++- .../UserAccountsSelectionCriteria.java | 3 + .../accounts/UserAccountsSelector.java | 6 +- .../freemarker/SiteAdminController.java | 5 + .../vitro/webapp/dao/PermissionSetDao.java | 16 + .../vitro/webapp/dao/UserAccountDao.java | 36 ++ .../body/accounts/userAccounts-list.ftl | 134 ++++++++ 13 files changed, 696 insertions(+), 7 deletions(-) create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSet.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/BogusPermissionSetDao.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsListController.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PermissionSetDao.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountDao.java create mode 100644 webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl diff --git a/webapp/config/web.xml b/webapp/config/web.xml index 16435bfbd..24900498f 100644 --- a/webapp/config/web.xml +++ b/webapp/config/web.xml @@ -776,6 +776,7 @@ /addRestriction + UsersListingController edu.cornell.mannlib.vitro.webapp.controller.edit.listing.UsersListingController @@ -785,6 +786,15 @@ /listUsers + + UserAccountsList + edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsListController + + + UserAccountsList + /listUserAccounts + + StatementChangeListingController edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.StatementChangeListingController diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java new file mode 100644 index 000000000..33a5b5261 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java @@ -0,0 +1,11 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.auth.permissions; + +/** + * Base class that describes a unit of authorization, or permission to perform + * requested actions. + */ +public abstract class Permission { + // no members +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSet.java new file mode 100644 index 000000000..75047ba4d --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSet.java @@ -0,0 +1,40 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.auth.permissions; + +import java.util.Set; + +/** + * Reflects a collection of Permissions that can be made available to a user. + * Similar to the concept of a Role. + */ +public class PermissionSet { + private String uri; + private String label; + private Set permissions; + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public Set getPermissions() { + return permissions; + } + + public void setPermissions(Set permissions) { + this.permissions = permissions; + } + +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java index 9e64ea309..1aa9f51d8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.List; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.ServletRequest; @@ -205,4 +206,16 @@ public class VitroHttpServlet extends HttpServlet { "accept-language", "accept-encoding", "accept-charset", "keep-alive", "connection" })); + /** + * A child class may call this if logging is set to debug level. + */ + protected void dumpRequestParameters(HttpServletRequest req) { + @SuppressWarnings("unchecked") + Map map = req.getParameterMap(); + for (String key : map.keySet()) { + String[] values = map.get(key); + log.debug("Parameter '" + key + "' = " + + Arrays.deepToString(values)); + } + } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/BogusPermissionSetDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/BogusPermissionSetDao.java new file mode 100644 index 000000000..23617dc82 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/BogusPermissionSetDao.java @@ -0,0 +1,81 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.accounts; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSet; +import edu.cornell.mannlib.vitro.webapp.dao.PermissionSetDao; + +/** + * TODO Destroy this as soon as PermissionSetDaoJena is in place. + */ +public class BogusPermissionSetDao implements PermissionSetDao { + private static final Log log = LogFactory + .getLog(BogusPermissionSetDao.class); + + private final Map map; + + public BogusPermissionSetDao() { + Map psMap = new HashMap(); + putPermissionSet(psMap, createDbaPermissionSet()); + putPermissionSet(psMap, createCuratorPermissionSet()); + putPermissionSet(psMap, createEditorPermissionSet()); + putPermissionSet(psMap, createSelfEditorPermissionSet()); + this.map = Collections.unmodifiableMap(psMap); + } + + private void putPermissionSet(Map psMap, + PermissionSet ps) { + psMap.put(ps.getUri(), ps); + } + + private PermissionSet createDbaPermissionSet() { + PermissionSet ps = new PermissionSet(); + ps.setUri("http://vivo.mydomain.edu/individual/role1"); + ps.setLabel("DBA"); + return ps; + } + + private PermissionSet createCuratorPermissionSet() { + PermissionSet ps = new PermissionSet(); + ps.setUri("http://vivo.mydomain.edu/individual/role2"); + ps.setLabel("Curator"); + return ps; + } + + private PermissionSet createEditorPermissionSet() { + PermissionSet ps = new PermissionSet(); + ps.setUri("http://vivo.mydomain.edu/individual/role3"); + ps.setLabel("Editor"); + return ps; + } + + private PermissionSet createSelfEditorPermissionSet() { + PermissionSet ps = new PermissionSet(); + ps.setUri("http://vivo.mydomain.edu/individual/role4"); + ps.setLabel("Self-Editor"); + return ps; + } + + @Override + public PermissionSet getPermissionSetByUri(String uri) { + PermissionSet permissionSet = map.get(uri); + if (permissionSet == null) { + log.warn("Can't find a PermissionSet for uri '" + uri + "'"); + } + return permissionSet; + } + + @Override + public Collection getAllPermissionSets() { + return new ArrayList(map.values()); + } +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsListController.java new file mode 100644 index 000000000..3fb910b93 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsListController.java @@ -0,0 +1,307 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.accounts; + +import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria.DEFAULT_ACCOUNTS_PER_PAGE; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.ontology.OntModel; + +import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSet; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; +import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; +import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Direction; +import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.dao.PermissionSetDao; +import edu.cornell.mannlib.vitro.webapp.dao.UserAccountDao; +import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; + +/** + * Display the paginated list of User Accounts. + */ +public class UserAccountsListController extends FreemarkerHttpServlet { + private static final Log log = LogFactory + .getLog(UserAccountsListController.class); + + public static final String PARAMETER_ACCOUNTS_PER_PAGE = "accountsPerPage"; + public static final String PARAMETER_PAGE_INDEX = "pageIndex"; + public static final String PARAMETER_ORDERING_DIRECTION = "orderDirection"; + public static final String PARAMETER_ORDERING_FIELD = "orderField"; + public static final String PARAMETER_ROLE_FILTER_URI = "roleFilterUri"; + public static final String PARAMETER_SEARCH_TERM = "searchTerm"; + public static final String PARAMETER_NEW_USER_URI = "newUserUri"; + public static final String PARAMETER_UPDATED_USER_URI = "updatedUserUri"; + public static final String FLAG_UPDATED_USER_PW = "updatedUserPw"; + public static final String FLAG_USERS_DELETED = "usersDeleted"; + + private static final String TEMPLATE_NAME = "userAccounts-list.ftl"; + + private OntModel userAccountsModel; + private PermissionSetDao permissionSetDao; + private UserAccountDao userAccountDao; + + @Override + public void init() throws ServletException { + super.init(); + OntModelSelector oms = (OntModelSelector) getServletContext() + .getAttribute("baseOntModelSelector"); + userAccountsModel = oms.getUserAccountsModel(); + + // TODO Fix this when we have a real framework for PermissionSetDao + permissionSetDao = new BogusPermissionSetDao(); + } + + @Override + protected Actions requiredActions(VitroRequest vreq) { + return new Actions(new ManageUserAccounts()); + } + + /** + * Assume the default criteria for display. Modify the criteria based on + * parameters in the request. Get the selected accounts and display them. + */ + @Override + protected ResponseValues processRequest(VitroRequest vreq) { + if (log.isDebugEnabled()) { + dumpRequestParameters(vreq); + } + + Map body = new HashMap(); + + UserAccountsSelectionCriteria criteria = buildCriteria(vreq); + + body.put("accountsPerPage", criteria.getAccountsPerPage()); + body.put("pageIndex", criteria.getPageIndex()); + body.put("orderDirection", criteria.getOrderBy().getDirection().keyword); + body.put("orderField", criteria.getOrderBy().getField().name); + body.put("roleFilterUri", criteria.getRoleFilterUri()); + body.put("searchTerm", criteria.getSearchTerm()); + + UserAccountsSelection selection = UserAccountsSelector.select( + userAccountsModel, criteria); + + body.put("accounts", wrapUserAccounts(selection)); + body.put("total", selection.getResultCount()); + body.put("page", buildPageMap(selection)); + + body.put("formUrl", buildFormUrl(vreq)); + body.put("roles", buildRolesList()); + + body.put("messages", buildMessagesMap(vreq)); + + return new TemplateResponseValues(TEMPLATE_NAME, body); + } + + private UserAccountsSelectionCriteria buildCriteria(VitroRequest vreq) { + int accountsPerPage = getIntegerParameter(vreq, + PARAMETER_ACCOUNTS_PER_PAGE, DEFAULT_ACCOUNTS_PER_PAGE); + int pageIndex = getIntegerParameter(vreq, PARAMETER_PAGE_INDEX, 1); + + Direction orderingDirection = Direction.fromKeyword(vreq + .getParameter(PARAMETER_ORDERING_DIRECTION)); + Field orderingField = Field.fromName(vreq + .getParameter(PARAMETER_ORDERING_FIELD)); + UserAccountsOrdering ordering = new UserAccountsOrdering(orderingField, + orderingDirection); + + String roleFilterUri = getStringParameter(vreq, + PARAMETER_ROLE_FILTER_URI, ""); + String searchTerm = getStringParameter(vreq, PARAMETER_SEARCH_TERM, ""); + + return new UserAccountsSelectionCriteria(accountsPerPage, pageIndex, + ordering, roleFilterUri, searchTerm); + } + + private String getStringParameter(VitroRequest vreq, String key, + String defaultValue) { + String value = vreq.getParameter(key); + return (value == null) ? defaultValue : value; + } + + private int getIntegerParameter(VitroRequest vreq, String key, + int defaultValue) { + String value = vreq.getParameter(key); + if (value == null) { + return defaultValue; + } + + try { + return Integer.parseInt(value); + } catch (NumberFormatException e) { + log.warn("Invalid integer for parameter '" + key + "': " + value); + return defaultValue; + } + } + + private Map buildPageMap(UserAccountsSelection selection) { + int currentPage = selection.getCriteria().getPageIndex(); + + float pageCount = ((float) selection.getResultCount()) + / selection.getCriteria().getAccountsPerPage(); + int lastPage = (int) Math.ceil(pageCount); + + Map map = new HashMap(); + + map.put("current", currentPage); + map.put("first", 1); + map.put("last", lastPage); + + if (currentPage < lastPage) { + map.put("next", currentPage + 1); + } + if (currentPage > 1) { + map.put("previous", currentPage - 1); + } + + return map; + } + + private String buildFormUrl(VitroRequest vreq) { + UrlBuilder urlBuilder = new UrlBuilder(vreq.getAppBean()); + return urlBuilder.getPortalUrl("/listUserAccounts"); + } + + private List buildRolesList() { + List list = new ArrayList(); + list.addAll(permissionSetDao.getAllPermissionSets()); + Collections.sort(list, new Comparator() { + @Override + public int compare(PermissionSet ps1, PermissionSet ps2) { + return ps1.getUri().compareTo(ps2.getUri()); + } + }); + return list; + } + + private Map buildMessagesMap(VitroRequest vreq) { + Map map = new HashMap(); + + UserAccount newUser = getUserFromUriParameter(vreq, + PARAMETER_NEW_USER_URI); + if (newUser != null) { + map.put("newUser", newUser); + } + + UserAccount updatedUser = getUserFromUriParameter(vreq, + PARAMETER_UPDATED_USER_URI); + if (updatedUser != null) { + map.put("updatedUser", updatedUser); + } + + if (isFlagOnRequest(vreq, FLAG_UPDATED_USER_PW)) { + map.put("updatedUserPw", true); + } + + if (isFlagOnRequest(vreq, FLAG_USERS_DELETED)) { + map.put("usersDeleted", true); + } + + return map; + } + + private UserAccount getUserFromUriParameter(VitroRequest vreq, String key) { + String uri = vreq.getParameter(key); + if ((uri == null) || uri.isEmpty()) { + return null; + } + + return userAccountDao.getUserAccountByUri(uri); + } + + private boolean isFlagOnRequest(VitroRequest vreq, String key) { + String value = vreq.getParameter(key); + return (value != null); + } + + /** + * The UserAccount has a list of PermissionSetUris, but the Freemarker + * template needs a list of PermissionSet labels instead. + */ + private List wrapUserAccounts( + UserAccountsSelection selection) { + List list = new ArrayList(); + for (UserAccount account : selection.getUserAccounts()) { + list.add(new UserAccountWrapper(account, + findPermissionSetLabels(account))); + } + return list; + } + + private List findPermissionSetLabels(UserAccount account) { + List labels = new ArrayList(); + for (String uri : account.getPermissionSetUris()) { + PermissionSet pSet = permissionSetDao.getPermissionSetByUri(uri); + if (pSet != null) { + labels.add(pSet.getLabel()); + } + } + return labels; + } + + /** + * Shows PermissionSet labels instead of PermissionSet URIs. + */ + public static class UserAccountWrapper { + private final UserAccount account; + private final List permissionSets; + + public UserAccountWrapper(UserAccount account, + List permissionSets) { + this.account = account; + this.permissionSets = permissionSets; + } + + public String getUri() { + return account.getUri(); + } + + public String getEmailAddress() { + return account.getEmailAddress(); + } + + public String getFirstName() { + return account.getFirstName(); + } + + public String getLastName() { + return account.getLastName(); + } + + public int getLoginCount() { + return account.getLoginCount(); + } + + public String getStatus() { + Status status = account.getStatus(); + if (status == null) { + return ""; + } else { + return status.toString(); + } + } + + public List getPermissionSets() { + return permissionSets; + } + + } + +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java index dddda8e33..506cb8964 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts; + /** * How are the accounts to be sorted? */ @@ -9,6 +10,22 @@ public class UserAccountsOrdering { public enum Direction { ASCENDING("ASC"), DESCENDING("DESC"); + public static Direction DEFAULT_DIRECTION = ASCENDING; + + public static Direction fromKeyword(String keyword) { + if (keyword == null) { + return DEFAULT_DIRECTION; + } + + for (Direction d : Direction.values()) { + if (d.keyword.equals(keyword)) { + return d; + } + } + + return DEFAULT_DIRECTION; + } + public final String keyword; Direction(String keyword) { @@ -20,15 +37,31 @@ public class UserAccountsOrdering { EMAIL("email"), FIRST_NAME("firstName"), LAST_NAME("lastName"), STATUS( "status"), ROLE("ps"), LOGIN_COUNT("count"); - public final String variableName; + public static Field DEFAULT_FIELD = EMAIL; - Field(String variableName) { - this.variableName = variableName; + public static Field fromName(String name) { + if (name == null) { + return DEFAULT_FIELD; + } + + for (Field f : Field.values()) { + if (f.name.equals(name)) { + return f; + } + } + + return DEFAULT_FIELD; + } + + public final String name; + + Field(String name) { + this.name = name; } } public static final UserAccountsOrdering DEFAULT_ORDERING = new UserAccountsOrdering( - Field.EMAIL, Direction.ASCENDING); + Field.DEFAULT_FIELD, Direction.DEFAULT_DIRECTION); private final Field field; private final Direction direction; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java index a95e31451..65f1d6a3b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java @@ -7,6 +7,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts; * On what basis are we selecting user accounts? */ public class UserAccountsSelectionCriteria { + public static final int DEFAULT_ACCOUNTS_PER_PAGE = 25; + /** How many accounts should we bring back, at most? */ private final int accountsPerPage; @@ -66,4 +68,5 @@ public class UserAccountsSelectionCriteria { private T nonNull(T t, T nullValue) { return (t == null) ? nullValue : t; } + } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java index 363356f85..b1ca4cbfa 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java @@ -171,11 +171,11 @@ public class UserAccountsSelector { private String ordering() { UserAccountsOrdering orderBy = criteria.getOrderBy(); String keyword = orderBy.getDirection().keyword; - String variable = orderBy.getField().variableName; + String variable = orderBy.getField().name; if (orderBy.getField() == Field.EMAIL) { return keyword + "(?" + variable + ")"; } else { - return keyword + "(?" + variable + ") ?" + Field.EMAIL.variableName; + return keyword + "(?" + variable + ") ?" + Field.EMAIL.name; } } @@ -272,7 +272,7 @@ public class UserAccountsSelector { user.setMd5password(ifLiteralPresent(solution, "pwd", "")); user.setPasswordChangeExpires(ifLongPresent(solution, "expire", 0L)); user.setLoginCount(ifIntPresent(solution, "count", 0)); - user.setStatus(parseStatus(solution, "status", Status.INACTIVE)); + user.setStatus(parseStatus(solution, "status", null)); return user; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java index 0911f4d9b..fae4f0aa7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java @@ -19,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOntology; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditSiteInformation; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeSiteAdminPage; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; @@ -123,9 +124,13 @@ public class SiteAdminController extends FreemarkerHttpServlet { urls.put("tabs", urlBuilder.getPortalUrl("/listTabs")); } + // TODO remove this when the UserAccounts are fully implemented. -- jblake if (PolicyHelper.isAuthorizedForActions(vreq, UsersListingController.REQUIRED_ACTIONS)) { urls.put("users", urlBuilder.getPortalUrl("/listUsers")); } + if (PolicyHelper.isAuthorizedForActions(vreq, new ManageUserAccounts())) { + urls.put("userList", urlBuilder.getPortalUrl("/listUserAccounts")); + } if (PolicyHelper.isAuthorizedForActions(vreq, new EditSiteInformation())) { urls.put("siteInfo", urlBuilder.getPortalUrl("/editForm", new ParamMap("controller", "ApplicationBean"))); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PermissionSetDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PermissionSetDao.java new file mode 100644 index 000000000..66f2c6e5e --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PermissionSetDao.java @@ -0,0 +1,16 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.dao; + +import java.util.Collection; + +import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSet; + +/** + * Methods for manipulating PermissionSets. + */ +public interface PermissionSetDao { + public PermissionSet getPermissionSetByUri(String uri); + + public Collection getAllPermissionSets(); +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountDao.java new file mode 100644 index 000000000..3b07c9a30 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountDao.java @@ -0,0 +1,36 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.dao; + +import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; + + +/** + * TODO + */ +public interface UserAccountDao { + + public UserAccount getUserAccountByUri(String uri); + + /** + * 
+	 * public User getUserByUsername(String username);
+	 * 
+	 * public User getUserByURI(String URI);
+	 * 
+	 * public List<User> getAllUsers();
+	 * 
+	 * public void updateUser(User user);
+	 * 
+	 * public String insertUser(User user);
+	 * 
+	 * public void deleteUser(User user);
+	 * 
+	 * public List<String> getIndividualsUserMayEditAs(String userURI);
+	 * 
+	 * public List<String> getUserAccountEmails();
+	 * 
+	 * public String getUserEmailAddress(String userURI);
+	 *
+ */ +} diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl new file mode 100644 index 000000000..bd6fee330 --- /dev/null +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl @@ -0,0 +1,134 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for displaying list of user accounts --> + +

+ Accounts +

+ +
+
+ + + + + +
+ + current page: +
+ + + + show accounts per page + +
+ + sort order: + + <#assign directions = ["ASC", "DESC"]> + + +
+ + sort field: + + <#assign fields = ["email", "firstName", "lastName", "status", "count"]> + + +
+ + search term: + +
+ + + +
+ + +
+
+ +
+ Current page: ${page.current} +
Last page: ${page.last} + + <#if page.next?has_content> +
Next page: ${page.next} + + + + <#if page.previous?has_content> +
Previous page: ${page.previous} + + +
+ +
+ + + + + + + + + + <#list accounts as account> + + + + + + + + + +
Email AddressFirst NameLast NameStatusRolesLogin Count
+ + + + ${account.emailAddress} + + ${account.firstName}${account.lastName}${account.status} + <#list account.permissionSets as permissionSet> +
${permissionSet}
+ + 		${account.loginCount}
+
+ + link on user's email address currently does nothing +