diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0374fd32..908fe470 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,6 +7,9 @@ RUN apt-get update && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Make git subtree available +RUN sudo cp -a /usr/lib/git-core/git-subtree /usr/local/bin/ + USER vscode # pipx is already installed in the base devcontainers Python image diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bb9a899e..018b55a4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,6 +15,13 @@ "postCreateCommand": "poetry install && npm install", "postStartCommand": "poetry run invoke init-workspace --type codespaces", "customizations": { + "codespaces": { + "repositories": { + "radexperts/django-shared": { + "permissions": "write-all" + } + } + }, "vscode": { "extensions": [ "batisteo.vscode-django", diff --git a/adit/batch_query/apps.py b/adit/batch_query/apps.py index ffef9a1f..388d0b99 100644 --- a/adit/batch_query/apps.py +++ b/adit/batch_query/apps.py @@ -45,7 +45,7 @@ def init_db(**kwargs): def create_group(): - from adit.accounts.utils import create_group_with_permissions + from adit.shared.accounts.utils import create_group_with_permissions create_group_with_permissions( "batch_query_group", diff --git a/adit/batch_transfer/apps.py b/adit/batch_transfer/apps.py index 37cb9c1b..0fcd01ec 100644 --- a/adit/batch_transfer/apps.py +++ b/adit/batch_transfer/apps.py @@ -45,7 +45,7 @@ def init_db(**kwargs): def create_group(): - from adit.accounts.utils import create_group_with_permissions + from adit.shared.accounts.utils import create_group_with_permissions create_group_with_permissions( "batch_transfer_group", diff --git a/adit/batch_transfer/forms.py b/adit/batch_transfer/forms.py index 3c768fff..742b5962 100644 --- a/adit/batch_transfer/forms.py +++ b/adit/batch_transfer/forms.py @@ -6,9 +6,9 @@ from django.db import transaction from django.utils.safestring import mark_safe -from adit.accounts.models import User from adit.core.errors import BatchFileContentError, BatchFileFormatError, BatchFileSizeError from adit.core.fields import DicomNodeChoiceField, RestrictedFileField +from adit.shared.accounts.models import User from .models import BatchTransferJob, BatchTransferTask from .parsers import BatchTransferFileParser diff --git a/adit/batch_transfer/tests/test_forms.py b/adit/batch_transfer/tests/test_forms.py index 384dc049..17a62c1d 100644 --- a/adit/batch_transfer/tests/test_forms.py +++ b/adit/batch_transfer/tests/test_forms.py @@ -3,9 +3,9 @@ import pytest from django.core.files import File -from adit.accounts.factories import UserFactory -from adit.accounts.models import User from adit.core.factories import DicomServerFactory +from adit.shared.accounts.factories import UserFactory +from adit.shared.accounts.models import User from ..forms import BatchTransferJobForm diff --git a/adit/batch_transfer/tests/test_views.py b/adit/batch_transfer/tests/test_views.py index b4b7fd5c..fca39150 100644 --- a/adit/batch_transfer/tests/test_views.py +++ b/adit/batch_transfer/tests/test_views.py @@ -8,9 +8,9 @@ from django.urls import reverse from pytest_django.asserts import assertTemplateUsed -from adit.accounts.factories import UserFactory from adit.core.factories import DicomServerFactory from adit.core.models import DicomServer +from adit.shared.accounts.factories import UserFactory from ..models import BatchTransferJob diff --git a/adit/conftest.py b/adit/conftest.py index 34d93630..29316f08 100644 --- a/adit/conftest.py +++ b/adit/conftest.py @@ -12,14 +12,14 @@ from faker import Faker from playwright.sync_api import Locator, Page, Response -from adit.accounts.factories import InstituteFactory, UserFactory -from adit.accounts.models import Institute, User from adit.core.factories import ( DicomNodeInstituteAccessFactory, DicomServerFactory, DicomWebServerFactory, ) from adit.core.models import DicomNode, DicomServer +from adit.shared.accounts.factories import InstituteFactory, UserFactory +from adit.shared.accounts.models import Institute, User from adit.testing import ChannelsLiveServer fake = Faker() diff --git a/adit/core/factories.py b/adit/core/factories.py index bfedb90a..ed418628 100644 --- a/adit/core/factories.py +++ b/adit/core/factories.py @@ -4,7 +4,7 @@ from faker import Faker from pydicom.uid import generate_uid -from adit.accounts.factories import UserFactory +from adit.shared.accounts.factories import UserFactory from .models import ( DicomFolder, diff --git a/adit/core/fields.py b/adit/core/fields.py index 0d7e4811..09c4d86e 100644 --- a/adit/core/fields.py +++ b/adit/core/fields.py @@ -3,7 +3,7 @@ from django.forms import ModelChoiceField, fields, forms from django.template.defaultfilters import filesizeformat -from adit.accounts.models import User +from adit.shared.accounts.models import User from .models import DicomNode from .widgets import DicomNodeSelect diff --git a/adit/core/management/commands/create_admin.py b/adit/core/management/commands/create_admin.py index 59afa397..d2e4d8fb 100644 --- a/adit/core/management/commands/create_admin.py +++ b/adit/core/management/commands/create_admin.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import UserManager from django.core.management.base import BaseCommand -from adit.accounts.models import User +from adit.shared.accounts.models import User class Command(BaseCommand): diff --git a/adit/core/management/commands/populate_dev_db.py b/adit/core/management/commands/populate_dev_db.py index 3ad0d517..cd7b00e5 100644 --- a/adit/core/management/commands/populate_dev_db.py +++ b/adit/core/management/commands/populate_dev_db.py @@ -6,8 +6,6 @@ from django.core.management.base import BaseCommand from faker import Faker -from adit.accounts.factories import AdminUserFactory, InstituteFactory, UserFactory -from adit.accounts.models import Institute, User from adit.batch_query.factories import ( BatchQueryJobFactory, BatchQueryResultFactory, @@ -27,6 +25,8 @@ SelectiveTransferJobFactory, SelectiveTransferTaskFactory, ) +from adit.shared.accounts.factories import AdminUserFactory, InstituteFactory, UserFactory +from adit.shared.accounts.models import Institute, User USER_COUNT = 20 INSTITUTE_COUNT = 3 diff --git a/adit/core/models.py b/adit/core/models.py index 1d80155a..94dbe178 100644 --- a/adit/core/models.py +++ b/adit/core/models.py @@ -7,7 +7,7 @@ from django.db import models from django.db.models.constraints import UniqueConstraint -from adit.accounts.models import Institute, User +from adit.shared.accounts.models import Institute, User from .validators import ( no_backslash_char_validator, diff --git a/adit/core/tasks.py b/adit/core/tasks.py index ef3655ac..95968d8f 100644 --- a/adit/core/tasks.py +++ b/adit/core/tasks.py @@ -15,7 +15,7 @@ from django.utils import timezone from sherlock import Lock -from adit.accounts.models import User +from adit.shared.accounts.models import User from .errors import RetriableError from .models import AppSettings, DicomFolder, DicomJob, DicomTask diff --git a/adit/core/tests/utils/test_transfer_utils.py b/adit/core/tests/utils/test_transfer_utils.py index ace70dd3..2e708acc 100644 --- a/adit/core/tests/utils/test_transfer_utils.py +++ b/adit/core/tests/utils/test_transfer_utils.py @@ -5,8 +5,8 @@ from celery import Task as CeleryTask from pydicom import Dataset -from adit.accounts.factories import UserFactory from adit.core.utils.dicom_dataset import ResultDataset +from adit.shared.accounts.factories import UserFactory from ...factories import ( DicomFolderFactory, diff --git a/adit/core/types.py b/adit/core/types.py index ff1fe26a..fb4cc7e0 100644 --- a/adit/core/types.py +++ b/adit/core/types.py @@ -1,7 +1,7 @@ from django.http import HttpRequest from rest_framework.request import Request -from adit.accounts.models import User +from adit.shared.accounts.models import User class AuthenticatedHttpRequest(HttpRequest): diff --git a/adit/core/utils/auth_utils.py b/adit/core/utils/auth_utils.py index e23696d5..e61e47c0 100644 --- a/adit/core/utils/auth_utils.py +++ b/adit/core/utils/auth_utils.py @@ -2,7 +2,7 @@ from django.contrib.auth.models import AbstractBaseUser, AnonymousUser -from adit.accounts.models import User +from adit.shared.accounts.models import User def is_logged_in_user(user: AbstractBaseUser | AnonymousUser) -> TypeGuard[User]: diff --git a/adit/core/utils/mail.py b/adit/core/utils/mail.py index a9312f09..9feeb845 100644 --- a/adit/core/utils/mail.py +++ b/adit/core/utils/mail.py @@ -3,7 +3,7 @@ from django.template.loader import render_to_string from django.utils.html import strip_tags -from adit.accounts.models import User +from adit.shared.accounts.models import User def send_mail_to_admins( diff --git a/adit/dicom_explorer/apps.py b/adit/dicom_explorer/apps.py index 5fabaeef..746e637a 100644 --- a/adit/dicom_explorer/apps.py +++ b/adit/dicom_explorer/apps.py @@ -24,7 +24,7 @@ def register_app(): def init_db(**kwargs): - from adit.accounts.utils import create_group_with_permissions + from adit.shared.accounts.utils import create_group_with_permissions create_group_with_permissions( "dicom_explorer_group", diff --git a/adit/dicom_web/tests/integration/conftest.py b/adit/dicom_web/tests/integration/conftest.py index 0b09a6d4..8f4c68e9 100644 --- a/adit/dicom_web/tests/integration/conftest.py +++ b/adit/dicom_web/tests/integration/conftest.py @@ -6,9 +6,9 @@ from django.conf import settings from django.contrib.auth.models import Group -from adit.accounts.factories import UserFactory from adit.core.utils.dicom_utils import read_dataset -from adit.token_authentication.factories import TokenFactory +from adit.shared.accounts.factories import UserFactory +from adit.shared.token_authentication.factories import TokenFactory # Workaround to make playwright work with Django # see https://github.com/microsoft/playwright-pytest/issues/29#issuecomment-731515676 diff --git a/adit/selective_transfer/apps.py b/adit/selective_transfer/apps.py index b5ea33f3..22dd1fca 100644 --- a/adit/selective_transfer/apps.py +++ b/adit/selective_transfer/apps.py @@ -45,7 +45,7 @@ def init_db(**kwargs): def create_group(): - from adit.accounts.utils import create_group_with_permissions + from adit.shared.accounts.utils import create_group_with_permissions create_group_with_permissions( "selective_transfer_group", diff --git a/adit/selective_transfer/consumers.py b/adit/selective_transfer/consumers.py index fff7261c..17cb48b6 100644 --- a/adit/selective_transfer/consumers.py +++ b/adit/selective_transfer/consumers.py @@ -12,9 +12,9 @@ from django.conf import settings from django.template.loader import render_to_string -from adit.accounts.models import User from adit.core.utils.dicom_dataset import ResultDataset from adit.core.utils.dicom_operator import DicomOperator +from adit.shared.accounts.models import User from .forms import SelectiveTransferJobForm from .mixins import SelectiveTransferJobCreateMixin diff --git a/adit/selective_transfer/mixins.py b/adit/selective_transfer/mixins.py index fc04f88e..9d959837 100644 --- a/adit/selective_transfer/mixins.py +++ b/adit/selective_transfer/mixins.py @@ -3,10 +3,10 @@ from django.conf import settings -from adit.accounts.models import User from adit.core.mixins import LockedMixin from adit.core.utils.dicom_dataset import QueryDataset, ResultDataset from adit.core.utils.dicom_operator import DicomOperator +from adit.shared.accounts.models import User from .apps import SECTION_NAME from .forms import SelectiveTransferJobForm diff --git a/adit/settings/base.py b/adit/settings/base.py index a0528a9f..3e20e217 100644 --- a/adit/settings/base.py +++ b/adit/settings/base.py @@ -44,7 +44,7 @@ INSTALLED_APPS = [ "daphne", "whitenoise.runserver_nostatic", - "adit.accounts.apps.AccountsConfig", + "adit.shared.accounts.apps.AccountsConfig", "registration", "django.contrib.admin", "django.contrib.auth", @@ -68,7 +68,7 @@ "adit.batch_query.apps.BatchQueryConfig", "adit.batch_transfer.apps.BatchTransferConfig", "adit.dicom_explorer.apps.DicomExplorerConfig", - "adit.token_authentication.apps.TokenAuthenticationConfig", + "adit.shared.token_authentication.apps.TokenAuthenticationConfig", "adit.dicom_web.apps.DicomWebConfig", "channels", ] @@ -93,7 +93,7 @@ TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", - "DIRS": [], + "DIRS": [BASE_DIR / "adit" / "shared" / "templates"], "APP_DIRS": True, "OPTIONS": { "context_processors": [ @@ -224,7 +224,7 @@ "rest_framework.permissions.IsAuthenticated", ], "DEFAULT_AUTHENTICATION_CLASSES": [ - "adit.token_authentication.auth.RestTokenAuthentication", + "adit.shared.token_authentication.auth.RestTokenAuthentication", ], "EXCEPTION_HANDLER": "adit.dicom_web.exceptions.dicom_web_exception_handler", } @@ -280,7 +280,7 @@ ] # Settings for django-registration-redux -REGISTRATION_FORM = "adit.accounts.forms.RegistrationForm" +REGISTRATION_FORM = "adit.shared.accounts.forms.RegistrationForm" ACCOUNT_ACTIVATION_DAYS = 14 REGISTRATION_OPEN = True diff --git a/adit/shared/.gitignore b/adit/shared/.gitignore new file mode 100644 index 00000000..489019ff --- /dev/null +++ b/adit/shared/.gitignore @@ -0,0 +1,157 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +test-results/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.env.* +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# Javascript dev dependencies +node_modules/ + +# Database of pytest-testmon +.testmondata + +# The Orthanc storage folders +OrthancStorage* + +# Redis DB dump +dump.rdb + +# SQLite databases +*.db + +#PyCharm +.idea/ + +#virtualenv +bin/ +share/ +pyvenv.cfg + +# ADIT specific +.dicoms diff --git a/adit/shared/LICENSE b/adit/shared/LICENSE new file mode 100644 index 00000000..4123b4cc --- /dev/null +++ b/adit/shared/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2020 Kai Schlamp, Heidelberg + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/adit/shared/README.md b/adit/shared/README.md new file mode 100644 index 00000000..d8a0818f --- /dev/null +++ b/adit/shared/README.md @@ -0,0 +1,16 @@ +# Shared code + +This folder contains shared code between ADIT and RADIS, mainly account and authentication stuff. + +The code is added to ADIT and RADIS as a git subtree: +`git subtree add --prefix adit/shared shared main --squash` + +Push updates to shared: +`git subtree push --prefix adit/shared shared main` + +Pull updates from shared: +`git subtree pull --prefix adit/shared shared main --squash` + +## License + +- GPL 3.0 or later diff --git a/adit/accounts/__init__.py b/adit/shared/__init__.py similarity index 100% rename from adit/accounts/__init__.py rename to adit/shared/__init__.py diff --git a/adit/accounts/migrations/__init__.py b/adit/shared/accounts/__init__.py similarity index 100% rename from adit/accounts/migrations/__init__.py rename to adit/shared/accounts/__init__.py diff --git a/adit/accounts/admin.py b/adit/shared/accounts/admin.py similarity index 100% rename from adit/accounts/admin.py rename to adit/shared/accounts/admin.py diff --git a/adit/accounts/apps.py b/adit/shared/accounts/apps.py similarity index 66% rename from adit/accounts/apps.py rename to adit/shared/accounts/apps.py index 8f58dbc6..24ee61fd 100644 --- a/adit/accounts/apps.py +++ b/adit/shared/accounts/apps.py @@ -2,4 +2,4 @@ class AccountsConfig(AppConfig): - name = "adit.accounts" + name = "adit.shared.accounts" diff --git a/adit/accounts/factories.py b/adit/shared/accounts/factories.py similarity index 100% rename from adit/accounts/factories.py rename to adit/shared/accounts/factories.py diff --git a/adit/accounts/forms.py b/adit/shared/accounts/forms.py similarity index 100% rename from adit/accounts/forms.py rename to adit/shared/accounts/forms.py diff --git a/adit/accounts/migrations/0001_initial.py b/adit/shared/accounts/migrations/0001_initial.py similarity index 100% rename from adit/accounts/migrations/0001_initial.py rename to adit/shared/accounts/migrations/0001_initial.py diff --git a/adit/accounts/migrations/0002_alter_user_id.py b/adit/shared/accounts/migrations/0002_alter_user_id.py similarity index 100% rename from adit/accounts/migrations/0002_alter_user_id.py rename to adit/shared/accounts/migrations/0002_alter_user_id.py diff --git a/adit/accounts/migrations/0003_rename_misc_settings_user_preferences.py b/adit/shared/accounts/migrations/0003_rename_misc_settings_user_preferences.py similarity index 100% rename from adit/accounts/migrations/0003_rename_misc_settings_user_preferences.py rename to adit/shared/accounts/migrations/0003_rename_misc_settings_user_preferences.py diff --git a/adit/accounts/migrations/0004_alter_user_preferences.py b/adit/shared/accounts/migrations/0004_alter_user_preferences.py similarity index 100% rename from adit/accounts/migrations/0004_alter_user_preferences.py rename to adit/shared/accounts/migrations/0004_alter_user_preferences.py diff --git a/adit/accounts/migrations/0005_institute.py b/adit/shared/accounts/migrations/0005_institute.py similarity index 100% rename from adit/accounts/migrations/0005_institute.py rename to adit/shared/accounts/migrations/0005_institute.py diff --git a/adit/token_authentication/__init__.py b/adit/shared/accounts/migrations/__init__.py similarity index 100% rename from adit/token_authentication/__init__.py rename to adit/shared/accounts/migrations/__init__.py diff --git a/adit/accounts/models.py b/adit/shared/accounts/models.py similarity index 100% rename from adit/accounts/models.py rename to adit/shared/accounts/models.py diff --git a/adit/accounts/templates/accounts/accounts_layout.html b/adit/shared/accounts/templates/accounts/accounts_layout.html similarity index 100% rename from adit/accounts/templates/accounts/accounts_layout.html rename to adit/shared/accounts/templates/accounts/accounts_layout.html diff --git a/adit/accounts/templates/accounts/profile.html b/adit/shared/accounts/templates/accounts/profile.html similarity index 100% rename from adit/accounts/templates/accounts/profile.html rename to adit/shared/accounts/templates/accounts/profile.html diff --git a/adit/accounts/tests/integration/conftest.py b/adit/shared/accounts/tests/integration/conftest.py similarity index 100% rename from adit/accounts/tests/integration/conftest.py rename to adit/shared/accounts/tests/integration/conftest.py diff --git a/adit/accounts/tests/integration/test_login.py b/adit/shared/accounts/tests/integration/test_login.py similarity index 100% rename from adit/accounts/tests/integration/test_login.py rename to adit/shared/accounts/tests/integration/test_login.py diff --git a/adit/accounts/urls.py b/adit/shared/accounts/urls.py similarity index 100% rename from adit/accounts/urls.py rename to adit/shared/accounts/urls.py diff --git a/adit/accounts/utils.py b/adit/shared/accounts/utils.py similarity index 100% rename from adit/accounts/utils.py rename to adit/shared/accounts/utils.py diff --git a/adit/accounts/views.py b/adit/shared/accounts/views.py similarity index 100% rename from adit/accounts/views.py rename to adit/shared/accounts/views.py diff --git a/adit/accounts/templates/registration/README.md b/adit/shared/templates/registration/README.md similarity index 100% rename from adit/accounts/templates/registration/README.md rename to adit/shared/templates/registration/README.md diff --git a/adit/accounts/templates/registration/activate.html b/adit/shared/templates/registration/activate.html similarity index 100% rename from adit/accounts/templates/registration/activate.html rename to adit/shared/templates/registration/activate.html diff --git a/adit/accounts/templates/registration/activation_complete.html b/adit/shared/templates/registration/activation_complete.html similarity index 100% rename from adit/accounts/templates/registration/activation_complete.html rename to adit/shared/templates/registration/activation_complete.html diff --git a/adit/accounts/templates/registration/activation_complete_admin_pending.html b/adit/shared/templates/registration/activation_complete_admin_pending.html similarity index 100% rename from adit/accounts/templates/registration/activation_complete_admin_pending.html rename to adit/shared/templates/registration/activation_complete_admin_pending.html diff --git a/adit/accounts/templates/registration/activation_email.html b/adit/shared/templates/registration/activation_email.html similarity index 100% rename from adit/accounts/templates/registration/activation_email.html rename to adit/shared/templates/registration/activation_email.html diff --git a/adit/accounts/templates/registration/activation_email.txt b/adit/shared/templates/registration/activation_email.txt similarity index 100% rename from adit/accounts/templates/registration/activation_email.txt rename to adit/shared/templates/registration/activation_email.txt diff --git a/adit/accounts/templates/registration/activation_email_subject.txt b/adit/shared/templates/registration/activation_email_subject.txt similarity index 100% rename from adit/accounts/templates/registration/activation_email_subject.txt rename to adit/shared/templates/registration/activation_email_subject.txt diff --git a/adit/accounts/templates/registration/admin_approve.html b/adit/shared/templates/registration/admin_approve.html similarity index 100% rename from adit/accounts/templates/registration/admin_approve.html rename to adit/shared/templates/registration/admin_approve.html diff --git a/adit/accounts/templates/registration/admin_approve_complete.html b/adit/shared/templates/registration/admin_approve_complete.html similarity index 100% rename from adit/accounts/templates/registration/admin_approve_complete.html rename to adit/shared/templates/registration/admin_approve_complete.html diff --git a/adit/accounts/templates/registration/admin_approve_complete_email.html b/adit/shared/templates/registration/admin_approve_complete_email.html similarity index 100% rename from adit/accounts/templates/registration/admin_approve_complete_email.html rename to adit/shared/templates/registration/admin_approve_complete_email.html diff --git a/adit/accounts/templates/registration/admin_approve_complete_email.txt b/adit/shared/templates/registration/admin_approve_complete_email.txt similarity index 100% rename from adit/accounts/templates/registration/admin_approve_complete_email.txt rename to adit/shared/templates/registration/admin_approve_complete_email.txt diff --git a/adit/accounts/templates/registration/admin_approve_complete_email_subject.txt b/adit/shared/templates/registration/admin_approve_complete_email_subject.txt similarity index 100% rename from adit/accounts/templates/registration/admin_approve_complete_email_subject.txt rename to adit/shared/templates/registration/admin_approve_complete_email_subject.txt diff --git a/adit/accounts/templates/registration/admin_approve_email.html b/adit/shared/templates/registration/admin_approve_email.html similarity index 100% rename from adit/accounts/templates/registration/admin_approve_email.html rename to adit/shared/templates/registration/admin_approve_email.html diff --git a/adit/accounts/templates/registration/admin_approve_email.txt b/adit/shared/templates/registration/admin_approve_email.txt similarity index 100% rename from adit/accounts/templates/registration/admin_approve_email.txt rename to adit/shared/templates/registration/admin_approve_email.txt diff --git a/adit/accounts/templates/registration/admin_approve_email_subject.txt b/adit/shared/templates/registration/admin_approve_email_subject.txt similarity index 100% rename from adit/accounts/templates/registration/admin_approve_email_subject.txt rename to adit/shared/templates/registration/admin_approve_email_subject.txt diff --git a/adit/accounts/templates/registration/login.html b/adit/shared/templates/registration/login.html similarity index 100% rename from adit/accounts/templates/registration/login.html rename to adit/shared/templates/registration/login.html diff --git a/adit/accounts/templates/registration/logout.html b/adit/shared/templates/registration/logout.html similarity index 100% rename from adit/accounts/templates/registration/logout.html rename to adit/shared/templates/registration/logout.html diff --git a/adit/accounts/templates/registration/password_change_done.html b/adit/shared/templates/registration/password_change_done.html similarity index 100% rename from adit/accounts/templates/registration/password_change_done.html rename to adit/shared/templates/registration/password_change_done.html diff --git a/adit/accounts/templates/registration/password_change_form.html b/adit/shared/templates/registration/password_change_form.html similarity index 100% rename from adit/accounts/templates/registration/password_change_form.html rename to adit/shared/templates/registration/password_change_form.html diff --git a/adit/accounts/templates/registration/password_reset_complete.html b/adit/shared/templates/registration/password_reset_complete.html similarity index 100% rename from adit/accounts/templates/registration/password_reset_complete.html rename to adit/shared/templates/registration/password_reset_complete.html diff --git a/adit/accounts/templates/registration/password_reset_confirm.html b/adit/shared/templates/registration/password_reset_confirm.html similarity index 100% rename from adit/accounts/templates/registration/password_reset_confirm.html rename to adit/shared/templates/registration/password_reset_confirm.html diff --git a/adit/accounts/templates/registration/password_reset_done.html b/adit/shared/templates/registration/password_reset_done.html similarity index 100% rename from adit/accounts/templates/registration/password_reset_done.html rename to adit/shared/templates/registration/password_reset_done.html diff --git a/adit/accounts/templates/registration/password_reset_email.html b/adit/shared/templates/registration/password_reset_email.html similarity index 100% rename from adit/accounts/templates/registration/password_reset_email.html rename to adit/shared/templates/registration/password_reset_email.html diff --git a/adit/accounts/templates/registration/password_reset_form.html b/adit/shared/templates/registration/password_reset_form.html similarity index 100% rename from adit/accounts/templates/registration/password_reset_form.html rename to adit/shared/templates/registration/password_reset_form.html diff --git a/adit/accounts/templates/registration/registration_base.html b/adit/shared/templates/registration/registration_base.html similarity index 100% rename from adit/accounts/templates/registration/registration_base.html rename to adit/shared/templates/registration/registration_base.html diff --git a/adit/accounts/templates/registration/registration_closed.html b/adit/shared/templates/registration/registration_closed.html similarity index 100% rename from adit/accounts/templates/registration/registration_closed.html rename to adit/shared/templates/registration/registration_closed.html diff --git a/adit/accounts/templates/registration/registration_complete.html b/adit/shared/templates/registration/registration_complete.html similarity index 100% rename from adit/accounts/templates/registration/registration_complete.html rename to adit/shared/templates/registration/registration_complete.html diff --git a/adit/accounts/templates/registration/registration_form.html b/adit/shared/templates/registration/registration_form.html similarity index 100% rename from adit/accounts/templates/registration/registration_form.html rename to adit/shared/templates/registration/registration_form.html diff --git a/adit/accounts/templates/registration/resend_activation_complete.html b/adit/shared/templates/registration/resend_activation_complete.html similarity index 100% rename from adit/accounts/templates/registration/resend_activation_complete.html rename to adit/shared/templates/registration/resend_activation_complete.html diff --git a/adit/accounts/templates/registration/resend_activation_form.html b/adit/shared/templates/registration/resend_activation_form.html similarity index 100% rename from adit/accounts/templates/registration/resend_activation_form.html rename to adit/shared/templates/registration/resend_activation_form.html diff --git a/adit/token_authentication/migrations/__init__.py b/adit/shared/token_authentication/__init__.py similarity index 100% rename from adit/token_authentication/migrations/__init__.py rename to adit/shared/token_authentication/__init__.py diff --git a/adit/token_authentication/admin.py b/adit/shared/token_authentication/admin.py similarity index 100% rename from adit/token_authentication/admin.py rename to adit/shared/token_authentication/admin.py diff --git a/adit/token_authentication/apps.py b/adit/shared/token_authentication/apps.py similarity index 82% rename from adit/token_authentication/apps.py rename to adit/shared/token_authentication/apps.py index 603e5bfc..3d4d87b7 100644 --- a/adit/token_authentication/apps.py +++ b/adit/shared/token_authentication/apps.py @@ -4,7 +4,7 @@ class TokenAuthenticationConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" - name = "adit.token_authentication" + name = "adit.shared.token_authentication" def ready(self): post_migrate.connect(init_db, sender=self) @@ -15,7 +15,7 @@ def init_db(**kwargs): def create_group(): - from adit.accounts.utils import create_group_with_permissions + from adit.shared.accounts.utils import create_group_with_permissions create_group_with_permissions( "token_authentication_group", diff --git a/adit/token_authentication/auth.py b/adit/shared/token_authentication/auth.py similarity index 98% rename from adit/token_authentication/auth.py rename to adit/shared/token_authentication/auth.py index 32d7e0b7..9368bfef 100644 --- a/adit/token_authentication/auth.py +++ b/adit/shared/token_authentication/auth.py @@ -5,7 +5,7 @@ from rest_framework.exceptions import AuthenticationFailed from rest_framework.request import Request -from adit.accounts.models import User +from adit.shared.accounts.models import User from .models import Token from .utils.crypto import hash_token, verify_token diff --git a/adit/token_authentication/factories.py b/adit/shared/token_authentication/factories.py similarity index 92% rename from adit/token_authentication/factories.py rename to adit/shared/token_authentication/factories.py index e549b16f..2544173e 100644 --- a/adit/token_authentication/factories.py +++ b/adit/shared/token_authentication/factories.py @@ -3,8 +3,8 @@ import factory from django.utils import timezone -from adit.accounts.factories import UserFactory from adit.core.factories import BaseDjangoModelFactory +from adit.shared.accounts.factories import UserFactory from .models import Token from .utils.crypto import hash_token diff --git a/adit/token_authentication/forms.py b/adit/shared/token_authentication/forms.py similarity index 97% rename from adit/token_authentication/forms.py rename to adit/shared/token_authentication/forms.py index 453f4321..4c3e0b6d 100644 --- a/adit/token_authentication/forms.py +++ b/adit/shared/token_authentication/forms.py @@ -2,7 +2,7 @@ from crispy_forms.layout import Div, Field, Layout, Submit from django import forms -from adit.accounts.models import User +from adit.shared.accounts.models import User from .models import Token diff --git a/adit/token_authentication/migrations/0001_initial.py b/adit/shared/token_authentication/migrations/0001_initial.py similarity index 100% rename from adit/token_authentication/migrations/0001_initial.py rename to adit/shared/token_authentication/migrations/0001_initial.py diff --git a/adit/token_authentication/migrations/0002_token_fraction_alter_token_token_string.py b/adit/shared/token_authentication/migrations/0002_token_fraction_alter_token_token_string.py similarity index 100% rename from adit/token_authentication/migrations/0002_token_fraction_alter_token_token_string.py rename to adit/shared/token_authentication/migrations/0002_token_fraction_alter_token_token_string.py diff --git a/adit/token_authentication/migrations/0003_alter_token_client.py b/adit/shared/token_authentication/migrations/0003_alter_token_client.py similarity index 100% rename from adit/token_authentication/migrations/0003_alter_token_client.py rename to adit/shared/token_authentication/migrations/0003_alter_token_client.py diff --git a/adit/token_authentication/migrations/0004_rename_token_string_token_token_hashed.py b/adit/shared/token_authentication/migrations/0004_rename_token_string_token_token_hashed.py similarity index 100% rename from adit/token_authentication/migrations/0004_rename_token_string_token_token_hashed.py rename to adit/shared/token_authentication/migrations/0004_rename_token_string_token_token_hashed.py diff --git a/adit/token_authentication/migrations/0005_alter_token_options_remove_token_expires_and_more.py b/adit/shared/token_authentication/migrations/0005_alter_token_options_remove_token_expires_and_more.py similarity index 100% rename from adit/token_authentication/migrations/0005_alter_token_options_remove_token_expires_and_more.py rename to adit/shared/token_authentication/migrations/0005_alter_token_options_remove_token_expires_and_more.py diff --git a/adit/token_authentication/migrations/0006_rename_expiry_time_token_expires.py b/adit/shared/token_authentication/migrations/0006_rename_expiry_time_token_expires.py similarity index 100% rename from adit/token_authentication/migrations/0006_rename_expiry_time_token_expires.py rename to adit/shared/token_authentication/migrations/0006_rename_expiry_time_token_expires.py diff --git a/adit/token_authentication/migrations/0007_alter_token_last_used.py b/adit/shared/token_authentication/migrations/0007_alter_token_last_used.py similarity index 100% rename from adit/token_authentication/migrations/0007_alter_token_last_used.py rename to adit/shared/token_authentication/migrations/0007_alter_token_last_used.py diff --git a/adit/token_authentication/migrations/0008_alter_token_token_hashed.py b/adit/shared/token_authentication/migrations/0008_alter_token_token_hashed.py similarity index 100% rename from adit/token_authentication/migrations/0008_alter_token_token_hashed.py rename to adit/shared/token_authentication/migrations/0008_alter_token_token_hashed.py diff --git a/adit/token_authentication/migrations/0009_rename_author_token_owner_alter_token_client_and_more.py b/adit/shared/token_authentication/migrations/0009_rename_author_token_owner_alter_token_client_and_more.py similarity index 100% rename from adit/token_authentication/migrations/0009_rename_author_token_owner_alter_token_client_and_more.py rename to adit/shared/token_authentication/migrations/0009_rename_author_token_owner_alter_token_client_and_more.py diff --git a/adit/token_authentication/migrations/0010_alter_token_unique_together_and_more.py b/adit/shared/token_authentication/migrations/0010_alter_token_unique_together_and_more.py similarity index 100% rename from adit/token_authentication/migrations/0010_alter_token_unique_together_and_more.py rename to adit/shared/token_authentication/migrations/0010_alter_token_unique_together_and_more.py diff --git a/adit/token_authentication/migrations/0011_delete_tokensettings_alter_token_client_and_more.py b/adit/shared/token_authentication/migrations/0011_delete_tokensettings_alter_token_client_and_more.py similarity index 100% rename from adit/token_authentication/migrations/0011_delete_tokensettings_alter_token_client_and_more.py rename to adit/shared/token_authentication/migrations/0011_delete_tokensettings_alter_token_client_and_more.py diff --git a/adit/token_authentication/migrations/0012_remove_token_unique_client_per_user_and_more.py b/adit/shared/token_authentication/migrations/0012_remove_token_unique_client_per_user_and_more.py similarity index 100% rename from adit/token_authentication/migrations/0012_remove_token_unique_client_per_user_and_more.py rename to adit/shared/token_authentication/migrations/0012_remove_token_unique_client_per_user_and_more.py diff --git a/adit/token_authentication/migrations/0013_alter_token_description.py b/adit/shared/token_authentication/migrations/0013_alter_token_description.py similarity index 100% rename from adit/token_authentication/migrations/0013_alter_token_description.py rename to adit/shared/token_authentication/migrations/0013_alter_token_description.py diff --git a/adit/token_authentication/tests/__init__.py b/adit/shared/token_authentication/migrations/__init__.py similarity index 100% rename from adit/token_authentication/tests/__init__.py rename to adit/shared/token_authentication/migrations/__init__.py diff --git a/adit/token_authentication/models.py b/adit/shared/token_authentication/models.py similarity index 97% rename from adit/token_authentication/models.py rename to adit/shared/token_authentication/models.py index 189fb5dd..4dffe289 100644 --- a/adit/token_authentication/models.py +++ b/adit/shared/token_authentication/models.py @@ -6,7 +6,7 @@ from django.contrib.auth.models import AbstractBaseUser, AnonymousUser from django.db import models -from adit.accounts.models import User +from adit.shared.accounts.models import User from .utils.crypto import hash_token diff --git a/adit/token_authentication/static/token_authentication/token_authentication.js b/adit/shared/token_authentication/static/token_authentication/token_authentication.js similarity index 100% rename from adit/token_authentication/static/token_authentication/token_authentication.js rename to adit/shared/token_authentication/static/token_authentication/token_authentication.js diff --git a/adit/token_authentication/templates/token_authentication/_generate_token_help_modal.html b/adit/shared/token_authentication/templates/token_authentication/_generate_token_help_modal.html similarity index 100% rename from adit/token_authentication/templates/token_authentication/_generate_token_help_modal.html rename to adit/shared/token_authentication/templates/token_authentication/_generate_token_help_modal.html diff --git a/adit/token_authentication/templates/token_authentication/token_authentication_layout.html b/adit/shared/token_authentication/templates/token_authentication/token_authentication_layout.html similarity index 100% rename from adit/token_authentication/templates/token_authentication/token_authentication_layout.html rename to adit/shared/token_authentication/templates/token_authentication/token_authentication_layout.html diff --git a/adit/token_authentication/templates/token_authentication/token_dashboard.html b/adit/shared/token_authentication/templates/token_authentication/token_dashboard.html similarity index 100% rename from adit/token_authentication/templates/token_authentication/token_dashboard.html rename to adit/shared/token_authentication/templates/token_authentication/token_dashboard.html diff --git a/adit/token_authentication/utils/__init__.py b/adit/shared/token_authentication/tests/__init__.py similarity index 100% rename from adit/token_authentication/utils/__init__.py rename to adit/shared/token_authentication/tests/__init__.py diff --git a/adit/token_authentication/tests/integration/conftest.py b/adit/shared/token_authentication/tests/integration/conftest.py similarity index 100% rename from adit/token_authentication/tests/integration/conftest.py rename to adit/shared/token_authentication/tests/integration/conftest.py diff --git a/adit/token_authentication/tests/integration/test_token_authentication.py b/adit/shared/token_authentication/tests/integration/test_token_authentication.py similarity index 100% rename from adit/token_authentication/tests/integration/test_token_authentication.py rename to adit/shared/token_authentication/tests/integration/test_token_authentication.py diff --git a/adit/token_authentication/urls.py b/adit/shared/token_authentication/urls.py similarity index 100% rename from adit/token_authentication/urls.py rename to adit/shared/token_authentication/urls.py diff --git a/adit/shared/token_authentication/utils/__init__.py b/adit/shared/token_authentication/utils/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/adit/token_authentication/utils/crypto.py b/adit/shared/token_authentication/utils/crypto.py similarity index 100% rename from adit/token_authentication/utils/crypto.py rename to adit/shared/token_authentication/utils/crypto.py diff --git a/adit/token_authentication/views.py b/adit/shared/token_authentication/views.py similarity index 100% rename from adit/token_authentication/views.py rename to adit/shared/token_authentication/views.py diff --git a/adit/urls.py b/adit/urls.py index 111f974e..fc88f4da 100644 --- a/adit/urls.py +++ b/adit/urls.py @@ -20,14 +20,14 @@ urlpatterns = [ path("admin-the-great/", admin.site.urls), path("api-auth/", include("rest_framework.urls")), - path("accounts/", include("adit.accounts.urls")), + path("accounts/", include("adit.shared.accounts.urls")), path("api/", include("adit.api.urls")), path("", include("adit.core.urls")), path("selective-transfer/", include("adit.selective_transfer.urls")), path("batch-transfer/", include("adit.batch_transfer.urls")), path("batch-query/", include("adit.batch_query.urls")), path("dicom-explorer/", include("adit.dicom_explorer.urls")), - path("token-authentication/", include("adit.token_authentication.urls")), + path("token-authentication/", include("adit.shared.token_authentication.urls")), path("dicom-web/", include("adit.dicom_web.urls")), path("sandbox/", include("adit.sandbox.urls")), ] diff --git a/tasks.py b/tasks.py index f3819532..136f6947 100644 --- a/tasks.py +++ b/tasks.py @@ -287,6 +287,8 @@ def init_workspace(ctx: Context, type: Literal["codespaces", "gitpod"]): env_dev_file = f"{project_dir}/.env.dev" copy(f"{project_dir}/example.env", env_dev_file) + run_cmd(ctx, "git remote add shared https://github.com/radexperts/django-shared.git") + if type == "codespaces": base_url = f"https://{environ['CODESPACE_NAME']}-8000.preview.app.github.dev" elif type == "gitpod":