Skip to content

Modified IF statements #90

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
Shayyan88 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified IF statements #90

Show file tree
Hide file tree
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
23 changes: 10 additions & 13 deletions .../main/java/org/openmrs/module/referenceapplication/filter/RequireLoginLocationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,17 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
}

HttpServletRequest httpRequest = (HttpServletRequest) request;
if (!skipFilter(httpRequest.getRequestURI())) {
if (Context.isAuthenticated() && Context.getUserContext().getLocationId() == null) {
if (logger.isDebugEnabled()) {
logger.debug("Redirecting user to location selection page");
}

//The user needs to select a login location
HttpServletResponse resp = ((HttpServletResponse) response);
resp.setStatus(HttpStatus.OK.value());
resp.sendRedirect(loginRequestUri);
return;
if (!skipFilter(httpRequest.getRequestURI()) && Context.isAuthenticated() && Context.getUserContext().getLocationId() == null) {
if (logger.isDebugEnabled()) {
logger.debug("Redirecting user to location selection page");
}
}


//The user needs to select a login location
HttpServletResponse resp = ((HttpServletResponse) response);
resp.setStatus(HttpStatus.OK.value());
resp.sendRedirect(loginRequestUri);
return;
}
chain.doFilter(request, response);
}

Expand Down
7 changes: 2 additions & 5 deletions ...ain/java/org/openmrs/module/referenceapplication/page/controller/LoginPageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,18 +315,15 @@ public String post(@RequestParam(value = "username", required = false) String us
new CookieLocaleResolver().setDefaultLocale(userLocale);
}

if (StringUtils.isNotBlank(redirectUrl)) {
//don't redirect back to the login page on success nor an external url
if (isUrlWithinOpenmrs(pageRequest, redirectUrl)) {
if (StringUtils.isNotBlank(redirectUrl) && isUrlWithinOpenmrs(pageRequest, redirectUrl)) {
if (!redirectUrl.contains("login.") && isSameUser(pageRequest, username)) {
if (log.isDebugEnabled())
log.debug("Redirecting user to " + redirectUrl);
return "redirect:" + redirectUrl;
} else {
if (log.isDebugEnabled())
log.debug("Redirect contains 'login.', redirecting to home page");
}
}
}
}

return "redirect:" + ui.pageLink(ReferenceApplicationConstants.MODULE_ID, "home");
Expand Down