fix #370 - prevent IndexOutOfBound exception if no organizations have…

… been created yet
alfio-event · Jan 24, 2018 · e703245 · e703245
1 parent 81ce575
commit e703245
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/alfio/controller/api/admin/UsersApiController.java b/src/main/java/alfio/controller/api/admin/UsersApiController.java
@@ -181,8 +181,8 @@ public UserModification loadUser(@PathVariable("id") int userId) {
     @RequestMapping(value = "/users/current", method = GET)
     public UserModification loadCurrentUser(Principal principal) {
         User user = userManager.findUserByUsername(principal.getName());
-        List<Organization> userOrganizations = userManager.findUserOrganizations(user.getUsername());
-        return new UserModification(user.getId(), userOrganizations.get(0).getId(), userManager.getUserRole(user).name(), user.getUsername(), user.getFirstName(), user.getLastName(), user.getEmailAddress());
+        Optional<Organization> userOrganization = userManager.findUserOrganizations(user.getUsername()).stream().findFirst();
+        return new UserModification(user.getId(), userOrganization.map(Organization::getId).orElse(-1), userManager.getUserRole(user).name(), user.getUsername(), user.getFirstName(), user.getLastName(), user.getEmailAddress());
     }
 
     @RequestMapping(value = "/users/{id}/reset-password", method = PUT)