diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java index e3099ab28c7cc9bc45df8e3b00d0fd5bad226684..c28866ba7a3356babfdb85054cdaeb456c7aae7a 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java @@ -11,6 +11,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; + /** * The user controller is responsible for handling requests related to users. @@ -69,6 +71,7 @@ public class UserController { .lastName(user.lastName()) .dateOfBirth(user.birthDate()) .enabled(true) + .authorities(new ArrayList<>()) .build(); userService.saveUser(newUser); userService.addAuthorityToUser(newUser.getUsername(), Authority.USER); diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java index 751ff5934bd603424b46b8c201132c4965faff9c..71588350df5c87ad3c57a47072e6da29695b6ef9 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java @@ -87,7 +87,7 @@ public class User implements UserDetails { joinColumns = @JoinColumn(name = "username"), inverseJoinColumns = @JoinColumn(name = "authority")) @JsonIgnoreProperties({"users"}) - private List<AuthorityTable> authorities; + private List<AuthorityTable> authorities = new ArrayList<>(); /**