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

user update should proc with api key and cookie login too

Browse Source
This commit is contained in:
Athou
2014-08-15 12:18:10 +02:00
parent 1456cc40e1
commit 9701af0736
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,25 +43,7 @@ public class UserService {
if (user != null && !user.isDisabled()) { if (user != null && !user.isDisabled()) {
boolean authenticated = encryptionService.authenticate(password, user.getPassword(), user.getSalt()); boolean authenticated = encryptionService.authenticate(password, user.getPassword(), user.getSalt());
if (authenticated) { if (authenticated) {
Date lastLogin = user.getLastLogin(); afterLogin(user);
Date now = new Date();
boolean saveUser = false;
// only update lastLogin field every hour in order to not
// invalidate the cache everytime someone logs in
if (lastLogin == null || lastLogin.before(DateUtils.addHours(now, -1))) {
user.setLastLogin(now);
saveUser = true;
}
if (config.getApplicationSettings().isHeavyLoad()
&& (user.getLastFullRefresh() == null || user.getLastFullRefresh().before(DateUtils.addMinutes(now, -30)))) {
user.setLastFullRefresh(now);
saveUser = true;
feedSubscriptionService.refreshAll(user);
}
if (saveUser) {
userDAO.saveOrUpdate(user);
}
return Optional.fromNullable(user); return Optional.fromNullable(user);
} }
} }
@@ -75,11 +57,34 @@ public class UserService {
User user = userDAO.findByApiKey(apiKey); User user = userDAO.findByApiKey(apiKey);
if (user != null && !user.isDisabled()) { if (user != null && !user.isDisabled()) {
afterLogin(user);
return Optional.fromNullable(user); return Optional.fromNullable(user);
} }
return Optional.absent(); return Optional.absent();
} }
public void afterLogin(User user) {
Date lastLogin = user.getLastLogin();
Date now = new Date();
boolean saveUser = false;
// only update lastLogin field every hour in order to not
// invalidate the cache everytime someone logs in
if (lastLogin == null || lastLogin.before(DateUtils.addHours(now, -1))) {
user.setLastLogin(now);
saveUser = true;
}
if (config.getApplicationSettings().isHeavyLoad()
&& (user.getLastFullRefresh() == null || user.getLastFullRefresh().before(DateUtils.addMinutes(now, -30)))) {
user.setLastFullRefresh(now);
saveUser = true;
feedSubscriptionService.refreshAll(user);
}
if (saveUser) {
userDAO.merge(user);
}
}
public User register(String name, String password, String email, Collection<Role> roles) { public User register(String name, String password, String email, Collection<Role> roles) {
return register(name, password, email, roles, false); return register(name, password, email, roles, false);
} }

5
src/main/java/com/commafeed/frontend/auth/SecurityCheckProvider.java
View File

@@ -67,7 +67,10 @@ public class SecurityCheckProvider implements InjectableProvider<SecurityCheck,
HttpSession session = request.getSession(false); HttpSession session = request.getSession(false);
if (session != null) { if (session != null) {
User user = (User) session.getAttribute(CommaFeedApplication.SESSION_USER); User user = (User) session.getAttribute(CommaFeedApplication.SESSION_USER);
return Optional.fromNullable(user); if (user != null) {
userService.afterLogin(user);
return Optional.of(user);
}
} }
return Optional.absent(); return Optional.absent();
} }