Merge branch '2.4'

src/main/java/de/thm/arsnova/controller/LoginController.java

@@ -106,7 +106,7 @@ public class LoginController extends AbstractController {
 	@Value("${security.cas.order}") private int casOrder;
 
 	@Value("${security.facebook.enabled}") private boolean facebookEnabled;
-	@Value("${security.facebook.enabled-roles:speaker,student}") private String[] facebookRoles;
+	@Value("${security.facebook.allowed-roles:speaker,student}") private String[] facebookRoles;
 	@Value("${security.facebook.order}") private int facebookOrder;
 
 	@Value("${security.google.enabled}") private boolean googleEnabled;

src/main/java/de/thm/arsnova/services/SessionService.java

@@ -212,7 +212,7 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
 		}
 		if (connectorClient != null && session.isCourseSession()) {
 			final String courseid = session.getCourseId();
-			if (!connectorClient.getMembership(userService.getCurrentUser().getUsername(), courseid).isMember()) {
+			if (!connectorClient.getMembership(user.getUsername(), courseid).isMember()) {
 				throw new ForbiddenException();
 			}
 		}