partial user administration

src/main/java/com/commafeed/backend/StartupBean.java

@@ -1,5 +1,7 @@
 package com.commafeed.backend;
 
+import java.util.Arrays;
+
 import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
@@ -16,7 +18,6 @@ import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
-import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.security.PasswordEncryptionService;
 import com.commafeed.backend.security.Role;
 
@@ -47,24 +48,9 @@ public class StartupBean {
 		if (userService.getCount() == 0) {
 			log.info("Populating database with default values");
 
-			User user = new User();
-			byte[] salt = encryptionService.generateSalt();
-			user.setName("admin");
-			user.getRoles().add(new UserRole(user, Role.ADMIN));
-			user.getRoles().add(new UserRole(user, Role.USER));
-			user.setSalt(salt);
-			user.setPassword(encryptionService.getEncryptedPassword("admin",
-					salt));
-			userService.save(user);
-
-			User testUser = new User();
-			byte[] saltTest = encryptionService.generateSalt();
-			testUser.setName("test");
-			testUser.getRoles().add(new UserRole(testUser, Role.USER));
-			testUser.setSalt(saltTest);
-			testUser.setPassword(encryptionService.getEncryptedPassword("test",
-					saltTest));
-			userService.save(testUser);
+			User user = userService.register("admin", "admin",
+					Arrays.asList(Role.ADMIN, Role.USER));
+			userService.register("test", "test", Arrays.asList(Role.USER));
 
 			Feed dilbert = new Feed(
 					"http://feed.dilbert.com/dilbert/daily_strip");

src/main/java/com/commafeed/backend/dao/UserRoleService.java

@@ -1,5 +1,6 @@
 package com.commafeed.backend.dao;
 
+import java.util.List;
 import java.util.Set;
 
 import javax.ejb.Stateless;
@@ -13,6 +14,10 @@ import com.google.common.collect.Sets;
 @Stateless
 public class UserRoleService extends GenericDAO<UserRole, Long> {
 
+	public List<UserRole> findAll(User user) {
+		return findByField(MF.i(MF.p(UserRole.class).getUser()), user);
+	}
+
 	public Set<String> getRoles(User user) {
 		Set<String> list = Sets.newHashSet();
 		for (UserRole role : findByField(MF.i(proxy().getUser()), user)) {

src/main/java/com/commafeed/backend/dao/UserService.java

@@ -1,12 +1,15 @@
 package com.commafeed.backend.dao;
 
+import java.util.Collection;
 import java.util.List;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
 import com.commafeed.backend.model.User;
+import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.security.PasswordEncryptionService;
+import com.commafeed.backend.security.Role;
 import com.commafeed.frontend.utils.ModelFactory.MF;
 import com.google.common.collect.Iterables;
 
@@ -30,4 +33,23 @@ public class UserService extends GenericDAO<User, Long> {
 
 		return null;
 	}
+
+	public User register(String name, String password, Collection<String> roles) {
+		List<User> users = findByField(MF.i(proxy().getName()), name);
+		if (!users.isEmpty()) {
+			return null;
+		}
+		User user = new User();
+		byte[] salt = encryptionService.generateSalt();
+		user.setName(name);
+		user.setSalt(salt);
+		user.setPassword(encryptionService.getEncryptedPassword(password, salt));
+		user.getRoles().add(new UserRole(user, Role.USER));
+		for (String role : roles) {
+			user.getRoles().add(new UserRole(user, role));
+			user.getRoles().add(new UserRole(user, role));
+		}
+		save(user);
+		return user;
+	}
 }