Merge branch 'f-deactivate-user' into 'dev'

F deactivate user

See merge request caosdb/caosdb-server!71

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* Bug: When the user password is updated the user is deactivated.
 * Semi-fixed a bug which occurs when retrieving old versions of entities which
   reference entities which have been deleted in the mean time. The current fix
   adds a warning message to the reference property in question and sets the

src/main/java/org/caosdb/server/resource/UserResource.java

@@ -99,13 +99,11 @@ public class UserResource extends AbstractCaosDBServerResource {
               : UserSources.guessRealm(username));
       final String password = form.getFirstValue("password");
       final String email = form.getFirstValue("email");
+
       final UserStatus status =
-          UserStatus.valueOf(
-              form.getFirstValue(
-                      "status",
-                      CaosDBServer.getServerProperty(
-                          ServerProperties.KEY_NEW_USER_DEFAULT_ACTIVITY))
-                  .toUpperCase());
+          form.getFirstValue("status") != null
+              ? UserStatus.valueOf(form.getFirstValue("status").toUpperCase())
+              : null;
       Integer userEntity = null;
       if (form.getFirst("entity") != null) {
         if (form.getFirstValue("entity").isEmpty()) {