OpenConceptLab/ocl_issues#1335 | Admin can force mark verified any user

OpenConceptLab · Jul 14, 2022 · fa8a898 · fa8a898
1 parent bdc6af3
commit fa8a898
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/users/models.py b/core/users/models.py
@@ -142,11 +142,11 @@ def email_verification_url(self):
     def reset_password_url(self):
         return f"{web_url()}/#/accounts/{self.username}/password/reset/{self.verification_token}/"
 
-    def mark_verified(self, token):
+    def mark_verified(self, token, force=False):
         if self.verified:
             return True
 
-        if token == self.verification_token:
+        if token == self.verification_token or force:
             self.verified = True
             self.verification_token = None
             self.deactivated_at = None

diff --git a/core/users/views.py b/core/users/views.py
@@ -180,7 +180,7 @@ def get(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         if not user:
             return Response(status=status.HTTP_404_NOT_FOUND)
 
-        result = user.mark_verified(kwargs.get('verification_token'))
+        result = user.mark_verified(token=kwargs.get('verification_token'), force=user.is_staff)
         if result:
             update_last_login(None, user)
             return Response({'token': user.get_token()}, status=status.HTTP_200_OK)