Merge pull request #11390 from CenterForOpenScience/develop

Merge develop into `feature/pbs-25-21`

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.']

api_tests/base/test_utils.py

@@ -5,7 +5,6 @@
 from django.conf import settings as django_conf_settings
 
 from rest_framework import fields
-from rest_framework.exceptions import ValidationError
 
 from api.base import utils as api_utils
 from osf.models.base import coerce_guid, Guid, GuidMixin, OptionalGuidMixin, VersionedGuidMixin, InvalidGuid
@@ -63,47 +62,6 @@ def test_push_status_message_no_response(self):
             except BaseException:
                 assert False, f'Exception from push_status_message via API v2 with type "{status}".'
 
-    def test_push_status_message_expected_error(self):
-        status_message = 'This is a message'
-        try:
-            push_status_message(status_message, kind='error')
-            assert False, 'push_status_message() should have generated a ValidationError exception.'
-
-        except ValidationError as e:
-            assert (
-                e.detail[0] == status_message
-            ), 'push_status_message() should have passed along the message with the Exception.'
-
-        except RuntimeError:
-            assert False, 'push_status_message() should have caught the runtime error and replaced it.'
-
-        except BaseException:
-            assert False, 'Exception from push_status_message when called from the v2 API with type "error"'
-
-    @mock.patch('framework.status.get_session')
-    def test_push_status_message_unexpected_error(self, mock_get_session):
-        status_message = 'This is a message'
-        exception_message = 'this is some very unexpected problem'
-        mock_session = mock.Mock()
-        mock_session.attach_mock(mock.Mock(side_effect=RuntimeError(exception_message)), 'get')
-        mock_get_session.return_value = mock_session
-        try:
-            push_status_message(status_message, kind='error')
-            assert False, 'push_status_message() should have generated a RuntimeError exception.'
-        except ValidationError:
-            assert False, 'push_status_message() should have re-raised the RuntimeError not gotten ValidationError.'
-        except RuntimeError as e:
-            assert str(e) == exception_message, (
-                'push_status_message() should have re-raised the '
-                'original RuntimeError with the original message.'
-            )
-
-        except BaseException:
-            assert False, (
-                'Unexpected Exception from push_status_message when called '
-                'from the v2 API with type "error"'
-            )
-
 
 @pytest.mark.django_db
 class TestCoerceGuid:

api_tests/files/views/test_file_detail.py

@@ -121,10 +121,8 @@ def test_file_with_wrong_guid(self, app, user):
     def test_file_guid_not_created_with_basic_auth(
             self, mock_allow, app, user, file_url):
         res = app.get(f'{file_url}?create_guid=1', auth=user.auth)
-        guid = res.json['data']['attributes'].get('guid', None)
         assert res.status_code == 200
         assert mock_allow.call_count == 1
-        assert guid is None
 
     @mock.patch('api.base.throttling.CreateGuidThrottle.allow_request')
     def test_file_guid_created_with_cookie(

api_tests/metadata_records/test_custom_item_metadata.py

@@ -351,6 +351,7 @@ def test_with_write_permission(self, app, public_osfguid, private_osfguid, anybo
                     resource_type_general='book-chapter',
                 ),
                 auth=anybody_with_write_permission.auth,
+                expect_errors=True,
             )
             assert res.status_code == 400
             expected.assert_expectations(db_record=db_record, api_record=None)  # db unchanged

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

@@ -1151,7 +1151,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
@@ -1161,7 +1161,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):

tasks/__init__.py

@@ -372,7 +372,6 @@ def test_module(ctx, module=None, numprocesses=None, nocapture=False, params=Non
     'api_tests/guids',
     'api_tests/meetings',
     'api_tests/metadata_records',
-    'api_tests/osf_groups',
     'api_tests/reviews',
     'api_tests/regions',
     'api_tests/search',

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)