From 03456b6e6bde9141e7780db6f9e4fb7bc2c5b84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Wed, 27 Feb 2019 22:28:29 -0500 Subject: [PATCH 01/10] back to dev --- CHANGELOG.md | 2 ++ rest_auth_toolkit/__init__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31f84bc..c7b83e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog for Rest-Framework-Auth-Toolkit +## v0.11 (unreleased) + ## v0.10 diff --git a/rest_auth_toolkit/__init__.py b/rest_auth_toolkit/__init__.py index 3a1ac8b..a99b3d9 100644 --- a/rest_auth_toolkit/__init__.py +++ b/rest_auth_toolkit/__init__.py @@ -1,5 +1,5 @@ """Simple + flexible signup and login for Django APIs""" -__version__ = '0.10' +__version__ = '0.11.dev' default_app_config = 'rest_auth_toolkit.app.RestAuthToolkitConfig' From 8bf70b3bc7ccd70bd170cf0d74e86ce263406b74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 12 Apr 2019 19:49:30 -0400 Subject: [PATCH 02/10] update jinja2 from 2.10 to 2.10.1 (#76) --- demo/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index e1bfd51..2d0bfc6 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -18,14 +18,14 @@ djangorestframework==3.9.1 facepy==1.0.9 idna==2.8 # via requests itypes==1.1.0 # via coreapi -jinja2==2.10 # via coreschema +jinja2==2.10.1 # via coreschema markupsafe==1.1.1 # via jinja2 pip-tools==3.4.0 psycopg2==2.7.7 pytz==2018.9 # via django -requests==2.21.0 # via coreapi +requests==2.21.0 # via coreapi, facepy shortuuid==0.5.0 # via django-shortuuidfield -six==1.12.0 # via django-shortuuidfield, pip-tools +six==1.12.0 # via django-shortuuidfield, facepy, pip-tools sqlparse==0.2.4 # via django-debug-toolbar uritemplate==3.0.0 # via coreapi urllib3==1.24.1 # via requests From 51ab26f2be0e32debcf99356cb9d7cd411f674c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Fri, 19 Apr 2019 14:38:47 -0400 Subject: [PATCH 03/10] update dependencies (#82) --- demo/requirements.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 2d0bfc6..84a2a1a 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile requirements.in # -certifi==2018.11.29 # via requests +certifi==2019.3.9 # via requests chardet==3.0.4 # via requests click==7.0 # via pip-tools coreapi==2.3.3 @@ -13,19 +13,19 @@ dj-database-url==0.5.0 django-debug-toolbar==1.11 django-model-utils==3.1.2 django-shortuuidfield==0.1.3 -django==2.1.7 -djangorestframework==3.9.1 -facepy==1.0.9 +django==2.1.8 +djangorestframework==3.9.2 +facepy==1.0.10 idna==2.8 # via requests itypes==1.1.0 # via coreapi jinja2==2.10.1 # via coreschema markupsafe==1.1.1 # via jinja2 -pip-tools==3.4.0 -psycopg2==2.7.7 -pytz==2018.9 # via django +pip-tools==3.6.0 +psycopg2==2.8.2 +pytz==2019.1 # via django requests==2.21.0 # via coreapi, facepy shortuuid==0.5.0 # via django-shortuuidfield six==1.12.0 # via django-shortuuidfield, facepy, pip-tools -sqlparse==0.2.4 # via django-debug-toolbar +sqlparse==0.3.0 # via django-debug-toolbar uritemplate==3.0.0 # via coreapi -urllib3==1.24.1 # via requests +urllib3==1.24.2 # via requests From 2207f822f3174f53b3432d04b9be45ca9ea6df90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Apr 2019 12:39:20 -0400 Subject: [PATCH 04/10] update pip-tools from 3.6.0 to 3.6.1 (#83) Signed-off-by: dependabot[bot] --- demo/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 84a2a1a..6a30a18 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -20,7 +20,7 @@ idna==2.8 # via requests itypes==1.1.0 # via coreapi jinja2==2.10.1 # via coreschema markupsafe==1.1.1 # via jinja2 -pip-tools==3.6.0 +pip-tools==3.6.1 psycopg2==2.8.2 pytz==2019.1 # via django requests==2.21.0 # via coreapi, facepy From f612dc782effb0c46124241c25ee3a16cd437934 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 15:03:31 -0400 Subject: [PATCH 05/10] update djangorestframework from 3.9.2 to 3.9.4 (#86) --- demo/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 6a30a18..4dcc790 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -14,7 +14,7 @@ django-debug-toolbar==1.11 django-model-utils==3.1.2 django-shortuuidfield==0.1.3 django==2.1.8 -djangorestframework==3.9.2 +djangorestframework==3.9.4 facepy==1.0.10 idna==2.8 # via requests itypes==1.1.0 # via coreapi From b37d04f79c0a25c1504185d08048554fb76d59e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 10 Jun 2019 15:23:29 -0400 Subject: [PATCH 06/10] update django from 2.1.8 to 2.1.9 (#88) Signed-off-by: dependabot[bot] --- demo/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 4dcc790..25167e9 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -13,7 +13,7 @@ dj-database-url==0.5.0 django-debug-toolbar==1.11 django-model-utils==3.1.2 django-shortuuidfield==0.1.3 -django==2.1.8 +django==2.1.9 djangorestframework==3.9.4 facepy==1.0.10 idna==2.8 # via requests From 524b1dcb4a8cdb1279f0871d4033ead7f0e9b339 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2019 17:25:46 -0400 Subject: [PATCH 07/10] updqte django from 2.1.9 to 2.1.10 (#94) --- demo/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 25167e9..352ab0e 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -13,7 +13,7 @@ dj-database-url==0.5.0 django-debug-toolbar==1.11 django-model-utils==3.1.2 django-shortuuidfield==0.1.3 -django==2.1.9 +django==2.1.10 djangorestframework==3.9.4 facepy==1.0.10 idna==2.8 # via requests From 339376ec3d1697f65ae0ee3e32255afaa3c478f5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2019 10:32:43 -0400 Subject: [PATCH 08/10] update django from 2.1.10 to 2.1.11 (#101) --- demo/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/requirements.txt b/demo/requirements.txt index 352ab0e..c4c2fba 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -13,7 +13,7 @@ dj-database-url==0.5.0 django-debug-toolbar==1.11 django-model-utils==3.1.2 django-shortuuidfield==0.1.3 -django==2.1.10 +django==2.1.11 djangorestframework==3.9.4 facepy==1.0.10 idna==2.8 # via requests From 3a2a4e13f0e88685cc2a301dbea7706c09be14f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Kijko?= <43760150+gkijko@users.noreply.github.com> Date: Tue, 13 Aug 2019 12:26:54 -0400 Subject: [PATCH 09/10] Fix typo in exception --- rest_auth_toolkit/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_auth_toolkit/views.py b/rest_auth_toolkit/views.py index e6d43a3..8fd106c 100644 --- a/rest_auth_toolkit/views.py +++ b/rest_auth_toolkit/views.py @@ -51,7 +51,7 @@ def post(self, request): user = deserializer.save() if self.email_confirmation_class is None: - raise MissingSetting('email_confirmation_string') + raise MissingSetting('email_confirmation_class') confirmation = self.email_confirmation_class.objects.create(user=user) if get_setting('email_confirmation_send_email', True): From 6918fa83fc7824d774da00adf0b2f3281780c7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Kijko?= <43760150+gkijko@users.noreply.github.com> Date: Tue, 13 Aug 2019 12:54:35 -0400 Subject: [PATCH 10/10] Registration without email confirmation Currently if the setting REST_AUTH_TOOLKIT['email_confirmation_send_email'] is set to false, the registration view still requires an email_confirmation_class and it also skips the confirmation email (that is correct) but it does not set the user as active. This first change enables the automatic activation of users if the email_confirmation_send_email settings is set to false. --- rest_auth_toolkit/views.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_auth_toolkit/views.py b/rest_auth_toolkit/views.py index 8fd106c..8e3d6ec 100644 --- a/rest_auth_toolkit/views.py +++ b/rest_auth_toolkit/views.py @@ -57,6 +57,9 @@ def post(self, request): if get_setting('email_confirmation_send_email', True): email_field = user.get_email_field_name() send_email(request, user, getattr(user, email_field), confirmation) + else: + user.is_active = True + user.save() return Response(status=status.HTTP_201_CREATED)