Skip to content
This repository has been archived by the owner on Jan 8, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Redirect when a user cannot be loaded
  • Loading branch information
Edmundo Alvarez committed May 22, 2015
1 parent c6d47bf commit 3bd5233
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion app/controllers/UsersController.java
Expand Up @@ -118,7 +118,12 @@ public Result editUserForm(String username) {
BreadcrumbList bc = breadcrumbs();
bc.addCrumb("Edit " + username, routes.UsersController.editUserForm(username));

User user = userService.load(username);
final User user = userService.load(username);
if (user == null) {
flash("error", "User '" + username + "' not found.");
return redirect(routes.UsersController.index());
}

final Form<ChangeUserRequestForm> form = changeUserForm.fill(new ChangeUserRequestForm(user));
boolean requiresOldPassword = checkRequireOldPassword(username);
try {
Expand Down Expand Up @@ -199,7 +204,12 @@ public Result saveChanges(String username) {
}

final Form<ChangeUserRequestForm> requestForm = Form.form(ChangeUserRequestForm.class).bindFromRequest();

final User user = userService.load(username);
if (user == null) {
flash("error", "User '" + username + "' not found.");
return redirect(routes.UsersController.index());
}

if (requestForm.hasErrors()) {
final BreadcrumbList bc = new BreadcrumbList();
Expand Down Expand Up @@ -299,6 +309,11 @@ public Result changePassword(String username) {

final ChangePasswordRequest request = requestForm.get();
final User user = userService.load(username);
if (user == null) {
flash("error", "User '" + username + "' not found.");
return redirect(routes.UsersController.index());
}


if (checkRequireOldPassword(username) && request.old_password == null) {
requestForm.reject("Old password is required.");
Expand All @@ -324,7 +339,12 @@ public Result resetPermissions(String username) {
if (field != null && field.equalsIgnoreCase("admin")) {
isAdmin = true;
}

final User user = userService.load(username);
if (user == null) {
flash("error", "User '" + username + "' not found.");
return redirect(routes.UsersController.index());
}

if (!Permissions.isPermitted(USERS_PERMISSIONSEDIT) || user.isReadonly()) {
flash("error", "Unable to change user role");
Expand Down

0 comments on commit 3bd5233

Please sign in to comment.