accrete 0.0.135__py3-none-any.whl → 0.0.138__py3-none-any.whl

accrete/contrib/ui/utils.py

@@ -1,17 +1,44 @@
+import ast
+import json
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 from .context import ModalContext
 
 
-def update_modal(
+def modal_response(
     request: HttpRequest,
     template: str,
-    context: ModalContext | dict
+    context: ModalContext | dict,
+    update: bool = False
 ) -> HttpResponse:
 
     if isinstance(context, ModalContext):
         context = context.dict()
     res = render(request, template, context)
-    res.headers['HX-Retarget'] = f'#{context["modal_id"]}'
-    res.headers['HX-Reswap'] = 'outerHTML'
+    if update:
+        res.headers['HX-Retarget'] = f'#{context["modal_id"]}'
+        res.headers['HX-Reswap'] = 'outerHTML'
+        return res
+    res.headers['HX-Retarget'] = 'body'
+    res.headers['HX-Reswap'] = 'beforeend'
     return res
+
+
+def add_trigger(
+    response: [HttpResponse],
+    trigger: dict | str,
+    header: str = 'HX-Trigger'
+) -> HttpResponse:
+    if isinstance(trigger, str):
+        trigger = {trigger: ''}
+    res_trigger = response.headers.get(header)
+    if not res_trigger:
+        response.headers[header] = json.dumps(trigger)
+        return response
+    try:
+        res_trigger = ast.literal_eval(response.headers.get(header, '{}'))
+    except SyntaxError:
+        res_trigger = {response.headers[header]: ''}
+    res_trigger.update(trigger)
+    response.headers[header] = json.dumps(header)
+    return response

accrete/contrib/ui/widgets/search_select.py

@@ -38,7 +38,7 @@ class ModelSearchSelect(widgets.NumberInput):
                 'value_display': self.value_display(value),
                 "attrs": self.build_attrs(self.attrs, attrs),
                 "template_name": self.template_name,
-                'search_url': self.search_url,
+                'search_url': resolve_url(self.search_url),
                 'search_parameter': self.search_parameter,
                 'hx_trigger_on_change': self.hx_trigger_on_change,
                 'uuid': uuid
@@ -69,6 +69,7 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
     def __init__(
         self,
         search_url: str,
+        search_kwargs: dict = None,
         search_parameter: str = 'search',
         limit: int | None = 5,
         hx_trigger_on_change: bool = False,
@@ -76,6 +77,7 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
     ):
         super().__init__()
         self.search_url = search_url
+        self.search_kwargs = search_kwargs or {}
         self.search_parameter = search_parameter
         self.limit = limit
         self.hx_trigger_on_change = hx_trigger_on_change
@@ -95,7 +97,7 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
                 "value": self.format_value(value),
                 "attrs": self.build_attrs(self.attrs, attrs),
                 "template_name": self.template_name,
-                'search_url': resolve_url(self.search_url),
+                'search_url': resolve_url(self.search_url, **self.search_kwargs),
                 'search_parameter': self.search_parameter,
                 'hx_trigger_on_change': self.hx_trigger_on_change,
                 'uuid': uuid

accrete/contrib/user/admin.py

@@ -1,18 +1,33 @@
 from django.contrib import admin
+from django import forms
 from .models import User
 
 
+class UserForm(forms.ModelForm):
+
+    login = forms.CharField(
+        required=False
+    )
+
+    email = forms.EmailField(
+        required=False
+    )
+
+
 class UserAdmin(admin.ModelAdmin):
 
     model = User
+    form = UserForm
     list_display = (
-        'email',
         'username',
+        'email',
+        'login',
         'first_name',
         'last_name'
     )
     search_fields = [
         'email',
+        'login',
         'username',
         'first_name',
         'last_name'
@@ -20,7 +35,8 @@ class UserAdmin(admin.ModelAdmin):
     list_filter = [
         'is_superuser',
         'is_staff',
-        'is_active'
+        'is_active',
+        'is_managed'
     ]
 
 

accrete/contrib/user/auth_backends.py

@@ -0,0 +1,21 @@
+from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
+
+User = get_user_model()
+
+
+class LoginModelBackend(ModelBackend):
+    """
+    This is a ModelBacked that allows authentication with the login field.
+    """
+
+    def authenticate(self, request, username=None, password=None, **kwargs):
+        if username is None:
+            return None
+        try:
+            user = User.objects.get(login=username)
+        except User.DoesNotExist:
+            return None
+        if user.check_password(password):
+            return user
+        return None

accrete/contrib/user/migrations/0003_alter_user_email.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.7 on 2025-03-16 18:11
+
+import accrete.contrib.user.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0002_user_theme'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=254, unique=True, validators=[accrete.contrib.user.models.validate_member_login], verbose_name='Email Address'),
+        ),
+    ]

