feat: obtain first_name and last_name from upstream ldap (#181)

Makefile

@@ -27,9 +27,13 @@ test-keepdb:
 	ENABLE_LDAP=0 ENABLE_LDAP_SECONDARY=0 $(manage) test -v2 --settings=config.settings.test --keepdb
 
 
+.PHONY: _test-snap
+_test-snap:
+	ENABLE_LDAP=0 ENABLE_LDAP_SECONDARY=0 $(manage) test -v2 --settings=config.settings.test --keepdb --snapshot-update usersec.tests.test_serializers adminsec.tests.test_views_api
+
+
 .PHONY: test-snap
-test-snap:
-	ENABLE_LDAP=0 ENABLE_LDAP_SECONDARY=0 $(manage) test -v2 --settings=config.settings.test --keepdb usersec.tests.test_serializers adminsec.tests.test_views_api
+test-snap: _test-snap format
 
 
 .PHONY: isort
@@ -41,6 +45,20 @@ isort:
 flake8:
 	flake8
 
+
 .PHONY: format
 format: isort black flake8
 
+
+.PHONY: migrations
+migrations:
+	$(manage) makemigrations
+
+
+.PHONY: _migrate
+_migrate: migrations
+	$(manage) migrate
+
+
+.PHONY: migrate
+migrate: _migrate format

hpcaccess/auth_backends.py

@@ -69,25 +69,31 @@ def _ldap_auth_handler(user, ldap_user, **kwargs):
 
     phone = ldap_user.attrs.get("telephoneNumber")
     uid = ldap_user.attrs.get("uidNumber")
+    first_name = ldap_user.attrs.get("givenName")
+    last_name = ldap_user.attrs.get("sn")
 
     if phone:
         user.phone = phone[0]
 
     if uid:
         user.uid = uid[0]
 
+    if first_name:
+        user.first_name = first_name[0]
+
+    if last_name:
+        user.last_name = last_name[0]
+
     if hasattr(user, "ldap_username"):
         # Make domain in username uppercase
         if user.username.find("@") != -1 and user.username.split("@")[1].islower():
             u_split = user.username.split("@")
             user.username = u_split[0] + "@" + u_split[1].upper()
             user.save()
 
-        # Save user name from first_name and last_name into name
-        if user.name in ["", None]:
-            if user.first_name != "":
-                user.name = user.first_name + (" " + user.last_name if user.last_name != "" else "")
-                user.save()
+    # Save user name from first_name and last_name into name
+    user.name = " ".join([user.first_name, user.last_name])
+    user.save()
 
 
 @receiver(populate_user, sender=PrimaryLDAPBackend)

hpcaccess/users/admin.py

@@ -13,8 +13,8 @@ class UserAdmin(auth_admin.UserAdmin):
     form = UserAdminChangeForm
     add_form = UserAdminCreationForm
     fieldsets = (
-        (None, {"fields": ("username", "password")}),
-        (_("Personal info"), {"fields": ("name", "email")}),
+        (None, {"fields": ("username", "password", "uid")}),
+        (_("Personal info"), {"fields": ("name", "first_name", "last_name", "email", "phone")}),
         (
             _("Permissions"),
             {

hpcaccess/users/migrations/0005_user_first_name_user_last_name.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-02-15 10:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0004_user_uid"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="first_name",
+            field=models.CharField(blank=True, max_length=30, verbose_name="First Name of User"),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="last_name",
+            field=models.CharField(blank=True, max_length=30, verbose_name="Last Name of User"),
+        ),
+    ]

hpcaccess/users/models.py

@@ -13,8 +13,8 @@ class User(AbstractUser):
 
     #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)
-    first_name = None  # type: ignore
-    last_name = None  # type: ignore
+    first_name = CharField(_("First Name of User"), blank=True, max_length=30)
+    last_name = CharField(_("Last Name of User"), blank=True, max_length=30)
     is_hpcadmin = BooleanField(
         _("HPC admin status"),
         default=False,

usersec/tests/snapshots/snap_test_serializers.py

@@ -58,10 +58,10 @@
     "date_created": "2019-01-01T00:00:00Z",
     "description": "this is a user",
     "expiration": "2050-01-01T00:00:00Z",
-    "first_name": None,
+    "first_name": "first_name_placeholder",
     "full_name": "name_placeholder",
     "home_directory": "/data/cephfs-1/home/users/user0_c",
-    "last_name": None,
+    "last_name": "last_name_placeholder",
     "login_shell": "/usr/bin/bash",
     "phone_number": "phone_number_placeholder",
     "primary_group": "primary_group_uuid_placeholder",

usersec/tests/test_serializers.py

@@ -32,6 +32,8 @@ def testSerializeExisting(self):
         result["primary_group"] = "primary_group_uuid_placeholder"
         result["phone_number"] = "phone_number_placeholder"
         result["full_name"] = "name_placeholder"
+        result["first_name"] = "first_name_placeholder"
+        result["last_name"] = "last_name_placeholder"
         result["uid"] = 2000
         self.assertMatchSnapshot(result)