change user_name still used as login and add display_name for dashboard view instead of username on login

This commit is contained in:
Alberto-Audrix committed 2026-09-10 10:51:51 +07:00
1 parent 7a562c18ec
commit 11b0ca26a5
33 files changed
+180 -145

No files matched your search

+19 -19
View File
@@ -8,7 +8,7 @@ from apps.accounts.models import User
class AccountAdminModelTests(TestCase):
def test_account_admin_flags_and_executive(self):
user = User.objects.create_user(
user_login="acct1",
user_name="acct1",
password="secret",
status=User.STATUS_ACCOUNT_ADMIN,
)
@@ -18,7 +18,7 @@ class AccountAdminModelTests(TestCase):
def test_inactive_clears_flags(self):
user = User.objects.create_user(
user_login="acct2",
user_name="acct2",
password="secret",
status=User.STATUS_ACCOUNT_ADMIN,
)
@@ -30,7 +30,7 @@ class AccountAdminModelTests(TestCase):
def test_director_admin_is_not_superuser(self):
user = User.objects.create_user(
user_login="diradmin1",
user_name="diradmin1",
password="secret",
status=User.STATUS_DIRECTOR_ADMIN,
)
@@ -42,21 +42,21 @@ class AccountAdminApiTests(TestCase):
def setUp(self):
self.client = APIClient()
self.account_admin = User.objects.create_user(
user_login="acctadmin",
user_name="acctadmin",
password="acct123",
status=User.STATUS_ACCOUNT_ADMIN,
)
self.gm = User.objects.create_user(
user_login="gm1", password="gm123", status=User.STATUS_GM
user_name="gm1", password="gm123", status=User.STATUS_GM
)
self.buh = User.objects.create_user(
user_login="buh1", password="buh123", status=User.STATUS_BUH
user_name="buh1", password="buh123", status=User.STATUS_BUH
)
self.director = User.objects.create_user(
user_login="dir1", password="dir123", status=User.STATUS_DIRECTOR
user_name="dir1", password="dir123", status=User.STATUS_DIRECTOR
)
self.superuser = User.objects.create_superuser(
user_login="admin1",
user_name="admin1",
password="admin123",
)
self.assertTrue(self.superuser.is_superuser)
@@ -67,15 +67,15 @@ class AccountAdminApiTests(TestCase):
response = self.client.post(
"/api/v1/users/",
{
"user_login": "newgm",
"user_name": "newgm",
"display_name": "newgm",
"status": User.STATUS_GM,
"password": "temp-pass",
},
format="json",
)
self.assertEqual(response.status_code, 201, response.data)
created = User.objects.get(user_name="newgm")
created = User.objects.get(display_name="newgm")
self.assertEqual(created.status, User.STATUS_GM)
self.assertIsNotNone(
authenticate(username="newgm", password="temp-pass")
@@ -85,7 +85,7 @@ class AccountAdminApiTests(TestCase):
self.client.force_authenticate(self.account_admin)
response = self.client.post(
"/api/v1/users/",
{"user_login": "nopass", "user_name": "nopass", "status": User.STATUS_GM},
{"user_name": "nopass", "display_name": "nopass", "status": User.STATUS_GM},
format="json",
)
self.assertEqual(response.status_code, 400)
@@ -96,8 +96,8 @@ class AccountAdminApiTests(TestCase):
response = self.client.post(
"/api/v1/users/",
{
"user_login": "blocked",
"user_name": "blocked",
"display_name": "blocked",
"status": User.STATUS_GM,
"password": "x",
},
@@ -109,7 +109,7 @@ class AccountAdminApiTests(TestCase):
self.client.force_authenticate(self.account_admin)
response = self.client.get("/api/v1/users/")
self.assertEqual(response.status_code, 200)
names = {row["user_name"] for row in response.data["results"]}
names = {row["display_name"] for row in response.data["results"]}
self.assertIn("gm1", names)
self.assertIn("buh1", names)
self.assertIn("dir1", names)
@@ -148,15 +148,15 @@ class AccountAdminApiTests(TestCase):
{"password": "hack"},
format="json",
)
self.assertEqual(response.status_code, 403, actor.user_name)
self.assertEqual(response.status_code, 403, actor.display_name)
def test_superuser_break_glass_create(self):
self.client.force_authenticate(self.superuser)
response = self.client.post(
"/api/v1/users/",
{
"user_login": "breakglass",
"user_name": "breakglass",
"display_name": "breakglass",
"status": User.STATUS_BUH,
"password": "bg-pass",
},
@@ -191,7 +191,7 @@ class AccountAdminApiTests(TestCase):
def test_peer_account_admin_can_deactivate_other_account_admin(self):
peer = User.objects.create_user(
user_login="acctadmin2",
user_name="acctadmin2",
password="acct123",
status=User.STATUS_ACCOUNT_ADMIN,
)
@@ -207,11 +207,11 @@ class AccountAdminApiTests(TestCase):
self.assertFalse(peer.is_active)
def test_superuser_hidden_from_user_list(self):
User.objects.create_superuser(user_login="hidden_su", password="x")
User.objects.create_superuser(user_name="hidden_su", password="x")
self.client.force_authenticate(self.account_admin)
response = self.client.get("/api/v1/users/")
self.assertEqual(response.status_code, 200)
names = {row["user_name"] for row in response.data["results"]}
names = {row["display_name"] for row in response.data["results"]}
self.assertNotIn("hidden_su", names)
self.assertNotIn("admin1", names)
@@ -220,8 +220,8 @@ class AccountAdminApiTests(TestCase):
response = self.client.post(
"/api/v1/users/",
{
"user_login": "bad_su",
"user_name": "bad_su",
"display_name": "bad_su",
"status": User.STATUS_SUPERUSER,
"password": "x",
},