accrete/contrib/user/migrations/0004_user_login_alter_user_email_user_email_or_login_set.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.1.7 on 2025-03-16 19:12
+
+import accrete.contrib.user.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('user', '0003_alter_user_email'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='login',
+            field=models.CharField(max_length=254, null=True, unique=True, validators=[accrete.contrib.user.models.validate_member_login], verbose_name='Login'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=254, null=True, unique=True, verbose_name='Email Address'),
+        ),
+        migrations.AddConstraint(
+            model_name='user',
+            constraint=models.CheckConstraint(condition=models.Q(('email__isnull', False), ('login__isnull', False), _connector='XOR'), name='email_or_login_set', violation_error_message='email or login must be set'),
+        ),
+    ]

accrete/contrib/user/migrations/0005_remove_user_email_or_login_set_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.1.7 on 2025-03-16 19:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('user', '0004_user_login_alter_user_email_user_email_or_login_set'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='user',
+            name='email_or_login_set',
+        ),
+        migrations.AddConstraint(
+            model_name='user',
+            constraint=models.CheckConstraint(condition=models.Q(('email__isnull', False), ('login__isnull', False), _connector='OR'), name='email_or_login_set', violation_error_message='email or login must be set'),
+        ),
+    ]

accrete/contrib/user/migrations/0006_remove_user_email_or_login_set_user_is_managed_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.7 on 2025-03-17 18:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('user', '0005_remove_user_email_or_login_set_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='user',
+            name='email_or_login_set',
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='is_managed',
+            field=models.BooleanField(default=False, help_text='User with restricted functionality.', verbose_name='Is Managed'),
+        ),
+        migrations.AddConstraint(
+            model_name='user',
+            constraint=models.CheckConstraint(condition=models.Q(('email__isnull', False), ('login__isnull', False), _connector='OR'), name='email_or_login_set', violation_error_message='E-Mail or Login must be set'),
+        ),
+        migrations.AddConstraint(
+            model_name='user',
+            constraint=models.CheckConstraint(condition=models.Q(models.Q(('email__isnull', False), ('is_managed', False)), models.Q(('email__isnull', True), ('is_managed', True)), _connector='OR'), name='no_email_for_managed_user', violation_error_message='Managed users must not have an E-Mail address'),
+        ),
+    ]

accrete/contrib/user/migrations/0007_user_managed_login.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-19 17:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('user', '0006_remove_user_email_or_login_set_user_is_managed_and_more'),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='user',
+            constraint=models.CheckConstraint(condition=models.Q(models.Q(('is_managed', True), ('login__isnull', False)), ('is_managed', False), _connector='OR'), name='managed_login', violation_error_message='Managed users must have a login'),
+        ),
+    ]

