+ Change your email:+Hello {{ user.get_full_name() }}, +you can recover your password by going to the following url: +You can ignore this message if you did not request. +Regards +-- |
+
+ More info at: + {{ final_url_name }} +
+{% endblock %} diff --git a/taiga/users/templates/emails/change_email-body-text.jinja b/taiga/users/templates/emails/change_email-body-text.jinja new file mode 100644 index 00000000..bd133d43 --- /dev/null +++ b/taiga/users/templates/emails/change_email-body-text.jinja @@ -0,0 +1,12 @@ +Hello {{ user.get_full_name() }}, + +you can confirm your change of email by going to the following url: + +{{ resolve_front_url('change-email', user.email_token) }} + +You can ignore this message if you did not request. + +Regards + +-- +The Taiga Team diff --git a/taiga/users/templates/emails/change_email-subject.jinja b/taiga/users/templates/emails/change_email-subject.jinja new file mode 100644 index 00000000..e00ea7a5 --- /dev/null +++ b/taiga/users/templates/emails/change_email-subject.jinja @@ -0,0 +1 @@ +[Taiga] Change email diff --git a/tests/integration/resources_permissions/test_users_resources.py b/tests/integration/resources_permissions/test_users_resources.py index 03c551fa..4e04f2e4 100644 --- a/tests/integration/resources_permissions/test_users_resources.py +++ b/tests/integration/resources_permissions/test_users_resources.py @@ -4,8 +4,6 @@ from django.core.urlresolvers import reverse from rest_framework.renderers import JSONRenderer from taiga.users.serializers import UserSerializer -from taiga.users.models import User -from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals @@ -232,7 +230,7 @@ def test_user_action_change_password_from_recovery(client, data): def test_user_action_password_recovery(client, data): url = reverse('users-password-recovery') - new_user = f.UserFactory.create(username="test") + f.UserFactory.create(username="test") users = [ None, @@ -244,3 +242,20 @@ def test_user_action_password_recovery(client, data): patch_data = json.dumps({"username": "test"}) results = helper_test_http_method(client, 'post', url, patch_data, users) assert results == [200, 200, 200, 200] + +def test_user_action_change_email(client, data): + url = reverse('users-change-email') + + data.registered_user.email_token = "test-token" + data.registered_user.new_email = "new@email.com" + data.registered_user.save() + + users = [ + None, + data.registered_user, + data.other_user, + ] + + patch_data = json.dumps({"email_token": "test-token"}) + results = helper_test_http_method(client, 'post', url, patch_data, users) + assert results == [401, 204, 400] diff --git a/tests/integration/test_users.py b/tests/integration/test_users.py new file mode 100644 index 00000000..1f817dae --- /dev/null +++ b/tests/integration/test_users.py @@ -0,0 +1,100 @@ +import pytest +import json + +from django.core.urlresolvers import reverse + +from .. import factories as f + +from taiga.users import models + +pytestmark = pytest.mark.django_db + + +def test_api_user_patch_same_email(client): + user = f.UserFactory.create(email="same@email.com") + url = reverse('users-detail', kwargs={"pk": user.pk}) + data = {"email": "same@email.com"} + + client.login(user) + response = client.patch(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 400 + assert response.data['_error_message'] == 'Duplicated email' + + +def test_api_user_patch_duplicated_email(client): + f.UserFactory.create(email="one@email.com") + user = f.UserFactory.create(email="two@email.com") + url = reverse('users-detail', kwargs={"pk": user.pk}) + data = {"email": "one@email.com"} + + client.login(user) + response = client.patch(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 400 + assert response.data['_error_message'] == 'Duplicated email' + + +def test_api_user_patch_invalid_email(client): + user = f.UserFactory.create(email="my@email.com") + url = reverse('users-detail', kwargs={"pk": user.pk}) + data = {"email": "my@email"} + + client.login(user) + response = client.patch(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 400 + assert response.data['_error_message'] == 'Not valid email' + + +def test_api_user_patch_valid_email(client): + user = f.UserFactory.create(email="old@email.com") + url = reverse('users-detail', kwargs={"pk": user.pk}) + data = {"email": "new@email.com"} + + client.login(user) + response = client.patch(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 200 + user = models.User.objects.get(pk=user.id) + assert user.email_token != None + assert user.new_email == "new@email.com" + + +def test_api_user_action_change_email_ok(client): + user = f.UserFactory.create(email_token="change_email_token", new_email="new@email.com") + url = reverse('users-change-email') + data = {"email_token": "change_email_token"} + + client.login(user) + response = client.post(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 204 + user = models.User.objects.get(pk=user.id) + assert user.email_token == None + assert user.new_email == None + assert user.email == "new@email.com" + + +def test_api_user_action_change_email_no_token(client): + user = f.UserFactory.create(email_token="change_email_token", new_email="new@email.com") + url = reverse('users-change-email') + data = {} + + client.login(user) + response = client.post(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 400 + assert response.data['_error_message'] == 'Token is invalid' + + +def test_api_user_action_change_email_invalid_token(client): + user = f.UserFactory.create(email_token="change_email_token", new_email="new@email.com") + url = reverse('users-change-email') + data = {"email_token": "invalid_email_token"} + + client.login(user) + response = client.post(url, json.dumps(data), content_type="application/json") + + assert response.status_code == 400 + assert response.data['_error_message'] == 'Token is invalid'