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

Delete method UserService.login(HttpSession) and copy body to callers

Browse Source
This commit is contained in:
Sankaranarayanan Viswanathan
2014-10-11 13:29:29 -04:00
parent b9f27b2b00
commit ce95772afa
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@ import java.util.UUID;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpSession;
import lombok.RequiredArgsConstructor;
@@ -21,7 +20,6 @@ import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.service.internal.PostLoginActivities;
import com.commafeed.frontend.resource.UserREST;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@ -58,21 +56,7 @@ public class UserService {
}
}
return Optional.absent();
}
/**
* try to log in by checking if the user has an active session
*/
public Optional<User> login(HttpSession session) {
if (session != null) {
User user = (User) session.getAttribute(UserREST.SESSION_KEY_USER);
if (user != null) {
afterLogin(user);
return Optional.of(user);
}
}
return Optional.absent();
}
}
/**
* try to log in with given api key

12
src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
View File

@@ -8,6 +8,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import lombok.RequiredArgsConstructor;
@@ -18,6 +19,7 @@ import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserSettings;
import com.commafeed.backend.service.UserService;
import com.commafeed.frontend.resource.UserREST;
import com.google.common.base.Optional;
@SuppressWarnings("serial")
@@ -36,7 +38,15 @@ public class CustomCssServlet extends HttpServlet {
final Optional<User> user = new UnitOfWork<Optional<User>>(sessionFactory) {
@Override
protected Optional<User> runInSession() throws Exception {
return userService.login(req.getSession(false));
HttpSession session = req.getSession(false);
if (session != null) {
User user = (User) session.getAttribute(UserREST.SESSION_KEY_USER);
if (user != null) {
userService.afterLogin(user);
return Optional.of(user);
}
}
return Optional.absent();
}
}.run();
if (!user.isPresent()) {

12
src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
View File

@@ -9,6 +9,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import lombok.RequiredArgsConstructor;
@@ -27,6 +28,7 @@ import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.commafeed.backend.service.UserService;
import com.commafeed.frontend.resource.CategoryREST;
import com.commafeed.frontend.resource.UserREST;
import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
@@ -53,7 +55,15 @@ public class NextUnreadServlet extends HttpServlet {
final Optional<User> user = new UnitOfWork<Optional<User>>(sessionFactory) {
@Override
protected Optional<User> runInSession() throws Exception {
return userService.login(req.getSession(false));
HttpSession session = req.getSession(false);
if (session != null) {
User user = (User) session.getAttribute(UserREST.SESSION_KEY_USER);
if (user != null) {
userService.afterLogin(user);
return Optional.of(user);
}
}
return Optional.absent();
}
}.run();
if (!user.isPresent()) {