Remove PurldbUser model #504

    * We are going to use user.id for now to avoid migration issues

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

minecode/api.py

@@ -10,12 +10,12 @@
 import json
 
 from django import http
+from django.contrib.auth import get_user_model
 from django.core import signing
 from django.db import transaction
 from django.utils import timezone
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
-
 from packageurl import PackageURL
 from rest_framework import serializers, status, viewsets
 from rest_framework.decorators import action
@@ -26,7 +26,7 @@
 # But importing the mappers and visitors module triggers routes registration
 from minecode import visitors  # NOQA
 from minecode import priority_router
-from minecode.models import PriorityResourceURI, ResourceURI, ScannableURI, PurldbUser
+from minecode.models import PriorityResourceURI, ResourceURI, ScannableURI
 from minecode.permissions import IsScanQueueWorkerAPIUser
 from minecode.utils import get_temp_file
 from minecode.utils import get_webhook_url
@@ -116,9 +116,7 @@ def get_next_download_url(self, request, *args, **kwargs):
             scannable_uri = ScannableURI.objects.get_next_scannable()
             if scannable_uri:
                 user = self.request.user
-                # TODO: Create scan index API view
-                # TODO: Create custom User class and use UUID as id field
-                webhook_url = get_webhook_url("notifications:send_scan_notification", user.id)
+                webhook_url = get_webhook_url("send_scan_notification", user.id)
                 response = {
                     'scannable_uri_uuid': scannable_uri.uuid,
                     'download_url': scannable_uri.uri,
@@ -359,8 +357,9 @@ def send_scan_notification(request, key):
     except json.JSONDecodeError:
         raise http.Http404
 
-    user_uuid = signing.loads(key)
-    user = http.get_object_or_404(PurldbUser, uuid=user_uuid)
+    user_id = signing.loads(key)
+    User = get_user_model()
+    user = http.get_object_or_404(User, id=user_id)
 
     results = json_data.get('results')
     summary = json_data.get('summary')

minecode/migrations/0038_purldbuser.py

@@ -1164,90 +1164,3 @@ class ProcessingError(BaseURI):
 
     class Meta:
         verbose_name = 'Processing Error'
-
-
-class PurldbUserManager(BaseUserManager):
-    def create_user(self, username, email, password, **extra_fields):
-        """
-        Create and saves a User with the given username, email, and password.
-        """
-        if not username:
-            raise ValueError("The given username must be set")
-
-        if not email:
-            raise ValueError("Users must have an email address")
-
-        defaults = {
-            "is_active": True,
-            "is_staff": False,
-            "is_superuser": False,
-        }
-
-        groups = extra_fields.pop("groups", [])
-        defaults.update(extra_fields)
-        email = PurldbUserManager.normalize_email(email)
-        now = timezone.now()
-
-        user = self.model(
-            username=username,
-            email=email,
-            last_login=now,
-            date_joined=now,
-            **defaults,
-        )
-        user.set_password(password)
-        user.save(using=self._db)
-
-        for group_name in groups:
-            with suppress(Group.DoesNotExist):
-                user.groups.add(Group.objects.get(name=group_name))
-
-        return user
-
-    def create_superuser(self, username, email, password, **extra_fields):
-        """
-        Create and saves a superuser with the given username, email, and
-        password.
-        """
-        extra_fields.update(
-            {
-                "is_active": True,
-                "is_staff": True,
-                "is_superuser": True,
-            }
-        )
-        return self.create_user(username, email, password, **extra_fields)
-
-    def create_scan_queue_worker_user(self, username, email, password, **extra_fields):
-        extra_fields.update(
-            {
-                "is_active": True,
-                "is_staff": True,
-                "is_superuser": False,
-                "groups": ['scan_queue_workers',],
-            }
-        )
-        return self.create_user(username, email, password, **extra_fields)
-
-
-class PurldbUser(AbstractUser):
-    uuid = models.UUIDField(
-        "UUID",
-        default=uuid.uuid4,
-        editable=False,
-        unique=True,
-    )
-
-    objects = PurldbUserManager()
-
-    class Meta:
-        ordering = ["username"]
-
-    def regenerate_api_key(self):
-        """
-        Regenerate the user API key.
-        Since the `key` value is the primary key on the Token `model`,
-        the old key needs to be deleted first, a new one is then created.
-        """
-        self.auth_token.delete()
-        Token.objects.create(user=self)

minecode/models.py

@@ -54,8 +54,7 @@
 
 PURLDB_LOG_LEVEL = env.str("PURLDB_LOG_LEVEL", "INFO")
 
-# DejaCode User Model
-AUTH_USER_MODEL = "minecode.PurldbUser"
+SITE_URL = env.str("SITE_URL", default="")
 
 # Application definition