From f99fbbec892435177a9ba8515445929a658a6cef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:59:11 +0000 Subject: [PATCH] requirement: bump django-allauth from 64.1.0 to 64.2.1 With https://github.com/pennersr/django-allauth/commit/560cb24dce5593342d70cd81db568a2d35471367, the LOGIN_ON_EMAIL_CONFIRMATION=True is now taken into account when verifying an email. Since that commit, the hook `get_signup_redirect_url()` is called on email verification instead of `get_login_redirect_url()`. Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 64.1.0 to 64.2.1. - [Changelog](https://github.com/pennersr/django-allauth/blob/main/ChangeLog.rst) - [Commits](https://github.com/pennersr/django-allauth/compare/64.1.0...64.2.1) --- updated-dependencies: - dependency-name: django-allauth dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- itou/users/adapter.py | 3 +++ requirements/base.txt | 4 ++-- requirements/dev.txt | 4 ++-- requirements/test.txt | 4 ++-- tests/www/dashboard/test_edit_user_email.py | 7 ++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/itou/users/adapter.py b/itou/users/adapter.py index 836b4eaba7..3a3f190365 100644 --- a/itou/users/adapter.py +++ b/itou/users/adapter.py @@ -39,6 +39,9 @@ def save_user(self, request, user, form): user.kind = form.user_kind return super().save_user(request, user, form) + def get_signup_redirect_url(self, request): + return self.get_login_redirect_url(request) + def get_login_redirect_url(self, request): url = reverse("dashboard:index") if not request.user.has_completed_welcoming_tour: diff --git a/requirements/base.txt b/requirements/base.txt index d7f681dc2f..cf1eccced9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -279,8 +279,8 @@ django==5.0.8 \ # django-xworkflows # djangorestframework # drf-spectacular -django-allauth==64.1.0 \ - --hash=sha256:713bfc410021140aefae0f04eeaac5d50ebedad7abaf43174670a9ec002c595c +django-allauth==64.2.1 \ + --hash=sha256:54bf0af8dc5c334254dd56f9069447c19b9b623110a095b2a0dcb82a414e1055 # via -r requirements/base.in django-anymail==11.1 \ --hash=sha256:ec373c0a2d79f5e6a3ecda819c8087af0b0e114e4ec1d8576dea4c786f9b2a59 \ diff --git a/requirements/dev.txt b/requirements/dev.txt index bf55499a09..192b664d05 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -333,8 +333,8 @@ django==5.0.8 \ # django-xworkflows # djangorestframework # drf-spectacular -django-allauth==64.1.0 \ - --hash=sha256:713bfc410021140aefae0f04eeaac5d50ebedad7abaf43174670a9ec002c595c +django-allauth==64.2.1 \ + --hash=sha256:54bf0af8dc5c334254dd56f9069447c19b9b623110a095b2a0dcb82a414e1055 # via -r requirements/test.txt django-anymail==11.1 \ --hash=sha256:ec373c0a2d79f5e6a3ecda819c8087af0b0e114e4ec1d8576dea4c786f9b2a59 \ diff --git a/requirements/test.txt b/requirements/test.txt index 61d2357458..9e2313ef10 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -307,8 +307,8 @@ django==5.0.8 \ # django-xworkflows # djangorestframework # drf-spectacular -django-allauth==64.1.0 \ - --hash=sha256:713bfc410021140aefae0f04eeaac5d50ebedad7abaf43174670a9ec002c595c +django-allauth==64.2.1 \ + --hash=sha256:54bf0af8dc5c334254dd56f9069447c19b9b623110a095b2a0dcb82a414e1055 # via -r requirements/base.txt django-anymail==11.1 \ --hash=sha256:ec373c0a2d79f5e6a3ecda819c8087af0b0e114e4ec1d8576dea4c786f9b2a59 \ diff --git a/tests/www/dashboard/test_edit_user_email.py b/tests/www/dashboard/test_edit_user_email.py index 7f6e6347d8..d1f493ef1c 100644 --- a/tests/www/dashboard/test_edit_user_email.py +++ b/tests/www/dashboard/test_edit_user_email.py @@ -61,11 +61,8 @@ def test_update_email(self): confirm_email_url = reverse("account_confirm_email", kwargs={"key": confirmation_token}) response = self.client.post(confirm_email_url) assert response.status_code == 302 - assert response.url == reverse("account_login") - - post_data = {"login": user.email, "password": DEFAULT_PASSWORD} - url = reverse("account_login") - response = self.client.post(url, data=post_data) + assert response.url == reverse("welcoming_tour:index") + response = self.client.get(response.url) assert response.context.get("user").is_authenticated user.refresh_from_db()