Commit d275fd51 authored by Daniel Gerhardt's avatar Daniel Gerhardt

Merge branch '2.4'

parents f52814df d8360774
......@@ -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;
......
......@@ -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();
}
}
......
Markdown is supported
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