Skip to content

UserAgreementFilter:doFilterInternal - obtain context only if required #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saschaszott wants to merge 1 commit into
base: main-cris
Choose a base branch
from
Open

UserAgreementFilter:doFilterInternal - obtain context only if required #467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UserAgreementFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ public UserAgreementFilter(ConfigurationService configurationService) {
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {

Context context = ContextUtil.obtainContext(request);

boolean filterEnabled = configurationService.getBooleanProperty("user-agreement.enabled", false);
if (!filterEnabled) {
filterChain.doFilter(request, response);
return;
}

Context context = ContextUtil.obtainContext(request);
EPerson currentUser = context.getCurrentUser();
if (isNotOpenPath(request) && currentUser != null) {
boolean isUserAgreementAccepted = BooleanUtils
Expand All @@ -81,4 +80,4 @@ private boolean isNotOpenPath(HttpServletRequest request) {
.noneMatch(openPath -> openPath.matches(request));
}

}
}