Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

change role to enum

Browse Source
This commit is contained in:
Athou
2013-03-30 19:06:32 +01:00
parent 06aa9c4a6f
commit d8b8f6617a
15 changed files with 77 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/commafeed/backend/dao/UserService.java
View File

@@ -8,8 +8,8 @@ import javax.inject.Inject;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
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;
@@ -34,7 +34,7 @@ public class UserService extends GenericDAO<User> {
return null;
}
public User register(String name, String password, Collection<String> roles) {
public User register(String name, String password, Collection<Role> roles) {
List<User> users = findByField(MF.i(proxy().getName()), name);
if (!users.isEmpty()) {
return null;
@@ -45,7 +45,7 @@ public class UserService extends GenericDAO<User> {
user.setSalt(salt);
user.setPassword(encryptionService.getEncryptedPassword(password, salt));
user.getRoles().add(new UserRole(user, Role.USER));
for (String role : roles) {
for (Role role : roles) {
user.getRoles().add(new UserRole(user, role));
user.getRoles().add(new UserRole(user, role));
}