release review

django/conftest.py

@@ -14,6 +14,7 @@
 from django.core.files.base import File
 from PIL import Image
 from rest_framework.test import APIClient
+from social_django.models import UserSocialAuth
 
 from django_contracts.models import LegalContract, LegalContractVersion
 from thunderstore.account.factories import UserFlagFactory
@@ -120,6 +121,21 @@ def user(django_user_model):
     )
 
 
+@pytest.fixture()
+def user_with_social_auths(user):
+    UserSocialAuth.objects.create(
+        user=user,
+        provider="discord",
+        uid="1234567890",
+    )
+    UserSocialAuth.objects.create(
+        user=user,
+        provider="github",
+        uid="0987654321",
+    )
+    return user
+
+
 @pytest.fixture()
 def user_with_settings(django_user_model):
     user = django_user_model.objects.create_user(

django/thunderstore/account/forms.py

@@ -1,7 +1,12 @@
 from django import forms
+from django.core.exceptions import ValidationError
 from django.db import transaction
 
 from thunderstore.account.models import ServiceAccount
+from thunderstore.api.cyberstorm.services.team import (
+    create_service_account,
+    delete_service_account,
+)
 from thunderstore.core.types import UserType
 from thunderstore.repository.models import Team
 
@@ -16,19 +21,28 @@ def __init__(self, user: UserType, *args, **kwargs) -> None:
             queryset=Team.objects.filter(members__user=user, is_active=True),
         )
 
-    def clean_team(self) -> Team:
-        team = self.cleaned_data["team"]
-        team.ensure_can_create_service_account(self.user)
-        return team
-
     @transaction.atomic
     def save(self) -> ServiceAccount:
+        if self.errors:
+            raise ValueError("Cannot save form with errors")
+
+        self.api_token = ""
+
         owner = self.cleaned_data["team"]
         nickname = self.cleaned_data["nickname"]
-        (service_account, token) = ServiceAccount.create(
-            owner=owner, nickname=nickname, creator=self.user
-        )
-        self.api_token = token
+        service_account = None
+
+        try:
+            service_account, token = create_service_account(
+                agent=self.user,
+                team=owner,
+                nickname=nickname,
+            )
+            self.api_token = token
+        except ValidationError as e:
+            self.add_error(None, e)
+            raise ValidationError(self.errors)
+
         return service_account
 
 
@@ -40,13 +54,17 @@ def __init__(self, user: UserType, *args, **kwargs) -> None:
             queryset=ServiceAccount.objects.filter(owner__members__user=user),
         )
 
-    def clean_service_account(self) -> ServiceAccount:
+    def save(self) -> None:
+        if self.errors:
+            raise ValueError("Cannot save form with errors")
+
         service_account = self.cleaned_data["service_account"]
-        service_account.owner.ensure_can_delete_service_account(self.user)
-        return service_account
 
-    def save(self) -> None:
-        self.cleaned_data["service_account"].delete()
+        try:
+            delete_service_account(self.user, service_account)
+        except ValidationError as e:
+            self.add_error(None, e)
+            raise ValidationError(self.errors)
 
 
 class EditServiceAccountForm(forms.Form):

django/thunderstore/account/tests/test_service_account.py

@@ -1,4 +1,5 @@
 import pytest
+from django.core.exceptions import ValidationError
 from rest_framework.authtoken.models import Token
 
 from thunderstore.account.forms import (
@@ -46,6 +47,24 @@ def test_service_account_create(user, team):
     )
 
 
+@pytest.mark.django_db
+def test_service_account_create_error_on_save(user, team):
+    TeamMember.objects.create(
+        user=user,
+        team=team,
+        role=TeamMemberRole.owner,
+    )
+
+    form = CreateServiceAccountForm(
+        user,
+        data={"team": team, "nickname": "x" * 1000},
+    )
+
+    assert form.is_valid() is False
+    with pytest.raises(ValueError):
+        form.save()
+
+
 @pytest.mark.django_db
 def test_service_account_create_nickname_too_long(user, team):
     TeamMember.objects.create(
@@ -91,9 +110,11 @@ def test_service_account_create_not_owner(user, team):
         user,
         data={"team": team, "nickname": "Nickname"},
     )
+    with pytest.raises(ValidationError):
+        form.save()
     assert form.is_valid() is False
-    assert len(form.errors["team"]) == 1
-    assert form.errors["team"][0] == "Must be an owner to create a service account"
+    assert len(form.errors["__all__"]) == 1
+    assert form.errors["__all__"][0] == "Must be an owner to create a service account"
 
 
 @pytest.mark.django_db
@@ -129,6 +150,20 @@ def test_service_account_delete_not_member(service_account):
     )
 
 
