Merge branch 'hotfix/25.17.8'

Author: adlius

admin/users/views.py

@@ -503,7 +503,7 @@ def get_claim_links(self, user):
 
         for guid, value in user.unclaimed_records.items():
             obj = Guid.load(guid)
-            url = f'{DOMAIN}user/{user._id}/{guid}/claim/?token={value["token"]}'
+            url = f'{DOMAIN}legacy/user/{user._id}/{guid}/claim/?token={value["token"]}'
             links.append(f'Claim URL for {obj.content_type.model} {obj._id}: {url}')
 
         return links or ['User currently has no active unclaimed records for any nodes.']

osf/models/user.py

@@ -1701,7 +1701,7 @@ def get_claim_url(self, project_id, external=False):
         base_url = website_settings.DOMAIN if external else '/'
         unclaimed_record = self.get_unclaimed_record(project_id)
         token = unclaimed_record['token']
-        return f'{base_url}user/{uid}/{project_id}/claim/?token={token}'
+        return f'{base_url}legacy/user/{uid}/{project_id}/claim/?token={token}'
 
     def is_affiliated_with_institution(self, institution):
         """Return if this user is affiliated with the given ``institution``."""

osf_tests/test_user.py

@@ -1153,7 +1153,7 @@ def test_get_claim_url(self, unreg_user, unreg_moderator, project, provider):
         domain = settings.DOMAIN
         assert (
             unreg_user.get_claim_url(pid, external=True) ==
-            f'{domain}user/{uid}/{pid}/claim/?token={token}'
+            f'{domain}legacy/user/{uid}/{pid}/claim/?token={token}'
         )
 
         # test_unreg_moderator
@@ -1163,7 +1163,7 @@ def test_get_claim_url(self, unreg_user, unreg_moderator, project, provider):
         domain = settings.DOMAIN
         assert (
             unreg_moderator.get_claim_url(pid, external=True) ==
-            f'{domain}user/{uid}/{pid}/claim/?token={token}'
+            f'{domain}legacy/user/{uid}/{pid}/claim/?token={token}'
         )
 
     def test_get_claim_url_raises_value_error_if_not_valid_pid(self, unreg_user, unreg_moderator):

tests/test_adding_contributor_views.py

@@ -626,7 +626,7 @@ def test_claim_user_already_registered_redirects_to_claim_user_registered(self,
 
         # claim link for the now registered email is accessed while not logged in
         token = unregistered_user.get_unclaimed_record(self.project._primary_key)['token']
-        claim_url = f'/user/{unregistered_user._id}/{self.project._id}/claim/?token={token}'
+        claim_url = f'/legacy/user/{unregistered_user._id}/{self.project._id}/claim/?token={token}'
         res = self.app.get(claim_url)
 
         # should redirect to 'claim_user_registered' view
@@ -668,7 +668,7 @@ def test_claim_user_already_registered_secondary_email_redirects_to_claim_user_r
 
         # claim link for the now registered email is accessed while not logged in
         token = unregistered_user.get_unclaimed_record(self.project._primary_key)['token']
-        claim_url = f'/user/{unregistered_user._id}/{self.project._id}/claim/?token={token}'
+        claim_url = f'/legacy/user/{unregistered_user._id}/{self.project._id}/claim/?token={token}'
         res = self.app.get(claim_url)
 
         # should redirect to 'claim_user_registered' view
@@ -854,7 +854,7 @@ def test_get_valid_form(self):
     def test_invalid_claim_form_raise_400(self):
         uid = self.user._primary_key
         pid = self.project._primary_key
-        url = f'/user/{uid}/{pid}/claim/?token=badtoken'
+        url = f'/legacy/user/{uid}/{pid}/claim/?token=badtoken'
         res = self.app.get(url, follow_redirects=True)
         assert res.status_code == 400
 

website/routes.py

@@ -857,7 +857,7 @@ def make_url_map(app):
         # user will be required to set email and password
         # claim token must be present in query parameter
         Rule(
-            ['/user/<uid>/<pid>/claim/'],
+            ['/legacy/user/<uid>/<pid>/claim/'],
             ['get', 'post'],
             project_views.contributor.claim_user_form,
             OsfWebRenderer('claim_account.mako', trust=False)