Skip to content
Snippets Groups Projects
Commit f9cd240f authored by Paul-Christian Volkmer's avatar Paul-Christian Volkmer
Browse files

Setup UserSessionServices role and user after login

It is required to setup those values after login. Current session
information will be set up after joining a session.
parent 0d08278c
No related merge requests found
......@@ -51,8 +51,31 @@ public class UserSessionAspect {
returning="session"
)
public final void joinSessionAdviceWithWebsocket(final JoinPoint jp, final String keyword, final UUID socketId, final Session session) {
userSessionService.setUser(userService.getCurrentUser());
userSessionService.setSession(session);
userSessionService.setSocketId(socketId);
}
/** Sets current user, ARSnova session and websocket session ID in session scoped UserSessionService
*
* @param jp
* @param keyword
* @param socketId
* @param session
*/
@AfterReturning(
pointcut="execution(public * de.thm.arsnova.controller.LoginController.doLogin(..)) " +
"&& args(type, guestName, forcedReferer, successUrl, failureUrl, role, ..)"
)
public final void doLogin(
final JoinPoint jp,
final String type,
final String guestName,
final String forcedReferer,
final String successUrl,
final String failureUrl,
final UserSessionService.Role role) {
userSessionService.setRole(role);
userSessionService.setUser(userService.getCurrentUser());
}
}
......@@ -53,7 +53,6 @@ import org.springframework.web.servlet.view.RedirectView;
import de.thm.arsnova.entities.Session;
import de.thm.arsnova.entities.User;
import de.thm.arsnova.exceptions.NoContentException;
import de.thm.arsnova.exceptions.UnauthorizedException;
import de.thm.arsnova.services.IUserService;
import de.thm.arsnova.services.UserSessionService;
......@@ -95,8 +94,6 @@ public class LoginController extends AbstractController {
final HttpServletRequest request,
final HttpServletResponse response
) throws IOException, ServletException {
userSessionService.setRole(role);
String referer = request.getHeader("referer");
if (null != forcedReferer && null != referer && !UrlUtils.isAbsoluteUrl(referer)) {
/* Use a url from a request parameter as referer as long as the url is not absolute (to prevent
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment