stash

core/authentication/api_v2.py

@@ -21,14 +21,8 @@ class UserSerializer(serializers.ModelSerializer):
         fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions')
         read_only_fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions')
 
-    def collect_permissions(self, obj):
-        for permission in obj.get_all_permissions():
-            yield "*:" + permission
-        for permission in obj.event_permissions.all():
-            yield permission.event.slug + ":" + permission.permission.codename
-
     def get_permissions(self, obj):
-        return list(self.collect_permissions(obj))
+        return list(set(obj.get_permissions()))
 
 
 @receiver(post_save, sender=ExtendedUser)

core/authentication/migrations/0005_alter_eventpermission_event.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.7 on 2023-12-13 02:29
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('inventory', '0001_initial'),
-        ('authentication', '0004_legacy_user'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='eventpermission',
-            name='event',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='inventory.event'),
-        ),
-    ]

core/authentication/tests/v2/test_users.py

@@ -52,6 +52,11 @@ class UserApiTest(TestCase):
         self.assertEqual(response.json()['last_name'], '')
         permissions = response.json()['permissions']
         self.assertEqual(len(permissions), 5)
+        self.assertTrue('*:add_item' in permissions)
+        self.assertTrue('*:view_item' in permissions)
+        self.assertTrue('*:view_event' in permissions)
+        self.assertTrue('testevent:delete_item' in permissions)
+        self.assertTrue('*:add_event' in permissions)
 
     def test_register_user(self):
         anonymous = Client()