garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

login by name or email

Browse Source
This commit is contained in:
Athou
2014-08-12 19:55:57 +02:00
parent 3c935a0b67
commit 34d7cb949d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/app/templates/welcome.html
View File

@@ -22,7 +22,7 @@
<div class="feedback alert alert-danger" ng-if="message">{{message}}</div>
<form ng-submit="login()">
<div class="form-group">
<label for="username">User Name</label>
<label for="username">User Name or E-mail</label>
<input type="text" name="username" class="form-control" ng-model="model.name"></input>
</div>
<div class="form-group">

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

@@ -31,12 +31,15 @@ public class UserService {
private final PasswordEncryptionService encryptionService;
private final CommaFeedConfiguration config;
public Optional<User> login(String name, String password) {
if (name == null || password == null) {
public Optional<User> login(String nameOrEmail, String password) {
if (nameOrEmail == null || password == null) {
return Optional.absent();
}
User user = userDAO.findByName(name);
User user = userDAO.findByName(nameOrEmail);
if (user == null) {
user = userDAO.findByEmail(nameOrEmail);
}
if (user != null && !user.isDisabled()) {
boolean authenticated = encryptionService.authenticate(password, user.getPassword(), user.getSalt());
if (authenticated) {