release v0.12 (#208)

Author: merwok

.circleci/config.yml

@@ -48,13 +48,16 @@ jobs:
             pyshort="${python//./}"
             venv/bin/tox -e py${pyshort}-dj<< parameters.django >> -- --junitxml=~/reports/tox/coverage.xml
       - when:
-          condition: { equal: [<< parameters.python >>, "3.10"] }
+          condition:
+            and:
+              - equal: [<< parameters.python >>, "3.10"]
+              - equal: [<< parameters.django >>, "4.0"]
           steps:
             - run:
                 name: Check coverage with Python << parameters.python >>
                 command: venv/bin/tox -e coverage
       - save_cache:
-          key: py<< parameters.python >>-dj<< parameters.django>>-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
+          key: py<< parameters.python >>-dj<< parameters.django>>-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
           paths:
             - venv
             - .tox
@@ -68,7 +71,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: check-v1
+          key: check-v2
       - run:
           name: Install CI tools
           command: |
@@ -78,7 +81,7 @@ jobs:
           name: Check packaging and dependencies
           command: venv/bin/tox -e pkg
       - save_cache:
-          key: check-v1
+          key: check-v2
           paths:
             - venv
             - .tox

CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog for Rest-Framework-Auth-Toolkit
 
-## v0.12 (unreleased)
+## v0.12
 
 Library tested with Python 3.9 and 3.10,
-and Django 3.2, 4.0 and 4.1 (#172)
+and Django 3.2, 4.0 and 4.1 (#172, #208)
+
+`SignupDeserializer.create` passes all validated data to the
+`AUTH_USER.objects.create_user` method, so that data for extra
+fields in your serializer subclass gets passed automatically
 
 
 ## v0.11

demo/demo/settings.py

@@ -94,7 +94,6 @@
 
 TIME_ZONE = 'UTC'
 USE_I18N = True
-USE_L10N = True
 LANGUAGE_CODE = 'en'
 
 USE_TZ = True

rest_auth_toolkit/__init__.py

@@ -1,3 +1,3 @@
 """Simple + flexible signup and login for Django APIs"""
 
-__version__ = '0.12.dev1'
+__version__ = '0.12'

rest_auth_toolkit/locale/fr/LC_MESSAGES/django.mo

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-06 16:41-0400\n"
+"POT-Creation-Date: 2022-08-30 18:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -34,7 +34,7 @@ msgstr "Dates importantes"
 msgid "email address"
 msgstr "adresse électronique"
 
-#: models.py:36 models.py:56 models.py:98
+#: models.py:36 models.py:56 models.py:104
 msgid "user"
 msgstr "utilisateur"
 
@@ -46,11 +46,15 @@ msgstr "utilisateurs"
 msgid "confirmed"
 msgstr "confirmé"
 
-#: models.py:95
+#: models.py:101
 msgid "key"
 msgstr "clé"
 
-#: serializers.py:42
+#: serializers.py:56
+msgid "Email address already used by another account"
+msgstr "Adresse électronique déjà utilisée par un autre compte"
+
+#: serializers.py:70
 msgid "Invalid email or password"
 msgstr "Adresse électronique ou mot de passe invalide"
 
@@ -59,6 +63,6 @@ msgstr "Adresse électronique ou mot de passe invalide"
 msgid "Follow this link to validate your email:"
 msgstr "Suivez ce lien pour valider votre adresse électronique:"
 
-#: views.py:122
+#: views.py:150
 msgid "Confirm your email address"
 msgstr "Confirmez votre adresse électronique"

rest_auth_toolkit/locale/fr/LC_MESSAGES/django.po

@@ -3,6 +3,7 @@
 from django.contrib.auth import password_validation
 from django.contrib.auth.signals import user_logged_in
 from django.core import exceptions
+from django.db.utils import IntegrityError
 from django.utils.translation import gettext as _
 
 from rest_framework import serializers
@@ -22,6 +23,8 @@
 class SignupDeserializer(serializers.ModelSerializer):
     """Deserializer to create users without username."""
 
+    email = CustomEmailField()
+
     class Meta:
         model = User
         fields = ('email', 'password')
@@ -47,11 +50,11 @@ def validate(self, data):
         return data
 
     def create(self, validated_data):
-        return User.objects.create_user(
-            email=validated_data['email'],
-            password=validated_data['password'],
-            is_active=False,
-        )
+        try:
+            return User.objects.create_user(**validated_data, is_active=False)
+        except IntegrityError:
+            msg = _('Email address already used by another account')
+            raise serializers.ValidationError({'email': [msg]})
 
 
 class LoginDeserializer(serializers.Serializer):

rest_auth_toolkit/serializers.py

@@ -50,7 +50,7 @@ def test_signup_invalid_email(db, django_app):
     "[email protected]",
 ])
 def test_signup_already_exists(db, django_app, user0, email):
-    params = {"email": email, "password": "pass123"}
+    params = {"email": email, "password": "pass123@!!"}
     resp = django_app.post_json(reverse("auth:signup"), params=params, status=400)
 
     assert "email" in resp.json

tests/functional/test_email.py

@@ -1,18 +1,18 @@
 [tox]
-# quick test with bare "tox" command checks only one combination
-envlist = py310-dj4.0
+envlist = py{310,39}-dj{4.1,4.0,3.2}
 minversion = 3.4.0
 isolated_build = True
 
 [testenv]
 passenv =
     DATABASE_URL
 deps =
-    dj3.2: django == 3.2.*
-    dj4.0: django == 4.0.*
-    dj4.1: django == 4.1.*
+    -r requirements-test.txt
+    -r demo/requirements.txt
 commands =
-    pip install -r requirements-test.txt -r demo/requirements.txt
+    py{310,39}-dj3.2: pip install django==3.2.*
+    py{310,39}-dj4.0: pip install django==4.0.*
+    py{310,39}-dj4.1: pip install django==4.1.*
     flake8 rest_auth_toolkit tests demo
     pytest {posargs}
 
@@ -24,15 +24,15 @@ commands =
 
 [testenv:pkg]
 deps =
+    pip-audit
     flit
     twine
     readme_renderer[md]
-    safety >= 1.8.4
 commands =
+    flit install
+    pip-audit
     flit build
-    # FIXME check all dists when flit fixes #216
-    twine check dist/*.whl
-    safety check
+    twine check dist/*
 
 
 [pytest]