accrete/contrib/user/models.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.contrib.auth.models import (
     AbstractBaseUser,
@@ -6,6 +7,7 @@ from django.contrib.auth.models import (
 )
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.contrib.auth.models import BaseUserManager
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from django.shortcuts import resolve_url
@@ -18,25 +20,47 @@ LANGUAGE_DISPLAY = {
 }
 
 
+def validate_member_login(login: str) -> None:
+    if '@' in login:
+        raise ValidationError(_(
+            'Login must not be an E-Mail address, use the field email instead'
+        ))
+    message = _(
+        'Login must consist of username and domain seperated by a colon(":")'
+    )
+    if ':' not in login:
+        raise ValidationError(message)
+    member_login, tenant_login = login.split(':', 1)
+    if not member_login or not tenant_login:
+        raise ValidationError(message)
+
+
 class UserManager(BaseUserManager):
     use_in_migrations = True
 
-    def _create_user(self, email, password, username=None, **extra_fields):
-        if not email:
-            raise ValueError('The email must be set')
-
-        email = self.normalize_email(email)
-        username = self.model.normalize_username(username)
-        user = self.model(email=email, username=username, **extra_fields)
+    def _create_user(self, password, email=None, login=None, username=None, **extra_fields):
+        if not email and not login:
+            raise ValueError('The email or login must be set')
+        if not username and login:
+            username = login
+        elif not username and email:
+            username = email
+        user = self.model(**extra_fields)
+        if email:
+            user.email = self.normalize_email(email)
+        if login:
+            user.login = self.model.normalize_username(login)
+        if username:
+            user.username = self.model.normalize_username(username)
         user.set_password(password)
         user.save(using=self._db)
         return user
 
-    def create_user(self, email, password=None, username=None, **extra_fields):
+    def create_user(self, password, email=None, login=None, username=None, **extra_fields):
         extra_fields.setdefault('is_staff', False)
         extra_fields.setdefault('is_superuser', False)
         extra_fields.setdefault('is_active', False)
-        return self._create_user(email, password, username, **extra_fields)
+        return self._create_user(password, email, login, username, **extra_fields)
 
     def create_superuser(self, email, password, username=None, **extra_fields):
         extra_fields.setdefault('is_staff', True)
@@ -57,12 +81,30 @@ class User(AbstractBaseUser, PermissionsMixin):
         db_table = 'accrete_user'
         verbose_name = _('User')
         verbose_name_plural = _('Users')
+        constraints = [
+            models.CheckConstraint(
+                condition=Q(email__isnull=False) | Q(login__isnull=False),
+                name='email_or_login_set',
+                violation_error_message='E-Mail or Login must be set'
+            ),
+            models.CheckConstraint(
+                condition=Q(is_managed=False, email__isnull=False) | Q(is_managed=True, email__isnull=True),
+                name='no_email_for_managed_user',
+                violation_error_message='Managed users must not have an E-Mail address'
+            ),
+            models.CheckConstraint(
+                condition=Q(is_managed=True, login__isnull=False) | Q(is_managed=False),
+                name='managed_login',
+                violation_error_message='Managed users must have a login'
+            )
+        ]
 
     filter_exclude = [
         'password'
     ]
 
     username_validator = UnicodeUsernameValidator()
+    login_validator = validate_member_login
 
     username = models.CharField(
         verbose_name=_('Username'),
@@ -92,7 +134,16 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     email = models.EmailField(
         verbose_name=_('Email Address'),
-        unique=True
+        unique=True,
+        null=True
+    )
+
+    login = models.CharField(
+        verbose_name=_('Login'),
+        max_length=254,
+        validators=[login_validator],
+        unique=True,
+        null=True
     )
 
     is_staff = models.BooleanField(
@@ -112,6 +163,12 @@ class User(AbstractBaseUser, PermissionsMixin):
         ),
     )
 
+    is_managed = models.BooleanField(
+        verbose_name=_('Is Managed'),
+        default=False,
+        help_text=_('User with restricted functionality.')
+    )
+
     date_joined = models.DateTimeField(
         verbose_name=_('Date Joined'),
         default=timezone.now

accrete/contrib/user/views.py

@@ -1,6 +1,7 @@
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import views, update_session_auth_hash
 from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseForbidden
 from django.shortcuts import redirect, render, resolve_url
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
@@ -58,6 +59,8 @@ def user_detail(request):
 
 @login_required()
 def user_change_password(request):
+    if request.user.is_managed:
+        return HttpResponseForbidden()
     form = ChangePasswordForm(instance=request.user)
     ctx = ui.ModalContext(
         title=_('Change Password'),
@@ -77,12 +80,14 @@ def user_change_password(request):
                 + f'?{request.GET.urlencode()}'
             )
         ctx.update(form=form)
-        return ui.update_modal(request, 'user/change_password.html', ctx)
+        return ui.modal_response(request, 'user/change_password.html', ctx)
     return render(request, 'user/change_password.html', ctx)
 
 
 @login_required()
 def user_change_email(request):
+    if request.user.is_managed:
+        return HttpResponseForbidden()
     form = ChangeEmailForm(instance=request.user)
     ctx = ui.ModalContext(
         title=_('Change E-Mail'),
@@ -98,5 +103,5 @@ def user_change_email(request):
         if form.is_saved:
             return redirect('user:detail')
         ctx.update(form=form)
-        return ui.update_modal(request, 'user/change_email.html', ctx)
+        return ui.modal_response(request, 'user/change_email.html', ctx)
     return render(request, 'user/change_email.html', ctx)

accrete/middleware.py

@@ -39,13 +39,14 @@ class TenantMiddleware(MiddlewareMixin):
         if tenant_id:
             tenant = Tenant.objects.get(pk=tenant_id)
             memberships = memberships.filter(tenant=tenant)
-        if memberships.count() == 1:
+        membership_count = memberships.count()
+        if membership_count == 1:
             request.member = memberships.first()
             request.tenant = request.member.tenant
             set_member(request.member)
             self.update_post_data(request)
             return
-        if memberships.count() > 1:
+        if membership_count > 1:
             set_member(None)
             return
         if request.user.is_staff and tenant:

accrete/models.py

@@ -148,8 +148,7 @@ class AccessGroup(models.Model):
             ('tenant', _('Tenant')),
             ('member', _('Member'))
         ],
-        default='tenant',
-        help_text=_('')
+        default='tenant'
     )
 
     def __str__(self):

accrete/utils/forms.py

@@ -8,7 +8,7 @@ from django.forms import BaseFormSet, Form, ModelForm
 _logger = logging.getLogger(__name__)
 
 
-def save_form(form: [Form|ModelForm], commit=True, reraise=False) -> [Form|ModelForm]:
+def save_form(form: [Form|ModelForm], commit=True, reraise=False) -> [Form | ModelForm]:
     if not hasattr(form, 'save'):
         raise AttributeError('Form must have method "save" implemented.')
     form.is_saved = False
@@ -30,7 +30,7 @@ def save_form(form: [Form|ModelForm], commit=True, reraise=False) -> [Form|Model
     return form
 
 
-def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool = False):
+def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool = False) -> [Form | ModelForm]:
 
     def handle_error(error):
         form.save_error = repr(error)

