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

session support

Browse Source
This commit is contained in:
Athou
2014-08-09 15:25:41 +02:00
parent 21ec54408e
commit 33b683d037
10 changed files with 202 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/commafeed/backend/service/UserService.java
View File

@@ -17,6 +17,7 @@ import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@RequiredArgsConstructor
@@ -30,7 +31,7 @@ public class UserService {
private final PasswordEncryptionService encryptionService;
private final CommaFeedConfiguration config;
public User login(String name, String password) {
public Optional<User> login(String name, String password) {
if (name == null || password == null) {
return null;
}
@@ -58,22 +59,22 @@ public class UserService {
if (saveUser) {
userDAO.saveOrUpdate(user);
}
return user;
return Optional.fromNullable(user);
}
}
return null;
return Optional.absent();
}
public User login(String apiKey) {
public Optional<User> login(String apiKey) {
if (apiKey == null) {
return null;
return Optional.absent();
}
User user = userDAO.findByApiKey(apiKey);
if (user != null && !user.isDisabled()) {
return user;
return Optional.fromNullable(user);
}
return null;
return Optional.absent();
}
public User register(String name, String password, String email, Collection<Role> roles) {