[ENG-6195] Fix admin confirmation link generation and handling

admin/users/views.py

@@ -21,6 +21,7 @@
 from osf.models.base import Guid
 from osf.models.user import OSFUser
 from osf.models.spam import SpamStatus
+from osf.utils.users import get_or_refresh_confirmation_link
 from framework.auth import get_user
 from framework.auth.core import generate_verification_key
 
@@ -456,10 +457,10 @@ def get_context_data(self, **kwargs):
 
 class GetUserConfirmationLink(GetUserLink):
     def get_link(self, user):
-        try:
-            return user.get_confirmation_url(user.username, force=True)
-        except KeyError as e:
-            return str(e)
+        result = get_or_refresh_confirmation_link(user._id)
+        if 'confirmation_link' in result:
+            return result['confirmation_link']
+        return result['error']
 
     def get_link_type(self):
         return 'User Confirmation'

admin_tests/users/test_views.py

@@ -486,9 +486,12 @@ def test_get_user_confirmation_link(self):
         view = views.GetUserConfirmationLink()
         view = setup_view(view, request, guid=user._id)
 
-        user_token = list(user.email_verifications.keys())[0]
-        ideal_link_path = f'/confirm/{user._id}/{user_token}/'
         link = view.get_link(user)
+
+        link_furl = furl(link)
+        generated_token = link_furl.path.segments[-1]
+
+        ideal_link_path = f'/confirm/{user._id}/{generated_token}'
         link_path = str(furl(link).path)
 
         assert link_path == ideal_link_path
@@ -504,10 +507,12 @@ def test_get_user_confirmation_link_with_expired_token(self):
         user.save()
 
         link = view.get_link(user)
-        new_user_token = list(user.email_verifications.keys())[0]
 
+        link_furl = furl(link)
+        generated_token = link_furl.path.segments[-1]
+
+        ideal_link_path = f'/confirm/{user._id}/{generated_token}'
         link_path = str(furl(link).path)
-        ideal_link_path = f'/confirm/{user._id}/{new_user_token}/'
 
         assert link_path == ideal_link_path
 

osf/utils/users.py

@@ -0,0 +1,36 @@
+from django.utils import timezone
+from osf.models import OSFUser
+from django.core.exceptions import ValidationError
+from website.settings import DOMAIN
+
+def get_or_refresh_confirmation_link(uid):
+    u = OSFUser.load(uid)
+    if u.is_confirmed:
+        return {'error': f'User {uid} is already confirmed'}
+
+    if u.deleted or u.is_merged:
+        return {'error': f'User {uid} is deleted or merged'}
+
+    confirmation_link = None
+    if u.emails.filter(address=u.username).exists():
+        for token, data in u.email_verifications.items():
+            if data['email'] == u.username and data['expiration'] < timezone.now():
+                u.email_verifications[token]['expiration'] = timezone.now() + timezone.timedelta(days=30)
+                u.save()
+                confirmation_link = f'{DOMAIN.rstrip("/")}/confirm/{u._id}/{token}'
+                return {'confirmation_link': confirmation_link}
+    else:
+        try:
+            u.add_unconfirmed_email(u.username)
+            u.save()
+            for token, data in u.email_verifications.items():
+                if data['email'] == u.username:
+                    confirmation_link = f'{DOMAIN.rstrip("/")}/confirm/{u._id}/{token}'
+                    return {'confirmation_link': confirmation_link}
+        except ValidationError:
+            return {'error': f'Invalid email for user {uid}'}
+
+    if confirmation_link:
+        return {'confirmation_link': confirmation_link}
+    else:
+        return {'error': 'Could not generate or refresh confirmation link'}