Author: ssenrogn
Date: 2007-08-22 11:50:56 +0200 (Wed, 22 Aug 2007)
New Revision: 5655
Modified:
branches/2.15-personalization/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
Log:
Some refactoring, handles change of user.
Modified:
branches/2.15-personalization/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
===================================================================
---
branches/2.15-personalization/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
2007-08-22 08:22:08 UTC (rev 5654)
+++
branches/2.15-personalization/war/src/main/java/no/sesat/search/http/filters/UserFilter.java
2007-08-22 09:50:56 UTC (rev 5655)
@@ -113,22 +113,22 @@
final HttpSession session = request.getSession();
final DataModel dataModel = (DataModel)
session.getAttribute(DataModel.KEY);
- final BasicUserService userService = getBasicUserService(dataModel);
+ final BasicUserService basicUserService =
getBasicUserService(dataModel);
- if (userService == null) {
- LOG.warn("Couldn't find the user service.");
+ if (basicUserService == null) {
+ LOG.warn("Couldn't find the basic user service.");
return;
}
final String loginKey = UserCookieUtil.getUserLoginCookie(request);
final Date updateTimestamp =
UserCookieUtil.getUserUpdateCookie(request);
- final boolean isLegalLoginKey = userService.isLegalLoginKey(loginKey);
+ final boolean isLegalLoginKey =
basicUserService.isLegalLoginKey(loginKey);
final BasicUser user = dataModel.getUser().getUser();
if (user == null && isLegalLoginKey) {
// Login if no user and a legal login key.
- loginUsingCookie(loginKey, dataModel, userService, response);
+ loginUsingCookie(loginKey, dataModel, basicUserService, response);
} else if (user != null && !isLegalLoginKey) {
// Check if the user should be logged out, no login key anymore.
resetSession(dataModel);
@@ -136,11 +136,11 @@
if (!isLoginKeyLegalForUser(loginKey, user)) {
// Check if the logged in user is the one found in the login
key
resetSession(dataModel);
- loginUsingCookie(loginKey, dataModel, userService, response);
+ loginUsingCookie(loginKey, dataModel, basicUserService,
response);
} else if (user.isDirty(updateTimestamp)) {
// Check if the user object is dirty, refresh if needed.
LOG.info("Logged in user dirty, refreshes: " +
user.getUsername());
- dataModel.getUser().setUser(userService.refreshUser(user));
+
dataModel.getUser().setUser(basicUserService.refreshUser(user));
}
}
}
@@ -155,7 +155,7 @@
*/
private static void loginUsingCookie(final String loginKey, final
DataModel dataModel,
final BasicUserService userService, final HttpServletResponse
response) {
- LOG.info("Log user in with login key: " + loginKey);
+ LOG.info("Login user with login key: " + loginKey);
try {
final BasicUser user =
userService.authenticateByLoginKey(loginKey);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
