Add user management to rolepage. Add ldap-parameter to role entity

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -34,6 +34,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
 		dbUpdates.add(new String[] { "DELETE FROM application_permissions WHERE application = 'MAP' and permission = 'RELEASE_PLACE'" });
 		dbUpdates.add(new String[] { "ALTER TABLE site_page_content ADD COLUMN locale varchar(10)" });
 		dbUpdates.add(new String[] { "ALTER TABLE products ALTER COLUMN vat TYPE NUMERIC(4,3)" });
+		dbUpdates.add(new String[] { "ALTER TABLE roles ADD ldap_role boolean not null default false" });
 	}
 
 	@EJB

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/RoleBean.java

@@ -21,6 +21,7 @@ import org.slf4j.LoggerFactory;
 
 import fi.codecrew.moya.enums.apps.IAppPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
+import fi.codecrew.moya.facade.EventUserFacade;
 import fi.codecrew.moya.facade.RoleFacade;
 import fi.codecrew.moya.facade.UserFacade;
 import fi.codecrew.moya.model.ApplicationPermission;
@@ -51,6 +52,9 @@ public class RoleBean implements RoleBeanLocal {
 	@EJB
 	private UserFacade userFacade;
 
+	@EJB
+	private EventUserFacade eventuserfacade;
+
 	// VIEW_ALL pitää olla että voidaan hakea roolien perusteella.
 	@Override
 	@RolesAllowed({ UserPermission.S_READ_ROLES, UserPermission.S_VIEW_ALL })
@@ -163,6 +167,22 @@ public class RoleBean implements RoleBeanLocal {
 
 	@Override
 	@RolesAllowed(UserPermission.S_WRITE_ROLES)
+	public Role addRole(EventUser eventuser, Role role)
+	{
+		eventuser = eventuserfacade.reload(eventuser);
+		role = roleFacade.reload(role);
+
+		if (!eventuser.getRoles().contains(role)) {
+			eventuser.getRoles().add(role);
+		}
+		if (!role.getUsers().contains(eventuser)) {
+			role.getUsers().add(eventuser);
+		}
+		return role;
+	}
+
+	@Override
+	@RolesAllowed(UserPermission.S_WRITE_ROLES)
 	public void saveRoles(EventUser usr, List<Role> usersRoles) {
 
 		List<Role> allRoles = roleFacade.findAll();

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -408,12 +408,6 @@ public class UserBean implements UserBeanLocal {
 	// return userFacade.find(id);
 	// }
 
-	@Override
-	@RolesAllowed(UserPermission.S_VIEW_ALL)
-	public SearchResult<User> getUsers(SearchQuery search) {
-		return userFacade.searchAllUsers(search);
-	}
-
 	// @Override
 	// public long getUsersCount(String search) {
 	// return userFacade.searchUserCount(search);
@@ -643,17 +637,23 @@ public class UserBean implements UserBeanLocal {
 	}
 
 	@Override
-	public SearchResult<User> getEventUsers(SearchQuery search) {
-		if (search.getSearch() == null || search.getSearch().isEmpty())
-		{
-			throw new RuntimeException("You should be using getThisEventsUsers if not searching globally...");
-			// return userFacade.searchEventUsers(search);
-		} else {
-			return userFacade.searchAllUsers(search);
-		}
-
+	@RolesAllowed(UserPermission.S_VIEW_ALL)
+	public SearchResult<User> getUsers(SearchQuery search) {
+		return userFacade.searchAllUsers(search);
 	}
 
+	//	@Override
+	//	public SearchResult<User> getEventUsers(SearchQuery search) {
+	//		if (search.getSearch() == null || search.getSearch().isEmpty())
+	//		{
+	//			throw new RuntimeException("You should be using getThisEventsUsers if not searching globally...");
+	//			// return userFacade.searchEventUsers(search);
+	//		} else {
+	//			return userFacade.searchAllUsers(search);
+	//		}
+	//
+	//	}
+	//
 	@Override
 	public SearchResult<EventUser> getThisEventsUsers(UserSearchQuery searchQuery) {
 		SearchResult<EventUser> returnUsers = eventUserFacade.searchEventUsers(searchQuery);
@@ -729,4 +729,9 @@ public class UserBean implements UserBeanLocal {
 		return false;
 	}
 
+	@Override
+	public User getUser(Integer id) {
+		return userFacade.find(id);
+	}
+
 }
\ No newline at end of file

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/RoleBeanLocal.java

@@ -36,4 +36,6 @@ public interface RoleBeanLocal {
 
 	public List<Role> getRoles(EventUser selectedUser);
 
+	Role addRole(EventUser eventuser, Role role);
+
 }

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/UserBeanLocal.java

@@ -26,7 +26,7 @@ public interface UserBeanLocal {
 
 	SearchResult<User> getUsers(SearchQuery search);
 
-	SearchResult<User> getEventUsers(SearchQuery search);
+	//SearchResult<User> getEventUsers(SearchQuery search);
 
 	EventUser mergeChanges(EventUser user);
 
@@ -40,6 +40,8 @@ public interface UserBeanLocal {
 
 	boolean resetPassword(User user, String password, String hash);
 
+	public User getUser(Integer id);
+
 	/**
 	 * Search EventUser entity by User entity ID
 	 * 

code/MoyaDatabase/src/fi/codecrew/moya/model/EventUser.java

@@ -107,7 +107,7 @@ public class EventUser extends GenericEntity {
 
     @OneToMany(mappedBy = "eventUser")
     private List<GameID> gameIDs;
-    
+
     public List<GameID> getGameIDs() {
         return gameIDs;
     }
@@ -115,7 +115,7 @@ public class EventUser extends GenericEntity {
     public void setGameIDs(List<GameID> gameIDs) {
         this.gameIDs = gameIDs;
     }
-    
+
     public EventUser getCreator() {
         return creator;
     }
@@ -449,11 +449,9 @@ public class EventUser extends GenericEntity {
         return ret;
 
     }
-    
+
     public String getShortUserDescriptor() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getNick()).append(" // ").append(getWholeName()).append(" // ").append(getEmail());
-        return sb.toString();
+        return user.getShortUserDescriptor();
     }
 
 }

code/MoyaDatabase/src/fi/codecrew/moya/model/LanEventPrivatePropertyKey.java

@@ -8,6 +8,11 @@ public enum LanEventPrivatePropertyKey {
     CHECKOUT_FI_MERCHANT_PASSWORD(Type.TEXT, null),
     CHECKOUT_FI_MERCHANT_ID(Type.TEXT, null),
     CHECKOUT_FI_KEY_EXPIRE(Type.DATE, null),
+    LDAP_URL(Type.TEXT, null),
+    LDAP_BIND_DN(Type.TEXT, null),
+    LDAP_BIND_PW(Type.TEXT, null),
+    LDAP_USER_OU(Type.TEXT, null),
+    LDAP_GROUP_OU(Type.TEXT, null),
 
     ;
     private enum Type {

code/MoyaDatabase/src/fi/codecrew/moya/model/Role.java

@@ -83,6 +83,9 @@ public class Role extends GenericEntity {
             inverseJoinColumns = { @JoinColumn(name = "org_role_id", referencedColumnName = OrgRole.ID_COLUMN) })
     private List<OrgRole> orgRoles;
 
+    @Column(name = "ldap_role", nullable = false)
+    private boolean ldapRole = false;
+
     public Role() {
         super();
     }
@@ -206,4 +209,12 @@ public class Role extends GenericEntity {
         this.orgRoles = orgRoles;
     }
 
+    public boolean isLdapRole() {
+        return ldapRole;
+    }
+
+    public void setLdapRole(boolean ldapRole) {
+        this.ldapRole = ldapRole;
+    }
+
 }

code/MoyaDatabase/src/fi/codecrew/moya/model/User.java

@@ -12,7 +12,6 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
@@ -367,4 +366,10 @@ public class User extends GenericEntity implements IUser {
         this.licenseCodes = codes;
     }
 
+    public String getShortUserDescriptor() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getNick()).append(" // ").append(getWholeName()).append(" // ").append(getEmail());
+        return sb.toString();
+    }
+
 }

code/MoyaWeb/WebContent/resources/cditools/role/edit.xhtml

@@ -2,7 +2,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
-	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:role="http://java.sun.com/jsf/composite/tools/role">
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:role="http://java.sun.com/jsf/composite/tools/role">
 
 
 <composite:interface>
@@ -10,6 +11,7 @@
 
 <composite:implementation>
 
+
 	<p>
 		<h:form id="roleform">
 			<f:facet name="errorMessage">
@@ -20,33 +22,65 @@
 		</h:form>
 	</p>
 
-	<h2>#{i18n['role.permissionheader']}</h2>
-	<p>
-		<h:form id="permissionform">
-			<h:commandButton id="save1" value="#{i18n['role.savePermissions']}" action="#{roleView.savePermissions}" />
-			<h:dataTable border="1" id="bortalApps" value="#{roleView.rolePermissions}" var="bapp">
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{i18n['applicationPermission.name']}" />
-					</f:facet>
-					<h:outputText value="#{bapp.name}" />
-				</h:column>
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{i18n['applicationPermission.description']}" />
-					</f:facet>
-					<h:outputText value="#{i18n[bapp.key]}" />
-				</h:column>
-				<h:column>
-					<h:selectManyCheckbox id="permissions" layout="pageDirection" value="#{bapp.selected}">
-						<f:selectItems value="#{bapp.permissions}" var="per" itemLabel="#{i18n[per.i18nKey]}" />
-					</h:selectManyCheckbox>
-				</h:column>
-			</h:dataTable>
-			<h:commandButton id="save2" value="#{i18n['role.savePermissions']}" action="#{roleView.savePermissions}" />
+		<h:form id="addmember">
+			<h:outputText value="#{i18n['roleView.adduser']}" />
+
+			<p:autoComplete id="useradder" value="#{roleView.addableUser}" completeMethod="#{roleView.searchUser}" converter="#{userConverter}" var="usr" itemValue="#{usr}"
+				itemLabel="#{usr.shortUserDescriptor}">
+				<p:ajax onerror="location.reload(true);" update=":editor:addmember,:editor:memberlist" event="itemSelect" listener="#{roleView.addUser}" />
+			</p:autoComplete>
 
 		</h:form>
-	</p>
+		<h:dataTable id="memberlist" value="#{roleView.role.users}" var="usr">
+			<h:column>
+				<h:outputText value="#{usr.login}" />
+			</h:column>
+			<h:column>
+				<h:outputText value="#{usr.nick}" />
+			</h:column>
+			<h:column>
+				<h:outputText value="#{usr.wholeName}" />
+			</h:column>
+			<h:column>
+				<h:outputText value="#{usr.email}" />
+			</h:column>
+
+		</h:dataTable>
+
+
+
+	<button id="roledisplayer" onclick='$("#roleeditor").show(); $(this).hide();'>#{i18n['role.showPermissioneditor']}</button>
+
+	<div id="roleeditor" style="display: none">
+		<button onclick='$("#roleeditor").hide(); $("#roledisplayer").show();'>#{i18n['role.hidePermissioneditor']}</button>
+		<h2>#{i18n['role.permissionheader']}</h2>
+		<p>
+			<h:form id="permissionform">
+				<h:commandButton id="save1" value="#{i18n['role.savePermissions']}" action="#{roleView.savePermissions}" />
+				<h:dataTable border="1" id="bortalApps" value="#{roleView.rolePermissions}" var="bapp">
+					<h:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['applicationPermission.name']}" />
+						</f:facet>
+						<h:outputText value="#{bapp.name}" />
+					</h:column>
+					<h:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['applicationPermission.description']}" />
+						</f:facet>
+						<h:outputText value="#{i18n[bapp.key]}" />
+					</h:column>
+					<h:column>
+						<h:selectManyCheckbox id="permissions" layout="pageDirection" value="#{bapp.selected}">
+							<f:selectItems value="#{bapp.permissions}" var="per" itemLabel="#{i18n[per.i18nKey]}" />
+						</h:selectManyCheckbox>
+					</h:column>
+				</h:dataTable>
+				<h:commandButton id="save2" value="#{i18n['role.savePermissions']}" action="#{roleView.savePermissions}" />
+
+			</h:form>
+		</p>
+	</div>
 
 
 </composite:implementation>

code/MoyaWeb/WebContent/role/edit.xhtml

@@ -12,7 +12,7 @@
 			<f:event type="preRenderView" listener="#{roleView.initViewFromId()}" />
 		</f:metadata>
 		<ui:define name="content">
-			<role:edit />
+			<role:edit id="editor"/>
 		</ui:define>
 	</ui:composition>
 </h:body>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/RoleView.java

@@ -15,11 +15,16 @@ import org.slf4j.LoggerFactory;
 
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.RoleBeanLocal;
+import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.enums.BortalApplication;
 import fi.codecrew.moya.enums.apps.IAppPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.ApplicationPermission;
+import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Role;
+import fi.codecrew.moya.model.User;
+import fi.codecrew.moya.util.UserSearchQuery;
+import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.helpers.BortalApplicationWrapper;
 
@@ -41,6 +46,10 @@ public class RoleView extends GenericCDIView {
 	private transient EventBeanLocal eventbean;
 
 	private ArrayList<BortalApplicationWrapper> rolePermissions;
+	@EJB
+	private UserBeanLocal userbean;
+
+	private User addableUser;
 
 	private static final Logger logger = LoggerFactory.getLogger(RoleView.class);
 
@@ -59,6 +68,23 @@ public class RoleView extends GenericCDIView {
 		}
 	}
 
+	public void addUser()
+	{
+		EventUser eu = userbean.getEventUser(addableUser);
+		role = rolebean.addRole(eu, role);
+		addableUser = null;
+	}
+
+	public List<User> searchUser(String user)
+	{
+		// By default this returns only 20 first results.
+		UserSearchQuery usq = new UserSearchQuery();
+		usq.setSearch(user);
+		usq.setOnlyThisEvent(false);
+		SearchResult<User> ret = userbean.getUsers(usq);
+		return ret.getResults();
+	}
+
 	public boolean isCanReadRoles() {
 		return permbean.hasPermission(UserPermission.READ_ROLES);
 	}
@@ -170,4 +196,12 @@ public class RoleView extends GenericCDIView {
 		initPermissions();
 	}
 
+	public User getAddableUser() {
+		return addableUser;
+	}
+
+	public void setAddableUser(User addableUser) {
+		this.addableUser = addableUser;
+	}
+
 }

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserSearchView.java

@@ -76,11 +76,11 @@ public class UserSearchView extends PaginationView<User> {
 					this.setRowCount(new Long(sr.getResultcount()).intValue());
 					setResultcount(sr.getResultcount());
 					setEventUserResults(sr.getResults());
-					
+
 					return sr.getResults();
 
 				}
-				
+
 				@Override
 				public void setRowIndex(int rowIndex) {
 					if (getPageSize() == 0) {
@@ -99,7 +99,7 @@ public class UserSearchView extends PaginationView<User> {
 				this.setEventUserResults(eventusers.getResults());
 			}
 			else {
-				super.setResult(userbean.getEventUsers(getSearchQuery()));
+				super.setResult(userbean.getUsers(getSearchQuery()));
 			}
 			super.beginConversation();
 		}