+@pytest.mark.django_db
+def test_service_account_delete_error_on_save(service_account):
+    user = UserFactory.create()
+
+    form = DeleteServiceAccountForm(
+        user,
+        data={"service_account": service_account},
+    )
+
+    assert form.is_valid() is False
+    with pytest.raises(ValueError):
+        form.save()
+
+
 @pytest.mark.django_db
 def test_service_account_delete_not_owner(service_account):
     user = UserFactory.create()
@@ -141,12 +176,11 @@ def test_service_account_delete_not_owner(service_account):
         user,
         data={"service_account": service_account},
     )
+    with pytest.raises(ValidationError):
+        form.save()
     assert form.is_valid() is False
-    assert len(form.errors["service_account"]) == 1
-    assert (
-        form.errors["service_account"][0]
-        == "Must be an owner to delete a service account"
-    )
+    assert len(form.errors["__all__"]) == 1
+    assert form.errors["__all__"][0] == "Must be an owner to delete a service account"
 
 
 @pytest.mark.django_db

django/thunderstore/api/cyberstorm/serializers/__init__.py

@@ -3,28 +3,45 @@
     CyberstormPackageCategorySerializer,
     CyberstormPackageListingSectionSerializer,
 )
-from .package import CyberstormPackagePreviewSerializer, PackagePermissionsSerializer
+from .package import (
+    CyberstormPackageDependencySerializer,
+    CyberstormPackagePreviewSerializer,
+    CyberstormPackageTeamSerializer,
+    PackagePermissionsSerializer,
+)
+from .package_listing import PackageListingStatusResponseSerializer
+from .package_version import PackageVersionResponseSerializer
 from .team import (
+    CyberstormCreateServiceAccountSerializer,
     CyberstormCreateTeamSerializer,
     CyberstormServiceAccountSerializer,
     CyberstormTeamAddMemberRequestSerializer,
     CyberstormTeamAddMemberResponseSerializer,
     CyberstormTeamMemberSerializer,
+    CyberstormTeamMemberUpdateSerializer,
     CyberstormTeamSerializer,
     CyberstormTeamUpdateSerializer,
 )
+from .utils import EmptyStringAsNoneField
 
 __all__ = [
+    "EmptyStringAsNoneField",
     "CyberstormTeamAddMemberRequestSerializer",
     "CyberstormTeamAddMemberResponseSerializer",
     "CyberstormCreateTeamSerializer",
+    "CyberstormCreateServiceAccountSerializer",
     "CyberstormCommunitySerializer",
     "CyberstormPackageCategorySerializer",
     "CyberstormPackageListingSectionSerializer",
     "CyberstormPackagePreviewSerializer",
+    "CyberstormPackageTeamSerializer",
     "CyberstormServiceAccountSerializer",
     "CyberstormTeamMemberSerializer",
+    "CyberstormTeamMemberUpdateSerializer",
     "CyberstormTeamSerializer",
     "PackagePermissionsSerializer",
     "CyberstormTeamUpdateSerializer",
+    "CyberstormPackageDependencySerializer",
+    "PackageListingStatusResponseSerializer",
+    "PackageVersionResponseSerializer",
 ]

django/thunderstore/api/cyberstorm/serializers/package.py

@@ -1,8 +1,11 @@
+from typing import Optional
+
 from rest_framework import serializers
 
 from thunderstore.api.cyberstorm.serializers.community import (
     CyberstormPackageCategorySerializer,
 )
+from thunderstore.api.cyberstorm.serializers.team import CyberstormTeamMemberSerializer
 from thunderstore.community.models import Community
 from thunderstore.repository.models import Namespace, Package, PackageVersion
 
@@ -55,3 +58,40 @@ class CyberstormPackagePreviewSerializer(serializers.Serializer):
     rating_count = serializers.IntegerField(min_value=0)
     size = serializers.IntegerField(min_value=0)
     datetime_created = serializers.DateTimeField()
+
+
+class CyberstormPackageDependencySerializer(serializers.Serializer):
+    description = serializers.SerializerMethodField()
+    icon_url = serializers.SerializerMethodField()
+    is_active = serializers.BooleanField(source="is_effectively_active")
+    name = serializers.CharField()
+    namespace = serializers.CharField(source="package.namespace.name")
+    version_number = serializers.CharField()
+    is_removed = serializers.SerializerMethodField()
+
+    def get_is_removed(self, obj: PackageVersion) -> bool:
+        package_is_removed = not (
+            obj.package.is_active and obj.package_has_active_versions
+        )
+        if package_is_removed:
+            return True
+        return not obj.is_active
+
+    def get_description(self, obj: PackageVersion) -> str:
+        return (
+            obj.description
+            if obj.is_effectively_active
+            else "This package has been removed."
+        )
+
+    def get_icon_url(self, obj: PackageVersion) -> Optional[str]:
+        return obj.icon.url if obj.is_effectively_active else None
+
+
+class CyberstormPackageTeamSerializer(serializers.Serializer):
+    """
+    Minimal information to present the team on package detail view.
+    """
+
+    name = serializers.CharField()
+    members = CyberstormTeamMemberSerializer(many=True, source="public_members")