accrete/utils/views.py

@@ -21,12 +21,16 @@ QUERYSTRING_KEY_MAP = {
 
 def page_from_querystring(
     model: type[Model], query_dict: dict, key_map: dict = None,
-    select_related: list = None, prefetch_related: list = None
+    select_related: list = None, prefetch_related: list = None,
+    query: Q = None
 ) -> paginator.Page:
 
     key_map = key_map or QUERYSTRING_KEY_MAP
+    query = query or Q()
     queryset = filter_from_querystring(
         model, query_dict, key_map
+    ).filter(
+        query
     ).select_related(
         *select_related or []
     ).prefetch_related(
@@ -62,7 +66,9 @@ def filter_from_querystring(
 def parse_querystring(model: type[Model], query_string: str) -> Q:
     """
     param: query_string: JSON serializable string
+    Parses
     [{"term": value}, "&", [{t"erm": value}, "|", {"~term": value}]]
+    to
     Q(term=value) & (Q(term=value) | ~Q(term=value))
     """
 

accrete/views.py

@@ -12,18 +12,12 @@ from accrete.tenant import get_tenant, tenant_has_group, member_has_group
 from . import config
 
 
-class GroupType(Enum):
-
-    TENANT: str = 'tenant'
-    MEMBER: str = 'member'
-
-
 class TenantRequiredMixin(LoginRequiredMixin):
 
     TENANT_NOT_SET_URL = None
     GROUP_NOT_SET_URL = None
-    TENANT_GROUPS = []
-    MEMBER_GROUPS = []
+    TENANT_GROUPS: list[str | tuple[str]] = []
+    MEMBER_GROUPS: list[str | tuple[str]] = []
 
     def dispatch(self, request, *args, **kwargs):
         res = super().dispatch(request, *args, **kwargs)
@@ -40,10 +34,10 @@ class TenantRequiredMixin(LoginRequiredMixin):
         return redirect(self.get_tenant_not_set_url())
 
     def handle_tenant_group_not_set(self):
-        return redirect(self.get_group_not_set_url(GroupType.TENANT))
+        return redirect(self.get_group_not_set_url())
 
     def handle_member_group_not_set(self):
-        return redirect(self.get_group_not_set_url(GroupType.MEMBER))
+        return redirect(self.get_group_not_set_url())
 
     def get_tenant_not_set_url(self):
         tenant_not_set_url = (
@@ -60,10 +54,10 @@ class TenantRequiredMixin(LoginRequiredMixin):
             )
         return tenant_not_set_url
 
-    def get_group_not_set_url(self, group_type: GroupType):
+    def get_group_not_set_url(self):
         group_not_set_url = (
-                self.GROUP_NOT_SET_URL
-                or settings.ACCRETE_GROUP_NOT_SET_URL
+            self.GROUP_NOT_SET_URL
+            or settings.ACCRETE_GROUP_NOT_SET_URL
         )
         if not group_not_set_url:
             cls_name = self.__class__.__name__
@@ -79,7 +73,9 @@ class TenantRequiredMixin(LoginRequiredMixin):
         if not self.TENANT_GROUPS:
             return True
         for group in self.TENANT_GROUPS:
-            if tenant_has_group(group):
+            if isinstance(group, tuple) and all([tenant_has_group(g) for g in group]):
+                return True
+            elif tenant_has_group(group):
                 return True
         return False
 
@@ -87,7 +83,9 @@ class TenantRequiredMixin(LoginRequiredMixin):
         if not self.MEMBER_GROUPS:
             return True
         for group in self.MEMBER_GROUPS:
-            if member_has_group(group):
+            if isinstance(group, tuple) and all([member_has_group(g) for g in group]):
+                return True
+            elif member_has_group(group):
                 return True
         return False
 
@@ -97,8 +95,8 @@ class TenantRequiredMixin(LoginRequiredMixin):
 
 
 def tenant_required(
-        tenant_groups: list[str] = None,
-        member_groups: list[str] = None,
+        tenant_groups: list[str | tuple[str]] = None,
+        member_groups: list[str | tuple[str]] = None,
         redirect_field_name: str = None,
         login_url: str = None
 ):
@@ -112,12 +110,27 @@ def tenant_required(
             tenant = request.tenant
             if not tenant:
                 return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
+            redirect_url = None
             for tenant_group in (tenant_groups or []):
-                if not any([tenant_has_group(tenant_group)]):
-                    return redirect(config.ACCRETE_GROUP_NOT_SET_URL)
+                if (
+                    (isinstance(tenant_group, tuple) and all([
+                        tenant_has_group(g) for g in tenant_group
+                    ]))
+                    or tenant_has_group(tenant_group)
+                ):
+                    return f(request, *args, **kwargs)
+                redirect_url = config.ACCRETE_GROUP_NOT_SET_URL
             for member_group in (member_groups or []):
-                if not any([member_has_group(member_group)]):
-                    return redirect(config.ACCRETE_GROUP_NOT_SET_URL)
+                if (
+                    (isinstance(member_group, tuple) and all([
+                        member_has_group(g) for g in member_group
+                    ]))
+                    or member_has_group(member_group)
+                ):
+                    return f(request, *args, **kwargs)
+                redirect_url = config.ACCRETE_GROUP_NOT_SET_URL
+            if redirect_url:
+                return redirect(redirect_url)
             return f(request, *args, **kwargs)
         return _wrapped_view
     return decorator

{accrete-0.0.135.dist-info → accrete-0.0.138.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.135
+Version: 0.0.138
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2025 Benedikt Jilek