diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java index 32e370b17d1770a6e5f0b5075272c9fe3fe615a9..16c4db2eb668a1e81ce4746410953b340a497df6 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java @@ -52,8 +52,8 @@ public class SessionExistsFilter implements Filter { Object attribute = request1.getSession().getAttribute(GFContexts.USEREMAIL); if (attribute == null) { - //redirectToLogin(request, response); - request1.getSession().setAttribute(GFContexts.USEREMAIL, "vodkas@yolo.com"); + redirectToLogin(request, response); + //request1.getSession().setAttribute(GFContexts.USEREMAIL, "vodkas@yolo.com"); chain.doFilter(request,response); } else { final ServiceLocator locator = ServiceLocatorUtilities.bind(new GFApplicationBinder()); diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java index e54af9c58caea0bc7c9eefd709954b48da720b93..18f7a19e9931f6e8123aee3e09f3cf55dc1d8489 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java @@ -9,6 +9,7 @@ import unipotsdam.gf.interfaces.ICommunication; import unipotsdam.gf.modules.communication.service.CommunicationService; import unipotsdam.gf.session.GFContexts; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; @@ -21,6 +22,9 @@ public class ChatWindow extends SimpleTagSupport { private String orientation; + @Inject + private ICommunication communicationService; + public void doTag() throws IOException { final ServiceLocator locator = ServiceLocatorUtilities.bind(new GFApplicationBinder()); @@ -31,7 +35,7 @@ public class ChatWindow extends SimpleTagSupport { /*String token = request.getParameter("token"); */ String projectId = request.getParameter("projectName"); - ICommunication communicationService = new CommunicationService(); + String chatRoomLink = communicationService.getChatRoomLink(request.getSession().getAttribute(GFContexts .USEREMAIL).toString(), projectId); log.debug("ChatRoomLink for ChatWindow: {}", chatRoomLink);