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

case insensitive login (fixes #16)

Browse Source
This commit is contained in:
Athou
2013-04-06 17:10:38 +02:00
parent b2421eb1ff
commit 4cb77f5a73
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,16 @@
package com.commafeed.backend.dao;
import java.util.Collection;
import java.util.List;
import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.persistence.NoResultException;
import javax.persistence.TypedQuery;
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.frontend.utils.ModelFactory.MF;
import com.google.common.collect.Iterables;
@Stateless
@SuppressWarnings("serial")
@@ -20,9 +19,21 @@ public class UserService extends GenericDAO<User> {
@Inject
PasswordEncryptionService encryptionService;
private User findByName(String name) {
TypedQuery<User> query = em.createNamedQuery("User.byName", User.class);
query.setParameter("name", name.toLowerCase());
User user = null;
try {
user = query.getSingleResult();
} catch (NoResultException e) {
user = null;
}
return user;
}
public User login(String name, String password) {
List<User> users = findByField(MF.i(MF.p(User.class).getName()), name);
User user = Iterables.getFirst(users, null);
User user = findByName(name);
if (user != null && !user.isDisabled()) {
boolean authenticated = encryptionService.authenticate(password,
user.getPassword(), user.getSalt());
@@ -35,8 +46,7 @@ public class UserService extends GenericDAO<User> {
}
public User register(String name, String password, Collection<Role> roles) {
List<User> users = findByField(MF.i(proxy().getName()), name);
if (!users.isEmpty()) {
if (findByName(name) != null) {
return null;
}
User user = new User();