token reset: rename method

Author: valentijnscholten

dojo/api_v2/views.py

@@ -171,7 +171,7 @@
 from dojo.risk_acceptance.queries import get_authorized_risk_acceptances
 from dojo.test.queries import get_authorized_test_imports, get_authorized_tests
 from dojo.tool_product.queries import get_authorized_tool_product_settings
-from dojo.user.security import force_token_reset
+from dojo.user.security import reset_token_for_user
 from dojo.user.utils import get_configuration_permissions_codenames
 from dojo.utils import (
     async_delete,
@@ -2421,7 +2421,7 @@ def destroy(self, request, *args, **kwargs):
     )
     def reset_api_token(self, request, pk=None):
         target_user = self.get_object()
-        force_token_reset(acting_user=request.user, target_user=target_user)
+        reset_token_for_user(acting_user=request.user, target_user=target_user)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

dojo/management/commands/force_token_reset.py

@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.core.management.base import BaseCommand, CommandError
 
-from dojo.user.security import force_token_reset
+from dojo.user.security import reset_token_for_user
 
 
 class Command(BaseCommand):
@@ -39,7 +39,7 @@ def handle(self, *args, **options):
             raise CommandError(msg) from exc
 
         try:
-            force_token_reset(acting_user=acting_user, target_user=target_user)
+            reset_token_for_user(acting_user=acting_user, target_user=target_user)
         except Exception as exc:
             raise CommandError(str(exc)) from exc
 

dojo/user/security.py

@@ -9,7 +9,7 @@
 from dojo.notifications.helper import create_notification
 
 
-def force_token_reset(*, acting_user: Dojo_User, target_user: Dojo_User) -> None:
+def reset_token_for_user(*, acting_user: Dojo_User, target_user: Dojo_User) -> None:
     if not settings.API_TOKENS_ENABLED:
         msg = "API tokens are disabled."
         raise PermissionDenied(msg)

unittests/test_user_ui_timestamps.py

@@ -8,7 +8,7 @@
 from django.utils.http import urlsafe_base64_encode
 
 from dojo.models import Dojo_User, User, UserContactInfo
-from dojo.user.security import force_token_reset
+from dojo.user.security import reset_token_for_user
 
 
 class TestUserUITimestamps(TestCase):
@@ -22,7 +22,7 @@ def test_view_user_contains_timestamps(self, mock_create_notification):
         # Create a target user and rotate their token at a fixed time.
         target = User.objects.create(username="ui-ts-target", email="ui-ts-target@dojo.com")
         with patch("dojo.user.security.timezone.now", return_value=fixed):
-            force_token_reset(acting_user=admin, target_user=target)
+            reset_token_for_user(acting_user=admin, target_user=target)
 
         # Ensure the UI can render and the timestamps match what we wrote.
         self.client.force_login(admin)