Fix user PUTs and make emails+passwords fully optional.

No-Issue

Signed-off-by: James Tanner <[email protected]>

galaxy_ng/app/api/ui_v2/serializers.py

@@ -30,7 +30,7 @@ class Meta:
         ]
 
         extra_kwargs = {
-            'password': {'write_only': True, 'required': True},
+            'password': {'write_only': True, 'required': False},
             'email': {'required': False}
         }
 
@@ -42,11 +42,6 @@ def get_teams(self, obj):
         teams_serializer = TeamSerializer(teams, many=True)
         return teams_serializer.data
 
-    def validate_email(self, value):
-        if not value:
-            raise serializers.ValidationError("Email is required")
-        return value
-
     def create(self, validated_data):
         user, _ = User.objects.get_or_create(
             username=validated_data['username'],

galaxy_ng/tests/integration/dab/test_ui_v2.py

@@ -49,3 +49,45 @@ def test_ui_v2_user_create(
     ugc = GalaxyClient(gc.galaxy_root, auth=auth)
     me_ds = ugc.get('_ui/v1/me/')
     assert me_ds["username"] == random_username
+
+
+@pytest.mark.deployment_standalone
+def test_ui_v2_user_edit(
+    settings,
+    galaxy_client,
+    random_username,
+):
+    """Test user edit in ui/v2/users/."""
+
+    if settings.get('ALLOW_LOCAL_RESOURCE_MANAGEMENT') is False:
+        pytest.skip(reason="this only works local resource management enabled")
+
+    gc = galaxy_client("admin", ignore_cache=True)
+
+    user_payload = {
+        "username": random_username,
+        "first_name": "jim",
+        "last_name": "bob",
+        "password": "redhat1234"
+    }
+
+    # create the user in ui/v2 ...
+    user_data = gc.post(
+        "_ui/v2/users/",
+        body=json.dumps(user_payload)
+    )
+    uid = user_data['id']
+
+    # validate PUT/edit ...
+    user_data['last_name'] = 'newname'
+    changed_data = gc.put(
+        f"_ui/v2/users/{uid}/",
+        body=json.dumps(user_data)
+    )
+    assert changed_data == user_data
+
+    # validate login ...
+    auth = {'username': random_username, 'password': 'redhat1234'}
+    ugc = GalaxyClient(gc.galaxy_root, auth=auth)
+    me_ds = ugc.get('_ui/v1/me/')
+    assert me_ds["username"] == random_username