From ce95772afa4e5e405dc9689303abee2d9265e20b Mon Sep 17 00:00:00 2001
From: Sankaranarayanan Viswanathan <rationalrevolt@gmail.com>
Date: Sat, 11 Oct 2014 13:29:29 -0400
Subject: [PATCH] Delete method UserService.login(HttpSession) and copy body to
 callers

---
 .../commafeed/backend/service/UserService.java | 18 +-----------------
 .../frontend/servlet/CustomCssServlet.java     | 12 +++++++++++-
 .../frontend/servlet/NextUnreadServlet.java    | 12 +++++++++++-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/service/UserService.java b/src/main/java/com/commafeed/backend/service/UserService.java
index b146dfd1..3bab6522 100644
--- a/src/main/java/com/commafeed/backend/service/UserService.java
+++ b/src/main/java/com/commafeed/backend/service/UserService.java
@@ -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
diff --git a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
index f65e17cc..9c0f55b2 100644
--- a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
@@ -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()) {
diff --git a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
index affebcce..e8fe6131 100644
--- a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
@@ -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()) {