From c5fe2486e29c08680a3ba5ff41c116d642f35561 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 15 Mar 2021 15:52:13 +0100 Subject: [PATCH 1/3] manager: rename site_json field (#24921) --- src/authentic2/manager/forms.py | 6 +++--- src/authentic2/manager/ou_views.py | 4 ++-- src/authentic2/manager/role_views.py | 4 ++-- src/authentic2/manager/views.py | 4 ++-- tests/test_manager.py | 6 +++--- tests/test_ou_manager.py | 4 ++-- tests/test_role_manager.py | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/authentic2/manager/forms.py b/src/authentic2/manager/forms.py index 0a212ac3..99be39f0 100644 --- a/src/authentic2/manager/forms.py +++ b/src/authentic2/manager/forms.py @@ -674,11 +674,11 @@ class UserChangeEmailForm(CssClass, FormWithRequest, forms.ModelForm): class SiteImportForm(forms.Form): file_field_label = _('Site Export File') - site_json = forms.FileField(label=file_field_label) + import_file = forms.FileField(label=file_field_label) - def clean_site_json(self): + def clean_import_file(self): try: - return json.loads(self.cleaned_data['site_json'].read().decode()) + return json.loads(self.cleaned_data['import_file'].read().decode()) except ValueError: raise ValidationError(_('File is not in the expected JSON format.')) diff --git a/src/authentic2/manager/ou_views.py b/src/authentic2/manager/ou_views.py index 7f3d78d3..c2513485 100644 --- a/src/authentic2/manager/ou_views.py +++ b/src/authentic2/manager/ou_views.py @@ -137,9 +137,9 @@ class OusImportView(views.PermissionMixin, views.TitleMixin, views.MediaMixin, v try: context = data_transfer.ImportContext(import_roles=False) with transaction.atomic(): - data_transfer.import_site(form.cleaned_data['site_json'], context) + data_transfer.import_site(form.cleaned_data['import_file'], context) except ValidationError as e: - form.add_error('site_json', e) + form.add_error('import_file', e) return self.form_invalid(form) return super().form_valid(form) diff --git a/src/authentic2/manager/role_views.py b/src/authentic2/manager/role_views.py index bba2dbca..ff1a2af6 100644 --- a/src/authentic2/manager/role_views.py +++ b/src/authentic2/manager/role_views.py @@ -572,9 +572,9 @@ class RolesImportView(views.PermissionMixin, views.TitleMixin, views.MediaMixin, try: context = data_transfer.ImportContext(import_ous=False, set_ou=self.ou) with transaction.atomic(): - data_transfer.import_site(form.cleaned_data['site_json'], context) + data_transfer.import_site(form.cleaned_data['import_file'], context) except ValidationError as e: - form.add_error('site_json', e) + form.add_error('import_file', e) return self.form_invalid(form) return super().form_valid(form) diff --git a/src/authentic2/manager/views.py b/src/authentic2/manager/views.py index 76c691c4..337507c5 100644 --- a/src/authentic2/manager/views.py +++ b/src/authentic2/manager/views.py @@ -721,9 +721,9 @@ class SiteImportView(MediaMixin, TitleMixin, FormView): def form_valid(self, form): try: with transaction.atomic(): - import_site(form.cleaned_data['site_json'], ImportContext()) + import_site(form.cleaned_data['import_file'], ImportContext()) except ValidationError as e: - form.add_error('site_json', e) + form.add_error('import_file', e) return self.form_invalid(form) return super(SiteImportView, self).form_valid(form) diff --git a/tests/test_manager.py b/tests/test_manager.py index d4b5fb21..87286dba 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -710,7 +710,7 @@ def test_manager_site_import(app, db, superuser): "uuid": "6eb7bbf64bf547119120f925f0e560ac" }] } - form['site_json'] = Upload( + form['import_file'] = Upload( 'site_export.json', force_bytes(json.dumps(site_export).encode('ascii')), 'application/octet-stream') res = form.submit() assert res.status_code == 302 @@ -735,7 +735,7 @@ def test_manager_site_import_error(app, db, superuser): "uuid": "6eb7bbf64bf547119120f925f0e560ac" }] } - form['site_json'] = Upload( + form['import_file'] = Upload( 'site_export.json', force_bytes(json.dumps(site_export).encode('ascii')), 'application/octet-stream') res = form.submit() assert res.status_code == 200 @@ -743,7 +743,7 @@ def test_manager_site_import_error(app, db, superuser): with pytest.raises(Role.DoesNotExist): Role.objects.get(slug='basic') - form['site_json'] = Upload( + form['import_file'] = Upload( 'site_export.json', force_bytes(json.dumps([])), 'application/octet-stream') res = form.submit() assert res.status_code == 200 diff --git a/tests/test_ou_manager.py b/tests/test_ou_manager.py index 89cdfcc2..f8b0c1d9 100644 --- a/tests/test_ou_manager.py +++ b/tests/test_ou_manager.py @@ -59,7 +59,7 @@ def test_manager_ou_import(app, admin, ou1, role_ou1, ou2, role_ou2): resp = app.get('/manage/organizational-units/') resp = resp.click('Import') - resp.form['site_json'] = Upload('export.json', json.dumps(export).encode(), 'application/json') + resp.form['import_file'] = Upload('export.json', json.dumps(export).encode(), 'application/json') resp = resp.form.submit().follow() assert OU.objects.filter(name=ou1.name).exists() @@ -78,7 +78,7 @@ def test_manager_ou_import(app, admin, ou1, role_ou1, ou2, role_ou2): "name": "should_not_exist", }] resp = resp.click('Import') - resp.form['site_json'] = Upload('export.json', json.dumps(export).encode(), 'application/json') + resp.form['import_file'] = Upload('export.json', json.dumps(export).encode(), 'application/json') resp = resp.form.submit().follow() assert not Role.objects.filter(slug="should_not_exist").exists() diff --git a/tests/test_role_manager.py b/tests/test_role_manager.py index be869077..19203d18 100644 --- a/tests/test_role_manager.py +++ b/tests/test_role_manager.py @@ -130,7 +130,7 @@ def test_manager_role_import(app, admin, ou1, role_ou1, ou2, role_ou2): resp = app.get('/manage/roles/') resp = resp.click('Import') - resp.form['site_json'] = Upload('export.json', json.dumps(export).encode(), 'application/json') + resp.form['import_file'] = Upload('export.json', json.dumps(export).encode(), 'application/json') resp = resp.form.submit().follow() assert Role.objects.filter(name=role_ou1.name, ou=get_default_ou()).exists() @@ -147,7 +147,7 @@ def test_manager_role_import(app, admin, ou1, role_ou1, ou2, role_ou2): resp = app.get('/manage/roles/') resp = resp.click('Import') - resp.form['site_json'] = Upload('export.json', json.dumps(export).encode(), 'application/json') + resp.form['import_file'] = Upload('export.json', json.dumps(export).encode(), 'application/json') resp.form['ou'] = ou1.pk resp = resp.form.submit().follow() @@ -163,7 +163,7 @@ def test_manager_role_import(app, admin, ou1, role_ou1, ou2, role_ou2): }] resp = app.get('/manage/roles/') # unselect ou1 resp = resp.click('Import') - resp.form['site_json'] = Upload('export.json', json.dumps(export).encode(), 'application/json') + resp.form['import_file'] = Upload('export.json', json.dumps(export).encode(), 'application/json') resp = resp.form.submit().follow() assert not OrganizationalUnit.objects.filter(slug="should_not_exist").exists() @@ -184,7 +184,7 @@ def test_manager_role_import_single_ou(app, admin, simple_role): assert not 'Organizational unit' in resp.text assert resp.form['ou'].attrs['type'] == 'hidden' - resp.form['site_json'] = Upload('export.json', json.dumps(export).encode(), 'application/json') + resp.form['import_file'] = Upload('export.json', json.dumps(export).encode(), 'application/json') resp = resp.form.submit().follow() imported_role = Role.objects.get(slug=simple_role.slug) -- 2.20.1