From 4362922ba00a22d9177df1731673b5fb4db03fb5 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 19 Dec 2013 17:58:11 +0000
Subject: [PATCH] #333 feature - Added first page with Bootstrap

---
 securis/src/main/java/net/curisit/securis/AuthFilter.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/AuthFilter.java b/securis/src/main/java/net/curisit/securis/AuthFilter.java
index d01c6dc..9f086a5 100644
--- a/securis/src/main/java/net/curisit/securis/AuthFilter.java
+++ b/securis/src/main/java/net/curisit/securis/AuthFilter.java
@@ -14,9 +14,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 @Singleton
 @WebFilter(urlPatterns = "/*")
 public class AuthFilter implements Filter {
+
+	private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
 
 	@Override
 	public void init(FilterConfig fc) throws ServletException {
@@ -27,9 +32,14 @@
 		HttpServletRequest req = (HttpServletRequest) sr;
 
 		// System.out.println("filter: " + req.getRequestURI() + " user: " + sr.getParameter("user"));
-		if (sr.getParameter("user") != null) {
+		if (sr.getParameter("user") != null || req.getSession().getAttribute("user") != null) {
+			String username = sr.getParameter("user");
+			if (username == null)
+				username = (String) req.getSession().getAttribute("user");
+			String role = username.equals("advance") ? "advance" : "normal";
 			// ResteasyProviderFactory.pushContext(User.class, new User(sr.getParameter("user")));
-			fc.doFilter(new UserRoleRequestWrapper("user", sr.getParameter("user"), req), sr1);
+			log.info("Role for user: {} = {}", username, role);
+			fc.doFilter(new UserRoleRequestWrapper(role, sr.getParameter("user"), req), sr1);
 		} else {
 			fc.doFilter(req, sr1);
 		}
@@ -53,6 +63,7 @@
 
 		@Override
 		public boolean isUserInRole(String role) {
+			log.info("isUserRole METHOD: {}, {}", role, this.role);
 			if (this.role == null) {
 				return super.isUserInRole(role);
 			}

--
Gitblit v1.3.2