django/thunderstore/api/cyberstorm/serializers/package_listing.py

@@ -35,3 +35,10 @@ class PackageListingApproveSerializer(serializers.Serializer):
     internal_notes = serializers.CharField(
         allow_blank=True, allow_null=True, required=False
     )
+
+
+class PackageListingStatusResponseSerializer(serializers.Serializer):
+    review_status = serializers.CharField(required=False, allow_null=True)
+    rejection_reason = serializers.CharField(required=False, allow_null=True)
+    internal_notes = serializers.CharField(required=False, allow_null=True)
+    listing_admin_url = serializers.CharField(required=False, allow_null=True)

django/thunderstore/api/cyberstorm/serializers/package_version.py

@@ -0,0 +1,29 @@
+from rest_framework import serializers
+
+from thunderstore.api.cyberstorm.serializers.package import (
+    CyberstormPackageTeamSerializer,
+)
+from thunderstore.api.cyberstorm.serializers.utils import EmptyStringAsNoneField
+
+
+class PackageVersionResponseSerializer(serializers.Serializer):
+    """
+    Data shown on package version detail view.
+
+    Expects an annotated and customized CustomListing object.
+    """
+
+    datetime_created = serializers.DateTimeField(source="date_created")
+    dependency_count = serializers.IntegerField(min_value=0)
+    description = serializers.CharField()
+    download_count = serializers.IntegerField(source="downloads", min_value=0)
+    download_url = serializers.CharField(source="full_download_url")
+    full_version_name = serializers.CharField()
+    icon_url = serializers.CharField(source="icon.url")
+    install_url = serializers.CharField()
+    name = serializers.CharField()
+    version_number = serializers.CharField()
+    namespace = serializers.CharField(source="package.namespace.name")
+    size = serializers.IntegerField(min_value=0, source="file_size")
+    team = CyberstormPackageTeamSerializer(source="owner")
+    website_url = EmptyStringAsNoneField()

django/thunderstore/api/cyberstorm/serializers/team.py

@@ -4,6 +4,7 @@
 from rest_framework import serializers
 
 from thunderstore.repository.forms import AddTeamMemberForm
+from thunderstore.repository.models.team import TeamMemberRole
 from thunderstore.repository.validators import PackageReferenceComponentValidator
 from thunderstore.social.utils import get_user_avatar_url
 
@@ -60,3 +61,15 @@ class CyberstormTeamUpdateSerializer(serializers.Serializer):
     donation_link = serializers.CharField(
         max_length=1024, validators=[URLValidator(["https"])]
     )
+
+
+class CyberstormCreateServiceAccountSerializer(serializers.Serializer):
+    nickname = serializers.CharField(max_length=32)
+    team_name = serializers.CharField(read_only=True)
+    api_token = serializers.CharField(read_only=True)
+
+
+class CyberstormTeamMemberUpdateSerializer(serializers.Serializer):
+    role = serializers.ChoiceField(choices=TeamMemberRole.as_choices())
+    team_name = serializers.CharField(source="team.name", read_only=True)
+    username = serializers.CharField(source="user.username", read_only=True)

django/thunderstore/api/cyberstorm/serializers/utils.py

@@ -0,0 +1,18 @@
+from rest_framework import serializers
+
+
+class EmptyStringAsNoneField(serializers.Field):
+    """
+    Serialize empty string to None and deserialize vice versa.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.allow_null = True
+        self.allow_blank = True
+
+    def to_representation(self, value):
+        return None if value == "" else value
+
+    def to_internal_value(self, data):
+        return "" if data is None else data

django/thunderstore/api/cyberstorm/services/package_listing.py

@@ -1,5 +1,6 @@
 from django.db import transaction
 
+from thunderstore.core.exceptions import PermissionValidationError
 from thunderstore.core.types import UserType
 from thunderstore.permissions.utils import validate_user
 from thunderstore.repository.models import Package, PackageListing, PackageVersion
@@ -75,3 +76,13 @@ def report_package_listing(
         package_version=package_version,
         description=description,
     )
+
+
+@transaction.atomic
+def unlist_package_listing(agent: UserType, listing: PackageListing) -> None:
+
+    user = validate_user(agent)
+    if not user.is_superuser:
+        raise PermissionValidationError("Only superusers can unlist packages")
+
+    listing.package.deactivate()