rdmo 2.2.2__tar.gz → 2.3.0rc1__tar.gz

rdmo-2.3.0rc1/PKG-INFO

@@ -0,0 +1,115 @@
+Metadata-Version: 2.2
+Name: rdmo
+Version: 2.3.0rc1
+Summary: RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project.
+Author-email: RDMO Arbeitsgemeinschaft <rdmo-team@listserv.dfn.de>
+License: Apache-2.0
+Project-URL: changelog, https://github.com/rdmorganiser/rdmo/blob/main/CHANGELOG.md
+Project-URL: documentation, https://rdmo.readthedocs.io
+Project-URL: homepage, https://rdmorganiser.github.io
+Project-URL: issues, https://github.com/rdmorganiser/rdmo/issues
+Project-URL: repository, https://github.com/rdmorganiser/rdmo.git
+Project-URL: slack, https://rdmo.slack.com
+Keywords: data management plan,dmp,rdmo,research data,research data management
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django :: 4.2
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+License-File: NOTICE
+License-File: AUTHORS
+Requires-Dist: defusedcsv<3.0,>=2.0
+Requires-Dist: defusedxml<1.0,>=0.7.1
+Requires-Dist: django<5.0,>=4.2
+Requires-Dist: django-cleanup<10.0,>=8.0
+Requires-Dist: django-compressor<5.0,>=4.4
+Requires-Dist: django-extensions<4.0,>=3.2
+Requires-Dist: django-filter<25.0,>=23.2
+Requires-Dist: django-libsass<1.0,>=0.9
+Requires-Dist: django-mathfilters<2.0,>=1.0
+Requires-Dist: django-mptt<1.0.0,>=0.16.0
+Requires-Dist: django-rest-swagger<3.0,>=2.2
+Requires-Dist: django-settings-export<2.0,>=1.2
+Requires-Dist: django-split-settings<2.0,>=1.2
+Requires-Dist: django-widget-tweaks<2.0,>=1.5
+Requires-Dist: djangorestframework<4.0,>=3.15
+Requires-Dist: drf-extensions<1.0,>=0.7.1
+Requires-Dist: iso8601<3.0,>=2.0
+Requires-Dist: markdown<4.0,>=3.4
+Requires-Dist: packaging<25.0,>=23.2
+Requires-Dist: pypandoc<2.0,>=1.11
+Requires-Dist: requests-toolbelt<2.0,>=1.0
+Requires-Dist: rules<4.0,>=3.4
+Provides-Extra: allauth
+Requires-Dist: django-allauth[openid,socialaccount]<65.4.0,>=64.1.0; extra == "allauth"
+Provides-Extra: ci
+Requires-Dist: rdmo[dev]; extra == "ci"
+Requires-Dist: pytest-github-actions-annotate-failures<0.4.0,>=0.2.0; extra == "ci"
+Provides-Extra: dev
+Requires-Dist: build<2.0,>=1.0; extra == "dev"
+Requires-Dist: pipdeptree<3.0,>=2.13; extra == "dev"
+Requires-Dist: pre-commit<5.0,>=3.4; extra == "dev"
+Requires-Dist: setuptools<76,>=73; extra == "dev"
+Requires-Dist: twine<7.0,>=5.1.1; extra == "dev"
+Requires-Dist: wheel<0.46,>=0.42; extra == "dev"
+Requires-Dist: rdmo[allauth]; extra == "dev"
+Requires-Dist: rdmo[pytest]; extra == "dev"
+Provides-Extra: gunicorn
+Requires-Dist: gunicorn<24.0,>=23.0; extra == "gunicorn"
+Provides-Extra: ldap
+Requires-Dist: django-auth-ldap<6.0,>=4.5; extra == "ldap"
+Provides-Extra: mysql
+Requires-Dist: mysqlclient<3.0,>=2.2; extra == "mysql"
+Provides-Extra: postgres
+Requires-Dist: psycopg[binary]<4.0,>=3.1; extra == "postgres"
+Provides-Extra: pytest
+Requires-Dist: pytest<9.0,>=8.0; extra == "pytest"
+Requires-Dist: pytest-cov<7.0,>=4.1; extra == "pytest"
+Requires-Dist: pytest-django<5.0,>=4.5; extra == "pytest"
+Requires-Dist: pytest-mock<4.0,>=3.11; extra == "pytest"
+Requires-Dist: pytest-playwright<0.8.0,>=0.4.3; extra == "pytest"
+Requires-Dist: pytest-randomly<4.0,>=3.15; extra == "pytest"
+Requires-Dist: pytest-xdist<4.0,>=3.3; extra == "pytest"
+
+RDMO - Research Data Management Organiser
+=========================================
+
+[![Latest release](https://img.shields.io/pypi/v/rdmo.svg?style=flat)](https://pypi.python.org/pypi/rdmo/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/rdmo.svg?style=flat)](https://www.python.org/)
+[![Django Versions](https://img.shields.io/pypi/frameworkversions/django/rdmo)](https://pypi.python.org/pypi/rdmo/)
+[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/main/LICENSE) \
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/rdmorganiser/rdmo/main.svg)](https://results.pre-commit.ci/latest/github/rdmorganiser/rdmo/main)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![CI Workflow Status](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml/badge.svg)](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml)
+[![Coverage Status](https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=main&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=main)
+[![Documentation status](https://readthedocs.org/projects/rdmo/badge/?version=latest)](http://rdmo.readthedocs.io/en/latest/?badge=latest)
+
+RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project. RDMO is funded by the Deutsche Forschungsgemeinschaft (DFG).
+
+<dl>
+  <dt>Home Page</dt>
+  <dd>https://rdmorganiser.github.io</dd>
+  <dt>Source code</dt>
+  <dd>https://github.com/rdmorganiser/rdmo</dd>
+  <dt>Documentation</dt>
+  <dd>https://rdmo.readthedocs.io</dd>
+  <dt>Mailing list</dt>
+  <dd>https://www.listserv.dfn.de/sympa/subscribe/rdmo</dd>
+  <dt>Slack</dt>
+  <dd>https://rdmo.slack.com</dd>
+  <dt>Demo</dt>
+  <dd>https://rdmo.aip.de</dd>
+</dl>
+
+If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionnaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.

rdmo-2.3.0rc1/pyproject.toml

@@ -0,0 +1,245 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools", "wheel"]
+
+[project]
+name = "rdmo"
+description = "RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project."
+readme = "README.md"
+keywords = [
+  "data management plan",
+  "dmp",
+  "rdmo",
+  "research data",
+  "research data management",
+]
+license = {text = "Apache-2.0"}
+authors = [
+  {name = "RDMO Arbeitsgemeinschaft", email = "rdmo-team@listserv.dfn.de"},
+]
+requires-python = ">=3.9"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Web Environment",
+  "Framework :: Django :: 4.2",
+  "Intended Audience :: Science/Research",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+]
+dynamic = [
+  "version",
+]
+dependencies = [
+  # dependencies with major version on zero are declared with
+  # major.minor.patch, because they can potentially introduce breaking changes
+  # in minor version updates anytime
+  "defusedcsv>=2.0,<3.0",
+  "defusedxml>=0.7.1,<1.0",
+  "django>=4.2,<5.0",
+  "django-cleanup>=8.0,<10.0",
+  "django-compressor>=4.4,<5.0",
+  "django-extensions>=3.2,<4.0",
+  "django-filter>=23.2,<25.0",
+  "django-libsass>=0.9,<1.0",
+  "django-mathfilters>=1.0,<2.0",
+  "django-mptt>=0.16.0,<1.0.0",
+  "django-rest-swagger>=2.2,<3.0",
+  "django-settings-export>=1.2,<2.0",
+  "django-split-settings>=1.2,<2.0",
+  "django-widget-tweaks>=1.5,<2.0",
+  "djangorestframework>=3.15,<4.0",
+  "drf-extensions>=0.7.1,<1.0",
+  "iso8601>=2.0,<3.0",
+  "markdown>=3.4,<4.0",
+  "packaging>=23.2,<25.0",
+  "pypandoc>=1.11,<2.0",
+  "requests-toolbelt>=1.0,<2.0",
+  "rules>=3.4,<4.0",
+]
+
+[project.optional-dependencies]
+allauth = [
+  "django-allauth[socialaccount,openid]>=64.1.0,<65.4.0",
+]
+ci = [
+  "rdmo[dev]",
+  "pytest-github-actions-annotate-failures>=0.2.0,<0.4.0",
+]
+dev = [
+  "build>=1.0,<2.0",
+  "pipdeptree>=2.13,<3.0",
+  "pre-commit>=3.4,<5.0",
+  "setuptools>=73,<76",
+  "twine>=5.1.1,<7.0",
+  "wheel>=0.42,<0.46",
+  "rdmo[allauth]",
+  "rdmo[pytest]",
+]
+gunicorn = [
+  "gunicorn>=23.0,<24.0",
+]
+ldap = [
+  "django-auth-ldap>=4.5,<6.0",
+]
+mysql = [
+  "mysqlclient>=2.2,<3.0",
+]
+postgres = [
+  "psycopg[binary]>=3.1,<4.0",
+]
+pytest = [
+  "pytest>=8.0,<9.0",
+  "pytest-cov>=4.1,<7.0",
+  "pytest-django>=4.5,<5.0",
+  "pytest-mock>=3.11,<4.0",
+  "pytest-playwright>=0.4.3,<0.8.0",
+  "pytest-randomly>=3.15,<4.0",
+  "pytest-xdist>=3.3,<4.0",
+]
+
+[project.urls]
+changelog = "https://github.com/rdmorganiser/rdmo/blob/main/CHANGELOG.md"
+documentation = "https://rdmo.readthedocs.io"
+homepage = "https://rdmorganiser.github.io"
+issues = "https://github.com/rdmorganiser/rdmo/issues"
+repository = "https://github.com/rdmorganiser/rdmo.git"
+slack = "https://rdmo.slack.com"
+
+[project.scripts]
+rdmo-admin = "rdmo.__main__:main"
+
+[tool.setuptools.packages.find]
+include = ["rdmo*"]
+exclude = ["*assets*", "*tests*"]
+
+[tool.setuptools.package-data]
+"*" = ["*"]
+
+[tool.setuptools.dynamic]
+version = {attr = "rdmo.__version__"}
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+select = [
+  "B",    # flake8-bugbear
+  "C4",   # flake8-comprehensions
+  "DJ",   # flake8-django
+  "E",    # pycodestyle
+  "F",    # pyflakes
+  "I",    # isort
+  "PGH",  # pygrep-hooks
+  "PT",   # flake8-pytest-style
+  "RUF",  # ruff
+  "UP",   # pyupgrade
+  "W",    # pycodestyle
+  "YTT",  # flake8-2020
+  "G",    # flake8-logging-format
+  "INT"   # flake8-gettext
+]
+ignore = [
+  "B006",   # mutable-argument-default
+  "B007",   # unused-loop-control-variable
+  "B018",   # useless-expression
+  "RUF012", # mutable-class-default
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["rdmo"]
+section-order = [
+  "future",
+  "standard-library",
+  "pytest",
+  "django",
+  "rest_framework",
+  "third-party",
+  "first-party",
+  "local-folder"
+]
+
+[tool.ruff.lint.isort.sections]
+pytest = ["pytest"]
+django = ["django"]
+rest_framework = ["rest_framework"]
+
+[tool.ruff.lint.per-file-ignores]
+"rdmo/**/models/__init__.py" = [
+  "F401", # unused-import
+]
+"rdmo/**/serializers/v1/__init__.py" = [
+  "F401", # unused-import
+]
+"rdmo/**/views/__init__.py" = [
+  "F401", # unused-import
+]
+"rdmo/**/tests/test_*.py" = [
+  "S101", # assert
+  "S106", # hardcoded-password-func-arg
+]
+"testing/config/settings/*.py" = [
+  "F401", # unused-import
+  "F403", # undefined-names
+  "F405", # undefined-names
+  "F821", # undefined-names
+]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+parametrize-names-type = "csv"
+
+[tool.pytest.ini_options]
+DJANGO_SETTINGS_MODULE = "config.settings"
+testpaths = ["rdmo/*/tests"]
+pythonpath = [".", "testing"]
+addopts = '-p no:randomly -m "not e2e"'
+markers = [
+  "e2e: marks tests as end-to-end tests using playwright (deselect with '-m \"not e2e\"')",
+]
+filterwarnings = [
+  # fail on RemovedInDjango50Warning exception
+  "error::django.utils.deprecation.RemovedInDjango50Warning",
+
+  # ignore warnings raised from within coreapi 2.3.3
+  "ignore:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
+  "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
+
+  # ignore warning from rest_framework about coreapi
+  "ignore:CoreAPI compatibility is deprecated and will be removed in DRF 3.17:rest_framework.RemovedInDRF317Warning",
+
+  # ignore warning from django_filters
+  "ignore:Built-in schema generation is deprecated. Use drf-spectacular.:django_filters.RemovedInDjangoFilter25Warning",
+
+  # ignore warnings raised from within django itself
+  # django/core/files/storage/__init__.py
+  "ignore:django.core.files.storage.get_storage_class is deprecated:django.utils.deprecation.RemovedInDjango51Warning",
+]
+
+[tool.coverage.run]
+source = ["rdmo"]
+branch = true
+parallel = true
+
+[tool.coverage.report]
+omit = [
+    "*/management/*",
+    "*/migrations/*",
+    "*/tests/*",
+]
+exclude_lines = [
+    "raise Exception",
+    "except ImportError:"
+]
+
+[tool.typos] # Ref: https://github.com/crate-ci/typos/blob/master/docs/reference.md
+# add "spellchecker:disable-line" to ignore specific lines
+default.extend-ignore-re = [
+  "(?Rm)^.*(#|//)\\s*spellchecker:disable-line$", # for .py files
+  "(?Rm)^.*<!-- spellchecker:disable-line -->$", # for .html files
+]

rdmo-2.3.0rc1/rdmo/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.3.0rc1"

rdmo-2.3.0rc1/rdmo/__main__.py

@@ -0,0 +1,27 @@
+'''
+Runs rdmo-admin when the rdmo module is run as a script, much like django-admin
+(see: https://github.com/django/django/blob/main/django/__main__.py):
+
+    python -m rdmo check
+
+The main method is added as script in pyproject.toml so that
+
+    rdmo-admin check
+
+works as well. Unlike django-admin, a set of generic settings is used for the
+management scripts.
+'''
+
+import os
+
+from django.core import management
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "rdmo.core.management.settings")
+
+
+def main():
+    management.execute_from_command_line()
+
+
+if __name__ == "__main__":
+    main()

rdmo-2.3.0rc1/rdmo/accounts/account.py

@@ -0,0 +1,56 @@
+from django.conf import settings
+from django.contrib.auth.models import Group
+from django.forms import BooleanField
+
+from allauth.account.adapter import DefaultAccountAdapter
+from allauth.account.forms import LoginForm as AllauthLoginForm
+from allauth.account.forms import SignupForm as AllauthSignupForm
+
+from .forms import ProfileForm
+from .models import ConsentFieldValue
+
+
+class AccountAdapter(DefaultAccountAdapter):
+
+    def is_open_for_signup(self, request):
+        return settings.ACCOUNT_SIGNUP
+
+    def save_user(self, request, user, form, commit=True):
+        user = super().save_user(request, user, form, commit)
+
+        if settings.ACCOUNT_GROUPS:
+            groups = Group.objects.filter(name__in=settings.ACCOUNT_GROUPS)
+            user.groups.set(groups)
+
+        return user
+
+
+class LoginForm(AllauthLoginForm):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # remove forget password link introduced with allauth 0.57.0
+        password_field = self.fields.get('password')
+        if password_field:
+            password_field.help_text = None
+
+
+class SignupForm(AllauthSignupForm, ProfileForm):
+
+    use_required_attribute = False
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # add a consent field, the label is added in the template
+        if settings.ACCOUNT_TERMS_OF_USE:
+            self.fields['consent'] = BooleanField(required=True)
+
+    def signup(self, request, user):
+        self._save_additional_values(user)
+
+        # store the consent field
+        if settings.ACCOUNT_TERMS_OF_USE:
+            if self.cleaned_data['consent']:
+                ConsentFieldValue.create_consent(user=user, session=request.session)

rdmo-2.3.0rc1/rdmo/accounts/admin.py

@@ -0,0 +1,77 @@
+from django.contrib import admin
+from django.contrib.sites.models import Site
+from django.db.models import Count, Value
+
+from .models import AdditionalField, AdditionalFieldValue, ConsentFieldValue, Role
+
+
+@admin.register(AdditionalField)
+class AdditionalFieldAdmin(admin.ModelAdmin):
+    pass
+
+
+@admin.register(AdditionalFieldValue)
+class AdditionalFieldValueAdmin(admin.ModelAdmin):
+    readonly_fields = ('user', )
+
+
+@admin.register(ConsentFieldValue)
+class ConsentFieldValueAdmin(admin.ModelAdmin):
+    readonly_fields = ('user', 'consent', 'updated', 'created')
+
+    search_fields = ('user__username', 'user__email')
+    list_display = ('user',  'consent', 'updated')
+    list_filter = ('consent',)
+
+    def has_add_permission(self, request, obj=None):
+        return False
+
+
+@admin.register(Role)
+class RoleAdmin(admin.ModelAdmin):
+    search_fields = ('user__username', 'user__email')
+    list_filter = ('member', 'manager', 'editor', 'reviewer')
+
+    list_display = ('user', 'email', 'members', 'managers', 'editors', 'reviewers')
+
+    readonly_fields = ('user', )
+
+    def get_queryset(self, request):
+        return Role.objects.prefetch_related(
+                'member', 'manager', 'editor', 'reviewer').annotate(
+                    Count('member', distinct=True),
+                    Count('manager', distinct=True),
+                    Count('editor', distinct=True),
+                    Count('reviewer', distinct=True),
+                    sites_count=Value(Site.objects.count())
+                )
+
+    def get_form(self, request, obj=None, **kwargs):
+        form = super().get_form(request, obj, **kwargs)
+        form.base_fields['member'].widget.can_add_related = False
+        form.base_fields['manager'].widget.can_add_related = False
+        form.base_fields['editor'].widget.can_add_related = False
+        form.base_fields['reviewer'].widget.can_add_related = False
+
+        return form
+
+    @staticmethod
+    def get_sites_for_role(obj, field_name: str) -> str:
+        if getattr(obj, f'{field_name}__count', 0) == obj.sites_count:
+            return 'all Sites'
+        return ', '.join([site.domain for site in getattr(obj, field_name).all()])
+
+    def email(self, obj):
+        return obj.user.email
+
+    def members(self, obj):
+        return self.get_sites_for_role(obj, 'member')
+
+    def managers(self, obj):
+        return self.get_sites_for_role(obj, 'manager')
+
+    def editors(self, obj):
+        return self.get_sites_for_role(obj, 'editor')
+
+    def reviewers(self, obj):
+        return self.get_sites_for_role(obj, 'reviewer')

rdmo-2.3.0rc1/rdmo/accounts/forms.py

@@ -0,0 +1,112 @@
+import logging
+
+from django import forms
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.utils.translation import gettext_lazy as _
+
+from .models import AdditionalField, AdditionalFieldValue, ConsentFieldValue
+
+log = logging.getLogger(__name__)
+
+
+class ProfileForm(forms.ModelForm):
+
+    use_required_attribute = False
+
+    class Meta:
+        model = get_user_model()
+        if settings.ACCOUNT:
+            fields = ('first_name', 'last_name')
+        else:
+            fields = ('first_name', 'last_name', 'email')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields['first_name'].widget = forms.TextInput(attrs={'placeholder': _('First name')})
+        self.fields['last_name'].widget = forms.TextInput(attrs={'placeholder': _('Last name')})
+
+        self.additional_fields = AdditionalField.objects.all()
+
+        # add fields and init values for the Profile model
+        for additional_field in self.additional_fields:
+
+            if additional_field.type == 'text':
+                field = forms.CharField(widget=forms.TextInput(attrs={'placeholder': additional_field.text}))
+            elif additional_field.type == 'textarea':
+                field = forms.CharField(widget=forms.Textarea(attrs={'placeholder': additional_field.text}))
+            else:
+                raise Exception('Unknown additional_field type.')
+
+            field.label = additional_field.text
+            field.help = additional_field.help
+            field.required = additional_field.required
+
+            self.fields[additional_field.key] = field
+
+        # existing user is going to be updated
+        if self.instance.pk is not None:
+            for additional_field_value in AdditionalFieldValue.objects.filter(user=self.instance):
+                self.fields[additional_field_value.field.key].initial = additional_field_value.value
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        self._save_additional_values()
+
+    def _save_additional_values(self, user=None):
+        if user is None:
+            user = self.instance
+
+        for additional_field in self.additional_fields:
+            try:
+                additional_value = user.additional_values.get(field=additional_field)
+            except AdditionalFieldValue.DoesNotExist:
+                additional_value = AdditionalFieldValue(user=user, field=additional_field)
+
+            additional_value.value = self.cleaned_data[additional_field.key]
+            additional_value.save()
+
+
+class RemoveForm(forms.Form):
+
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop('request')
+        kwargs.setdefault('label_suffix', '')
+        super().__init__(*args, **kwargs)
+        if not self.request.user.has_usable_password():
+            self.fields.pop('password')
+
+    email = forms.CharField(widget=forms.TextInput(attrs={'required': 'false'}))
+    email.label = _('E-mail')
+    email.widget.attrs = {'class': 'form-control', 'placeholder': email.label}
+
+    password = forms.CharField(widget=forms.PasswordInput)
+    password.label = _('Password')
+    password.widget.attrs = {'class': 'form-control', 'placeholder': password.label}
+
+    consent = forms.BooleanField(required=True)
+    consent.label = _("I confirm that I want my profile to be completely removed. This can not be undone!")
+
+
+class AcceptConsentForm(forms.Form):
+
+    consent = forms.BooleanField(
+        label="I agree to the terms of use",
+        required=True,
+    )
+
+    def __init__(self, *args, user=None, **kwargs):
+        self.user = user
+        super().__init__(*args, **kwargs)
+
+        if not self.user:
+            raise ValueError("A user instance is required to initialize the form.")
+
+    def save(self, session) -> bool:
+        if self.cleaned_data['consent']:
+            success = ConsentFieldValue.create_consent(user=self.user, session=session)
+            if not success:
+                self.add_error(None, _("Consent could not be saved. Please try again."))  # Add non-field error
+            return success
+        return False

rdmo-2.3.0rc1/rdmo/accounts/middleware.py

@@ -0,0 +1,37 @@
+"""Terms and Conditions Middleware"""
+# ref: https://github.com/cyface/django-termsandconditions/blob/main/termsandconditions/middleware.py
+
+from django.conf import settings
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+
+from .models import ConsentFieldValue
+
+
+class TermsAndConditionsRedirectMiddleware:
+    """Middleware to ensure terms and conditions have been accepted."""
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if (
+            settings.ACCOUNT_TERMS_OF_USE  # Terms enforcement enabled
+            and request.user.is_authenticated
+            and self.is_path_protected(request.path)
+            and not ConsentFieldValue.has_accepted_terms(request.user, request.session)
+        ):
+            return HttpResponseRedirect(reverse("terms_of_use_accept"))
+
+        # Proceed with the response for non-protected paths or accepted terms
+        return self.get_response(request)
+
+    @staticmethod
+    def is_path_protected(path):
+        # all paths should be protected, except what is excluded here
+        return not (
+                path == reverse("terms_of_use_accept") or
+                any(path.startswith(prefix) for prefix in settings.ACCOUNT_TERMS_OF_USE_EXCLUDE_URL_PREFIXES) or
+                any(substring in path for substring in settings.ACCOUNT_TERMS_OF_USE_EXCLUDE_URL_CONTAINS) or
+                path in settings.ACCOUNT_TERMS_OF_USE_EXCLUDE_URLS
+        )