Refactor get_context_data to be in line with project convention

Author: ramonakira

packages/hidp/hidp/otp/views.py

@@ -201,9 +201,7 @@ def get_form_kwargs(self):
         return kwargs
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        return context | {
+        context = {
             "title": _("Set up two-factor authentication"),
             "device": self.device,
             "backup_device": self.backup_device,
@@ -215,6 +213,7 @@ def get_context_data(self, **kwargs):
             "back_url": reverse("hidp_otp_management:manage"),
             "logout_url": reverse("hidp_accounts:logout"),
         }
+        return super().get_context_data() | context | kwargs
 
     def form_valid(self, form):
         form.save()
@@ -281,10 +280,11 @@ def get_recovery_code_url(self, request):  # noqa: PLR6301
         return base_url
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["recovery_code_url"] = self.get_recovery_code_url(self.request)
-        context["logout_url"] = reverse("hidp_accounts:logout")
-        return context
+        context = {
+            "recovery_code_url": self.get_recovery_code_url(self.request),
+            "logout_url": reverse("hidp_accounts:logout"),
+        }
+        return super().get_context_data() | context | kwargs
 
 
 class VerifyRecoveryCodeView(VerifyOTPBase):