Revert "*: providers and sources -> channels, PolicyModel to PolicyBindingModel that uses custom M2M through"

This reverts commit 7ed3ceb960.

passbook/audit/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.5 on 2020-05-15 19:58
+# Generated by Django 2.2.6 on 2019-10-07 14:07
 
 import uuid
 
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name="Event",
+            name="AuditEntry",
             fields=[
                 (
                     "uuid",
@@ -33,16 +33,15 @@ class Migration(migrations.Migration):
                     "action",
                     models.TextField(
                         choices=[
-                            ("LOGIN", "login"),
-                            ("LOGIN_FAILED", "login_failed"),
-                            ("LOGOUT", "logout"),
-                            ("AUTHORIZE_APPLICATION", "authorize_application"),
-                            ("SUSPICIOUS_REQUEST", "suspicious_request"),
-                            ("SIGN_UP", "sign_up"),
-                            ("PASSWORD_RESET", "password_reset"),
-                            ("INVITE_CREATED", "invitation_created"),
-                            ("INVITE_USED", "invitation_used"),
-                            ("CUSTOM", "custom"),
+                            ("login", "login"),
+                            ("login_failed", "login_failed"),
+                            ("logout", "logout"),
+                            ("authorize_application", "authorize_application"),
+                            ("suspicious_request", "suspicious_request"),
+                            ("sign_up", "sign_up"),
+                            ("password_reset", "password_reset"),
+                            ("invitation_created", "invitation_created"),
+                            ("invitation_used", "invitation_used"),
                         ]
                     ),
                 ),
@@ -54,7 +53,7 @@ class Migration(migrations.Migration):
                         blank=True, default=dict
                     ),
                 ),
-                ("client_ip", models.GenericIPAddressField(null=True)),
+                ("request_ip", models.GenericIPAddressField()),
                 ("created", models.DateTimeField(auto_now_add=True)),
                 (
                     "user",
@@ -66,8 +65,8 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "verbose_name": "Audit Event",
-                "verbose_name_plural": "Audit Events",
+                "verbose_name": "Audit Entry",
+                "verbose_name_plural": "Audit Entries",
             },
         ),
     ]

passbook/audit/migrations/0002_auto_20191028_0829.py

@@ -0,0 +1,16 @@
+# Generated by Django 2.2.6 on 2019-10-28 08:29
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("passbook_audit", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RenameModel(old_name="AuditEntry", new_name="Event",),
+    ]

passbook/audit/migrations/0003_auto_20191205_1407.py

@@ -0,0 +1,40 @@
+# Generated by Django 2.2.8 on 2019-12-05 14:07
+
+from django.db import migrations, models
+
+import passbook.audit.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("passbook_audit", "0002_auto_20191028_0829"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="event",
+            options={
+                "verbose_name": "Audit Event",
+                "verbose_name_plural": "Audit Events",
+            },
+        ),
+        migrations.AlterField(
+            model_name="event",
+            name="action",
+            field=models.TextField(
+                choices=[
+                    ("LOGIN", "login"),
+                    ("LOGIN_FAILED", "login_failed"),
+                    ("LOGOUT", "logout"),
+                    ("AUTHORIZE_APPLICATION", "authorize_application"),
+                    ("SUSPICIOUS_REQUEST", "suspicious_request"),
+                    ("SIGN_UP", "sign_up"),
+                    ("PASSWORD_RESET", "password_reset"),
+                    ("INVITE_CREATED", "invitation_created"),
+                    ("INVITE_USED", "invitation_used"),
+                    ("CUSTOM", "custom"),
+                ]
+            ),
+        ),
+    ]

passbook/audit/migrations/0004_auto_20191205_1502.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.8 on 2019-12-05 15:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("passbook_audit", "0003_auto_20191205_1407"),
+    ]
+
+    operations = [
+        migrations.RemoveField(model_name="event", name="request_ip",),
+        migrations.AddField(
+            model_name="event",
+            name="client_ip",
+            field=models.GenericIPAddressField(null=True),
+        ),
+    ]

passbook/audit/tests/test_event.py

@@ -5,7 +5,7 @@ from django.test import TestCase
 from guardian.shortcuts import get_anonymous_user
 
 from passbook.audit.models import Event, EventAction
-from passbook.policies.models import Policy
+from passbook.core.models import Policy
 
 
 class TestAuditEvent(TestCase):