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

don't redirect if user is not logged in

Browse Source
This commit is contained in:
Athou
2014-08-11 19:50:30 +02:00
parent e62c7141af
commit 7dff44bcb4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/CommaFeedApplication.java
View File

@@ -208,7 +208,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
NextUnreadServlet nextUnreadServlet = new NextUnreadServlet(sessionFactory, feedSubscriptionDAO, feedEntryStatusDAO, NextUnreadServlet nextUnreadServlet = new NextUnreadServlet(sessionFactory, feedSubscriptionDAO, feedEntryStatusDAO,
feedCategoryDAO, config); feedCategoryDAO, config);
LogoutServlet logoutServlet = new LogoutServlet(config); LogoutServlet logoutServlet = new LogoutServlet(config);
CustomCssServlet customCssServlet = new CustomCssServlet(sessionFactory, userSettingsDAO, config); CustomCssServlet customCssServlet = new CustomCssServlet(sessionFactory, userSettingsDAO);
AnalyticsServlet analyticsServlet = new AnalyticsServlet(config); AnalyticsServlet analyticsServlet = new AnalyticsServlet(config);
environment.servlets().addServlet("next", nextUnreadServlet).addMapping("/next"); environment.servlets().addServlet("next", nextUnreadServlet).addMapping("/next");
environment.servlets().addServlet("logout", logoutServlet).addMapping("/logout"); environment.servlets().addServlet("logout", logoutServlet).addMapping("/logout");

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

@@ -12,7 +12,6 @@ import lombok.RequiredArgsConstructor;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import com.commafeed.CommaFeedApplication; import com.commafeed.CommaFeedApplication;
import com.commafeed.CommaFeedConfiguration;
import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.dao.UnitOfWork;
import com.commafeed.backend.dao.UserSettingsDAO; import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
@@ -24,13 +23,13 @@ public class CustomCssServlet extends HttpServlet {
private final SessionFactory sessionFactory; private final SessionFactory sessionFactory;
private final UserSettingsDAO userSettingsDAO; private final UserSettingsDAO userSettingsDAO;
private final CommaFeedConfiguration config;
@Override @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setContentType("text/css");
final User user = (User) req.getSession().getAttribute(CommaFeedApplication.SESSION_USER); final User user = (User) req.getSession().getAttribute(CommaFeedApplication.SESSION_USER);
if (user == null) { if (user == null) {
resp.sendRedirect(resp.encodeRedirectURL(config.getApplicationSettings().getPublicUrl()));
return; return;
} }
@@ -40,8 +39,10 @@ public class CustomCssServlet extends HttpServlet {
return userSettingsDAO.findByUser(user); return userSettingsDAO.findByUser(user);
} }
}.run(); }.run();
if (settings == null) {
return;
}
resp.setContentType("text/css");
resp.getWriter().write(settings.getCustomCss()); resp.getWriter().write(settings.getCustomCss());
} }
} }