django-solomon 0.3.0__tar.gz → 0.4.1__tar.gz

{django_solomon-0.3.0 → django_solomon-0.4.1}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to django-solomon will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - Unreleased
+
+### Added
+
+- Unique constraint on auth.User email field (case-insensitive)
+
 ## [0.3.0] - 2025-04-20
 
 ### Added

{django_solomon-0.3.0 → django_solomon-0.4.1}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: django-solomon
-Version: 0.3.0
+Version: 0.4.1
 Summary: A Django app for passwordless authentication using magic links.
 Project-URL: Home, https://django-solomon.rtfd.io/
 Project-URL: Documentation, https://django-solomon.rtfd.io/
 Project-URL: Repository, https://codeberg.org/oliverandrich/django-solomon
+Project-URL: Issue Tracker, https://codeberg.org/oliverandrich/django-solomon/issues
 Author-email: Oliver Andrich <oliver@andrich.me>
 License: MIT License
         
@@ -52,6 +53,7 @@ Description-Content-Type: text/markdown
 # django-solomon
 
 [![PyPI version](https://img.shields.io/pypi/v/django-solomon.svg)](https://pypi.org/project/django-solomon/)
+![PyPI - License](https://img.shields.io/pypi/l/django-solomon)
 [![Python versions](https://img.shields.io/pypi/pyversions/django-solomon.svg)](https://pypi.org/project/django-solomon/)
 [![Django versions](https://img.shields.io/pypi/djversions/django-solomon.svg)](https://pypi.org/project/django-solomon/)
 [![Documentation Status](https://readthedocs.org/projects/django-solomon/badge/?version=latest)](https://django-solomon.rtfd.io/en/latest/?badge=latest)
@@ -70,6 +72,7 @@ A Django app for passwordless authentication using magic links.
 - Privacy-focused IP anonymization
 - Customizable templates for emails and pages
 - Compatible with Django's authentication system
+- Enforces unique email addresses for users (case-insensitive)
 
 ## Installation
 
@@ -134,19 +137,19 @@ DEFAULT_FROM_EMAIL = 'your-email@example.com'
 
 django-solomon provides several settings that you can customize in your Django settings file:
 
-| Setting                               | Default                                         | Description                                                                            |
-|---------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------------------|
-| `SOLOMON_LINK_EXPIRATION`             | `300`                                           | The expiration time for magic links in seconds                                         |
-| `SOLOMON_ONLY_ONE_LINK_ALLOWED`       | `True`                                          | If enabled, only one active magic link is allowed per user                             |
-| `SOLOMON_CREATE_USER_IF_NOT_FOUND`    | `False`                                         | If enabled, creates a new user when a magic link is requested for a non-existent email |
-| `SOLOMON_LOGIN_REDIRECT_URL`          | `settings.LOGIN_REDIRECT_URL`                   | The URL to redirect to after successful authentication                                 |
-| `SOLOMON_ALLOW_ADMIN_LOGIN`           | `True`                                          | If enabled, allows superusers to log in using magic links                              |
-| `SOLOMON_ALLOW_STAFF_LOGIN`           | `True`                                          | If enabled, allows staff users to log in using magic links                             |
-| `SOLOMON_MAIL_TEXT_TEMPLATE`          | `"django_solomon/email/magic_link.txt"`         | The template to use for plain text magic link emails                                   |
-| `SOLOMON_MAIL_MJML_TEMPLATE`          | `"django_solomon/email/magic_link.mjml"`        | The template to use for HTML magic link emails (MJML format)                           |
-| `SOLOMON_LOGIN_FORM_TEMPLATE`         | `"django_solomon/base/login_form.html"`         | The template to use for the login form page                                            |
-| `SOLOMON_INVALID_MAGIC_LINK_TEMPLATE` | `"django_solomon/base/invalid_magic_link.html"` | The template to use for the invalid magic link page                                    |
-| `SOLOMON_MAGIC_LINK_SENT_TEMPLATE`    | `"django_solomon/base/magic_link_sent.html"`    | The template to use for the magic link sent confirmation page                          |
+| Setting                               | Default                                         | Description                                                                             |
+|---------------------------------------|-------------------------------------------------|-----------------------------------------------------------------------------------------|
+| `SOLOMON_LINK_EXPIRATION`             | `300`                                           | The expiration time for magic links in seconds                                          |
+| `SOLOMON_ONLY_ONE_LINK_ALLOWED`       | `True`                                          | If enabled, only one active magic link is allowed per user                              |
+| `SOLOMON_CREATE_USER_IF_NOT_FOUND`    | `False`                                         | If enabled, creates a new user when a magic link is requested for a non-existent email  |
+| `SOLOMON_LOGIN_REDIRECT_URL`          | `settings.LOGIN_REDIRECT_URL`                   | The URL to redirect to after successful authentication                                  |
+| `SOLOMON_ALLOW_ADMIN_LOGIN`           | `True`                                          | If enabled, allows superusers to log in using magic links                               |
+| `SOLOMON_ALLOW_STAFF_LOGIN`           | `True`                                          | If enabled, allows staff users to log in using magic links                              |
+| `SOLOMON_MAIL_TEXT_TEMPLATE`          | `"django_solomon/email/magic_link.txt"`         | The template to use for plain text magic link emails                                    |
+| `SOLOMON_MAIL_MJML_TEMPLATE`          | `"django_solomon/email/magic_link.mjml"`        | The template to use for HTML magic link emails (MJML format)                            |
+| `SOLOMON_LOGIN_FORM_TEMPLATE`         | `"django_solomon/base/login_form.html"`         | The template to use for the login form page                                             |
+| `SOLOMON_INVALID_MAGIC_LINK_TEMPLATE` | `"django_solomon/base/invalid_magic_link.html"` | The template to use for the invalid magic link page                                     |
+| `SOLOMON_MAGIC_LINK_SENT_TEMPLATE`    | `"django_solomon/base/magic_link_sent.html"`    | The template to use for the magic link sent confirmation page                           |
 | `SOLOMON_ENFORCE_SAME_IP`             | `False`                                         | If enabled, validates that magic links are used from the same IP they were created from |
 | `SOLOMON_ANONYMIZE_IP`                | `True`                                          | If enabled, anonymizes IP addresses before storing them (removes last octet for IPv4)   |
 

{django_solomon-0.3.0 → django_solomon-0.4.1}/README.md

@@ -1,6 +1,7 @@
 # django-solomon
 
 [![PyPI version](https://img.shields.io/pypi/v/django-solomon.svg)](https://pypi.org/project/django-solomon/)
+![PyPI - License](https://img.shields.io/pypi/l/django-solomon)
 [![Python versions](https://img.shields.io/pypi/pyversions/django-solomon.svg)](https://pypi.org/project/django-solomon/)
 [![Django versions](https://img.shields.io/pypi/djversions/django-solomon.svg)](https://pypi.org/project/django-solomon/)
 [![Documentation Status](https://readthedocs.org/projects/django-solomon/badge/?version=latest)](https://django-solomon.rtfd.io/en/latest/?badge=latest)
@@ -19,6 +20,7 @@ A Django app for passwordless authentication using magic links.
 - Privacy-focused IP anonymization
 - Customizable templates for emails and pages
 - Compatible with Django's authentication system
+- Enforces unique email addresses for users (case-insensitive)
 
 ## Installation
 
@@ -83,19 +85,19 @@ DEFAULT_FROM_EMAIL = 'your-email@example.com'
 
 django-solomon provides several settings that you can customize in your Django settings file:
 
-| Setting                               | Default                                         | Description                                                                            |
-|---------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------------------|
-| `SOLOMON_LINK_EXPIRATION`             | `300`                                           | The expiration time for magic links in seconds                                         |
-| `SOLOMON_ONLY_ONE_LINK_ALLOWED`       | `True`                                          | If enabled, only one active magic link is allowed per user                             |
-| `SOLOMON_CREATE_USER_IF_NOT_FOUND`    | `False`                                         | If enabled, creates a new user when a magic link is requested for a non-existent email |
-| `SOLOMON_LOGIN_REDIRECT_URL`          | `settings.LOGIN_REDIRECT_URL`                   | The URL to redirect to after successful authentication                                 |
-| `SOLOMON_ALLOW_ADMIN_LOGIN`           | `True`                                          | If enabled, allows superusers to log in using magic links                              |
-| `SOLOMON_ALLOW_STAFF_LOGIN`           | `True`                                          | If enabled, allows staff users to log in using magic links                             |
-| `SOLOMON_MAIL_TEXT_TEMPLATE`          | `"django_solomon/email/magic_link.txt"`         | The template to use for plain text magic link emails                                   |
-| `SOLOMON_MAIL_MJML_TEMPLATE`          | `"django_solomon/email/magic_link.mjml"`        | The template to use for HTML magic link emails (MJML format)                           |
-| `SOLOMON_LOGIN_FORM_TEMPLATE`         | `"django_solomon/base/login_form.html"`         | The template to use for the login form page                                            |
-| `SOLOMON_INVALID_MAGIC_LINK_TEMPLATE` | `"django_solomon/base/invalid_magic_link.html"` | The template to use for the invalid magic link page                                    |
-| `SOLOMON_MAGIC_LINK_SENT_TEMPLATE`    | `"django_solomon/base/magic_link_sent.html"`    | The template to use for the magic link sent confirmation page                          |
+| Setting                               | Default                                         | Description                                                                             |
+|---------------------------------------|-------------------------------------------------|-----------------------------------------------------------------------------------------|
+| `SOLOMON_LINK_EXPIRATION`             | `300`                                           | The expiration time for magic links in seconds                                          |
+| `SOLOMON_ONLY_ONE_LINK_ALLOWED`       | `True`                                          | If enabled, only one active magic link is allowed per user                              |
+| `SOLOMON_CREATE_USER_IF_NOT_FOUND`    | `False`                                         | If enabled, creates a new user when a magic link is requested for a non-existent email  |
+| `SOLOMON_LOGIN_REDIRECT_URL`          | `settings.LOGIN_REDIRECT_URL`                   | The URL to redirect to after successful authentication                                  |
+| `SOLOMON_ALLOW_ADMIN_LOGIN`           | `True`                                          | If enabled, allows superusers to log in using magic links                               |
+| `SOLOMON_ALLOW_STAFF_LOGIN`           | `True`                                          | If enabled, allows staff users to log in using magic links                              |
+| `SOLOMON_MAIL_TEXT_TEMPLATE`          | `"django_solomon/email/magic_link.txt"`         | The template to use for plain text magic link emails                                    |
+| `SOLOMON_MAIL_MJML_TEMPLATE`          | `"django_solomon/email/magic_link.mjml"`        | The template to use for HTML magic link emails (MJML format)                            |
+| `SOLOMON_LOGIN_FORM_TEMPLATE`         | `"django_solomon/base/login_form.html"`         | The template to use for the login form page                                             |
+| `SOLOMON_INVALID_MAGIC_LINK_TEMPLATE` | `"django_solomon/base/invalid_magic_link.html"` | The template to use for the invalid magic link page                                     |
+| `SOLOMON_MAGIC_LINK_SENT_TEMPLATE`    | `"django_solomon/base/magic_link_sent.html"`    | The template to use for the magic link sent confirmation page                           |
 | `SOLOMON_ENFORCE_SAME_IP`             | `False`                                         | If enabled, validates that magic links are used from the same IP they were created from |
 | `SOLOMON_ANONYMIZE_IP`                | `True`                                          | If enabled, anonymizes IP addresses before storing them (removes last octet for IPv4)   |
 

{django_solomon-0.3.0 → django_solomon-0.4.1}/pyproject.toml

@@ -33,6 +33,7 @@ dependencies = [
 Home = "https://django-solomon.rtfd.io/"
 Documentation = "https://django-solomon.rtfd.io/"
 Repository = "https://codeberg.org/oliverandrich/django-solomon"
+"Issue Tracker" = "https://codeberg.org/oliverandrich/django-solomon/issues"
 
 [dependency-groups]
 dev = [

django_solomon-0.4.1/src/django_solomon/apps.py

@@ -0,0 +1,26 @@
+from django.apps import AppConfig
+
+
+class DjangoSolomonConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "django_solomon"
+
+    def ready(self):
+        from django.contrib.auth.models import User
+        from django.db import models
+
+        # Updating the field itself triggers the auto-detector
+        # field = User._meta.get_field("email")
+        # field._unique = True
+        #
+        # But setting a constraint does not...
+        User.Meta.constraints = [
+            models.UniqueConstraint(
+                name="unique_user_email",
+                fields=["email"],
+                # deferrable=models.Deferrable.DEFERRED,
+            ),
+        ]
+        User._meta.constraints = User.Meta.constraints
+        # ... as long as original_attrs is not updated.
+        User._meta.original_attrs["constraints"] = User.Meta.constraints

django_solomon-0.4.1/src/django_solomon/migrations/0003_add_unique_constraint_auth_user_email.py

@@ -0,0 +1,43 @@
+from django.db import migrations, models
+from django.db.models.functions import Lower
+
+
+# Copyright (c) 2023 Carlton Gibson
+# This migration is taken from the fantastic project `django-unique-user-email` created by Carlton Gibson.
+# https://github.com/carltongibson/django-unique-user-email/
+
+
+class CustomAddConstraint(migrations.AddConstraint):
+    """
+    Override app_label to target auth.User
+    """
+
+    def state_forwards(self, app_label, state):
+        state.add_constraint("auth", self.model_name_lower, self.constraint)
+
+    def database_forwards(self, app_label, schema_editor, from_state, to_state):
+        model = to_state.apps.get_model("auth", self.model_name)
+        if self.allow_migrate_model(schema_editor.connection.alias, model):
+            schema_editor.add_constraint(model, self.constraint)
+
+    def database_backwards(self, app_label, schema_editor, from_state, to_state):
+        model = to_state.apps.get_model("auth", self.model_name)
+        if self.allow_migrate_model(schema_editor.connection.alias, model):
+            schema_editor.remove_constraint(model, self.constraint)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("django_solomon", "0002_magiclink_ip_address"),
+        ("auth", "0012_alter_user_first_name_max_length"),
+    ]
+
+    operations = [
+        CustomAddConstraint(
+            model_name="user",
+            constraint=models.UniqueConstraint(
+                Lower("email"),
+                name="unique_user_email"
+            ),
+        ),
+    ]

{django_solomon-0.3.0 → django_solomon-0.4.1}/tests/test_models.py

@@ -1,8 +1,10 @@
+from datetime import timedelta
+
 import pytest
+from django.contrib.auth import get_user_model
 from django.db import IntegrityError
-from django.utils import timezone
 from django.test import override_settings
-from datetime import timedelta
+from django.utils import timezone
 
 from django_solomon.models import BlacklistedEmail, MagicLink
 
@@ -214,3 +216,48 @@ class TestMagicLink:
         link.refresh_from_db()
         assert link.token == "custom-token"
         assert abs((link.expires_at - expiration).total_seconds()) < 1  # Allow for small time differences
+
+
+@pytest.mark.django_db
+class TestUserEmailUniqueConstraint:
+    """Tests for the unique constraint on auth.User email field."""
+
+    def test_user_email_unique_constraint(self, user):
+        """Test that the email field on auth.User has a unique constraint."""
+        User = get_user_model()
+
+        # The user fixture already creates a user with email "test@example.com"
+        # Attempting to create another user with the same email should raise an IntegrityError
+        with pytest.raises(IntegrityError):
+            User.objects.create_user(
+                username="another_user",
+                email="test@example.com",  # Same email as the fixture user
+                password="password456",
+            )
+
+    def test_user_email_unique_constraint_case_insensitive(self, user):
+        """Test that the email uniqueness is case-insensitive."""
+        User = get_user_model()
+
+        # The user fixture already creates a user with email "test@example.com"
+        # Attempting to create another user with the same email in different case should fail
+        # because the constraint is case-insensitive
+        with pytest.raises(IntegrityError):
+            User.objects.create_user(
+                username="another_user",
+                email="TEST@example.com",  # Same email as the fixture user but with different case
+                password="password456",
+            )
+
+    def test_different_emails_allowed(self, user):
+        """Test that users with different emails can be created."""
+        User = get_user_model()
+
+        # Create a user with a different email
+        new_user = User.objects.create_user(
+            username="another_user", email="different@example.com", password="password456"
+        )
+
+        # Verify the user was created
+        assert new_user.pk is not None
+        assert new_user.email == "different@example.com"

django_solomon-0.3.0/src/django_solomon/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class DjangoSolomonConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "django_solomon"