fix: huge refactor
This commit is contained in:
@@ -9,11 +9,11 @@ class LoginForm(StylingMixin, AuthenticationForm):
|
||||
styled_fields = []
|
||||
placeholder_for_field = {'username': _('pablo@shoppy.com'), 'password': '********'}
|
||||
|
||||
username = UsernameField(widget=forms.EmailInput(attrs={'autofocus': True, 'class': 'input-text'}))
|
||||
username = UsernameField(widget=forms.EmailInput(attrs={'autofocus': True, 'class': 'input w-full'}))
|
||||
password = forms.CharField(
|
||||
label=_('Contraseña'),
|
||||
strip=False,
|
||||
widget=forms.PasswordInput(attrs={'autocomplete': 'current-password', 'class': 'input-text'}),
|
||||
widget=forms.PasswordInput(attrs={'autocomplete': 'current-password', 'class': 'input w-full'}),
|
||||
)
|
||||
remember_me = forms.BooleanField(
|
||||
label=_('Mantener sesión iniciada'),
|
||||
|
||||
@@ -24,10 +24,7 @@ class RegisterForm(StylingMixin, BaseUserCreationForm, SetPasswordMixin):
|
||||
self.fields[field_name].required = True
|
||||
self.fields[field_name].widget.attrs.update(
|
||||
{
|
||||
'class': 'my-2 bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg '
|
||||
'focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 '
|
||||
'dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 '
|
||||
'dark:focus:border-primary-500'
|
||||
'class': 'input w-full'
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
{% extends 'theme/base.html' %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block main %}
|
||||
<section class=" ">
|
||||
<div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
|
||||
|
||||
<a href="{% url 'web:index' %}"
|
||||
class="flex items-center mb-6 text-2xl font-semibold ">
|
||||
<img class="w-8 h-8 mr-2" src="{{ logo }}" alt="logo">
|
||||
{{ web_title }}
|
||||
</a>
|
||||
|
||||
<div
|
||||
class="w-full rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 ">
|
||||
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
|
||||
<h1 class="text-xl font-bold leading-tight tracking-tight md:text-2xl ">
|
||||
{% translate 'Inicia sesión en tu cuenta' %}
|
||||
</h1>
|
||||
<form action="{% url 'users:login' %}{% querystring %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
{% if field.id_for_label != 'id_remember_me' %}
|
||||
<label for="{{ field.id_for_label }}"
|
||||
class="block mb-2 text-sm font-medium ">
|
||||
{{ field.label }}
|
||||
</label>
|
||||
{{ field }}
|
||||
{% else %}
|
||||
<div class="my-2 flex items-center">
|
||||
{{ field }}
|
||||
<label for="{{ field.id_for_label }}"
|
||||
class="inline-block text-sm font-medium ml-2">
|
||||
{{ field.label }}
|
||||
</label>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
<div class="flex justify-center">
|
||||
<p class="text-sm font-light my-4 ">
|
||||
{% translate '¿Aún no tienes cuenta?' %}
|
||||
<a href="{% url 'users:register' %}"
|
||||
class="font-medium text-primary-700 hover:underline ">{% translate 'Regístrate aquí' %}</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
{% for k, error in form.errors.items %}
|
||||
<span class="flex justify-center mb-2 text-sm font-medium text-red-900 ">{{ error }}</span>
|
||||
{% endfor %}
|
||||
|
||||
<button
|
||||
class="w-full btn btn-primary">
|
||||
{% translate 'Iniciar sesión' %}
|
||||
</button>
|
||||
|
||||
<div class="flex justify-center">
|
||||
<p class="text-sm font-light mt-4 ">
|
||||
<a href="{% url 'users:reset_password' %}"
|
||||
class="font-medium text-primary-700 hover:underline ">{% translate '¿Has olvidado tu contraseña?' %}</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,52 @@
|
||||
{% extends 'theme/base.html' %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block main %}
|
||||
<section class=" ">
|
||||
<div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
|
||||
|
||||
<a href="{% url 'web:index' %}" class="flex items-center mb-6 text-2xl font-semibold ">
|
||||
<img class="w-8 h-8 mr-2" src="{{ logo }}" alt="logo">
|
||||
{{ web_title }}
|
||||
</a>
|
||||
|
||||
<div
|
||||
class="w-full rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 ">
|
||||
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
|
||||
<h1 class="text-xl font-bold leading-tight tracking-tight md:text-2xl ">
|
||||
{% translate 'Crea tu cuenta' %}
|
||||
</h1>
|
||||
<form action="{% url 'users:register' %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
<div class="my-2">
|
||||
<label for="{{ field.id_for_label }}"
|
||||
class="inline-block text-sm font-medium mr-2">
|
||||
{{ field.label }}
|
||||
</label>
|
||||
|
||||
{{ field }}
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
{% if errors %}
|
||||
{% for error in errors %}
|
||||
<span class="inline-block text-sm font-medium text-red-900 mr-2">{{ error }}</span>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<button class="w-full btn btn-primary">
|
||||
{% translate 'Crear cuenta' %}
|
||||
</button>
|
||||
<p class="text-sm font-light mt-4 ">
|
||||
{% translate '¿Ya tienes cuenta?' %}
|
||||
<a href="{% url 'users:login' %}" class="font-medium text-primary-600 hover:underline ">{% translate 'Inicia sesión aquí' %}</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,43 @@
|
||||
{% extends 'theme/base.html' %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block main %}
|
||||
<section class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
|
||||
<a href="{% url 'web:index' %}" class="flex items-center mb-6 text-2xl font-semibold ">
|
||||
<img class="w-8 h-8 mr-2" src="{{ logo }}" alt="logo">
|
||||
{{ web_title }}
|
||||
</a>
|
||||
<div
|
||||
class="w-full rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 ">
|
||||
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
|
||||
<h1 class="text-xl font-bold leading-tight tracking-tight md:text-2xl ">
|
||||
{% translate 'Restablecer contraseña' %}
|
||||
</h1>
|
||||
<form action="{% url 'users:reset_password' %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
|
||||
<div class="my-2">
|
||||
<label for="{{ field.id_for_label }}"
|
||||
class="inline-block text-sm font-medium mr-2">
|
||||
{{ field.label }}
|
||||
</label>
|
||||
{{ field }}
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
<button
|
||||
class="btn btn-primary w-full">
|
||||
{% translate 'Restablecer contraseña' %}
|
||||
</button>
|
||||
<p class="text-sm font-light mt-4 ">
|
||||
{% translate '¿Aún no tienes cuenta?' %}
|
||||
<a href="{% url 'users:register' %}"
|
||||
class="font-medium text-primary-600 hover:underline ">{% translate 'Regístrate aquí' %}</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,50 @@
|
||||
{% extends 'theme/base.html' %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block main %}
|
||||
<section class=" ">
|
||||
<div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
|
||||
|
||||
<a href="{% url 'web:index' %}" class="flex items-center mb-6 text-2xl font-semibold ">
|
||||
<img class="w-8 h-8 mr-2" src="{{ logo }}" alt="logo">
|
||||
{{ web_title }}
|
||||
</a>
|
||||
|
||||
<div
|
||||
class="w-full rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 ">
|
||||
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
|
||||
<h1 class="text-xl font-bold leading-tight tracking-tight md:text-2xl ">
|
||||
{% translate 'Restablecer contraseña' %}
|
||||
</h1>
|
||||
{% if valid_token %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
|
||||
<div class="my-2">
|
||||
<label for="{{ field.id_for_label }}"
|
||||
class="inline-block text-sm font-medium mr-2">
|
||||
{{ field.label }}
|
||||
</label>
|
||||
{{ field }}
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
<button
|
||||
class="w-full btn btn-primary">
|
||||
{% translate 'Restablecer contraseña' %}
|
||||
</button>
|
||||
<p class="text-sm font-light mt-4 ">
|
||||
{% translate '¿Aún no tienes cuenta?' %}
|
||||
<a href="{% url 'users:register' %}" class="font-medium text-primary-600 hover:underline ">{% translate 'Regístrate aquí' %}</a>
|
||||
</p>
|
||||
</form>
|
||||
{% else %}
|
||||
<span>El enlace no es válido o ha expirado</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,31 @@
|
||||
{% extends 'theme/base.html' %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block main %}
|
||||
<section class=" ">
|
||||
<div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
|
||||
|
||||
<a href="{% url 'web:index' %}"
|
||||
class="flex items-center mb-6 text-2xl font-semibold ">
|
||||
<img class="w-8 h-8 mr-2" src="{{ logo }}" alt="logo">
|
||||
{{ web_title }}
|
||||
</a>
|
||||
|
||||
<div
|
||||
class="w-full rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 ">
|
||||
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
|
||||
<h1 class="text-xl font-bold leading-tight tracking-tight md:text-2xl ">
|
||||
{% translate 'Se te ha enviado un correo electrónico para restablecer tu contraseña' %}
|
||||
</h1>
|
||||
|
||||
<p class="text-sm font-light mt-4 ">
|
||||
{% translate '¿Aún no tienes cuenta?' %}
|
||||
<a href="{% url 'users:register' %}"
|
||||
class="font-medium text-primary-600 hover:underline ">{% translate 'Regístrate aquí' %}</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,60 @@
|
||||
{% extends 'theme/base.html' %}
|
||||
{% load i18n %}
|
||||
{% block main %}
|
||||
{% include 'components/generic/navbar.html' %}
|
||||
<section class=" py-8 antialiased md:py-8">
|
||||
<div class="mx-auto max-w-screen-lg px-4 2xl:px-0">
|
||||
<h2
|
||||
class="mb-4 text-xl font-semibold sm:text-2xl md:mb-6"
|
||||
>
|
||||
{% translate 'Mi cuenta' %}
|
||||
</h2>
|
||||
<div class="md:grid md:grid-cols-2 md:gap-4">
|
||||
<section class="p-6 rounded-md">
|
||||
<h2 class="mb-4 text-xl font-semibold sm:text-2xl md:mb-6">
|
||||
{% translate 'Datos de usuario' %}
|
||||
</h2>
|
||||
<div hx-get="{% url 'web:user_info_component' %}" hx-trigger="load, updated_user_info">
|
||||
<div class="flex justify-center items-center">
|
||||
{% include 'components/generic/spinner.html' %}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section
|
||||
class="p-6 rounded-md mt-4 md:mt-0"
|
||||
>
|
||||
<h2 class="mb-4 text-xl font-semibold sm:text-2xl md:mb-6">
|
||||
{% translate 'Contraseña' %}
|
||||
</h2>
|
||||
<div hx-get="{% url 'web:change_password_component' %}" hx-trigger="load, changed_password">
|
||||
<div class="flex justify-center items-center">
|
||||
{% include 'components/generic/spinner.html' %}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="mt-4 p-6 rounded-md ">
|
||||
<div class="flex space-x-4">
|
||||
<div>
|
||||
<h3 class="flex items-center text-xl font-bold leading-none sm:text-2xl">
|
||||
{% translate 'Mis direcciones' %}
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<hr class="h-px my-2 ">
|
||||
|
||||
{% if customer_addresses.count == 0 %}
|
||||
<span class=" ">{% translate 'No hay ninguna dirección' %}</span>
|
||||
{% endif %}
|
||||
|
||||
<div hx-get="{% url 'web:list_customer_addresses_component' %}" hx-trigger="load, updated_addresses">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,97 @@
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.shortcuts import reverse
|
||||
from django.test import TestCase
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class TestLogin(TestCase):
|
||||
def setUp(self) -> None:
|
||||
self.password = 'theonering'
|
||||
self.user = User.objects.create(username='sauron', email='sauron@mordor.middleearth')
|
||||
|
||||
self.user.set_password(self.password)
|
||||
self.user.save()
|
||||
|
||||
def test_login(self):
|
||||
response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
def test_login_get(self):
|
||||
response = self.client.get(reverse('users:login'))
|
||||
assert response.status_code == 200
|
||||
|
||||
def test_login_already_logged_in(self):
|
||||
response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
response = self.client.get(reverse('users:login'))
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
def test_login_failed(self):
|
||||
response = self.client.post(
|
||||
reverse('users:login'), {'username': self.user.username, 'password': 'wrongpassword'}
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
|
||||
def test_login_then_logout(self):
|
||||
response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
response = self.client.post(reverse('web:logout'))
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
def test_logout_already_logged_out(self):
|
||||
response = self.client.post(reverse('web:logout'))
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
def test_login_then_get_logout(self):
|
||||
response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
response = self.client.get(reverse('web:logout'))
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
def test_login_then_get_my_account(self):
|
||||
response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:index')
|
||||
|
||||
response = self.client.get(reverse('web:my_account'))
|
||||
assert response.status_code == 200
|
||||
|
||||
def test_login_redirection_to_my_account(self):
|
||||
url = f'{reverse("users:login")}?next={reverse("web:my_account")}'
|
||||
response = self.client.post(url, {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == f'{reverse("web:index")}?next={reverse("web:my_account")}'
|
||||
|
||||
response = self.client.get(response.url)
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:my_account')
|
||||
|
||||
def test_login_redirection_to_my_orders(self):
|
||||
url = f'{reverse("users:login")}?next={reverse("web:orders")}'
|
||||
response = self.client.post(url, {'username': self.user.username, 'password': self.password})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == f'{reverse("web:index")}?next={reverse("web:orders")}'
|
||||
|
||||
response = self.client.get(response.url)
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('web:orders')
|
||||
@@ -0,0 +1,112 @@
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.shortcuts import reverse
|
||||
from django.test import TransactionTestCase
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class TestRegister(TransactionTestCase):
|
||||
def setUp(self) -> None:
|
||||
self.password = 'theonering'
|
||||
self.email = 'sauron@mordor.middleearth'
|
||||
self.first_name = 'Sauron'
|
||||
self.last_name = 'The Lord of the Rings'
|
||||
|
||||
def test_get_register_page(self):
|
||||
response = self.client.get(reverse('users:register'))
|
||||
assert response.status_code == 200
|
||||
|
||||
def test_create_user_account(self):
|
||||
response = self.client.post(
|
||||
reverse('users:register'),
|
||||
{
|
||||
'email': self.email,
|
||||
'password1': self.password,
|
||||
'password2': self.password,
|
||||
'first_name': self.first_name,
|
||||
'last_name': self.last_name,
|
||||
},
|
||||
)
|
||||
|
||||
user = User.objects.filter(
|
||||
username=self.email, email=self.email, first_name=self.first_name, last_name=self.last_name
|
||||
).first()
|
||||
|
||||
assert user is not None
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('users:login')
|
||||
|
||||
def test_create_user_account_distinct_password(self):
|
||||
response = self.client.post(
|
||||
reverse('users:register'),
|
||||
{
|
||||
'email': self.email,
|
||||
'password1': self.password,
|
||||
'password2': 'otherpassword',
|
||||
'first_name': self.first_name,
|
||||
'last_name': self.last_name,
|
||||
},
|
||||
)
|
||||
|
||||
assert not User.objects.filter(
|
||||
username=self.email, email=self.email, first_name=self.first_name, last_name=self.last_name
|
||||
).exists()
|
||||
|
||||
assert response.status_code == 400
|
||||
|
||||
def test_create_user_account_no_first_name(self):
|
||||
response = self.client.post(
|
||||
reverse('users:register'),
|
||||
{
|
||||
'email': self.email,
|
||||
'password1': self.password,
|
||||
'password2': 'otherpassword',
|
||||
'first_name': '',
|
||||
'last_name': self.last_name,
|
||||
},
|
||||
)
|
||||
|
||||
assert not User.objects.filter(
|
||||
username=self.email, email=self.email, first_name='', last_name=self.last_name
|
||||
).exists()
|
||||
|
||||
assert response.status_code == 400
|
||||
|
||||
def test_create_user_account_no_last_name(self):
|
||||
response = self.client.post(
|
||||
reverse('users:register'),
|
||||
{
|
||||
'email': self.email,
|
||||
'password1': self.password,
|
||||
'password2': self.password,
|
||||
'first_name': self.first_name,
|
||||
'last_name': '',
|
||||
},
|
||||
)
|
||||
|
||||
assert not User.objects.filter(
|
||||
username=self.email, email=self.email, first_name=self.first_name, last_name=''
|
||||
).exists()
|
||||
|
||||
assert response.status_code == 400
|
||||
|
||||
def test_create_user_account_already_existing(self):
|
||||
assert User.objects.all().count() == 0
|
||||
User.objects.create_user(email=self.email, username=self.email)
|
||||
response = self.client.post(
|
||||
reverse('users:register'),
|
||||
{
|
||||
'email': self.email,
|
||||
'password1': self.password,
|
||||
'password2': self.password,
|
||||
'first_name': self.first_name,
|
||||
'last_name': self.last_name,
|
||||
},
|
||||
)
|
||||
|
||||
assert not User.objects.filter(
|
||||
username=self.email, email=self.email, first_name=self.first_name, last_name=''
|
||||
).exists()
|
||||
|
||||
assert response.status_code == 400
|
||||
@@ -0,0 +1,87 @@
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.tokens import default_token_generator
|
||||
from django.shortcuts import reverse
|
||||
from django.test import TransactionTestCase
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils.http import urlsafe_base64_encode
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class TestResetPassword(TransactionTestCase):
|
||||
def setUp(self) -> None:
|
||||
self.password = 'theonering'
|
||||
self.email = 'sauron@mordor.middleearth'
|
||||
self.first_name = 'Sauron'
|
||||
self.last_name = 'The Lord of the Rings'
|
||||
|
||||
self.user = User.objects.create_user(
|
||||
username=self.email, password=self.password, first_name=self.first_name, last_name=self.last_name
|
||||
)
|
||||
|
||||
def test_get_reset_password_page(self):
|
||||
response = self.client.get(reverse('users:reset_password'))
|
||||
assert response.status_code == 200
|
||||
|
||||
def test_reset_password(self):
|
||||
response = self.client.post(reverse('users:reset_password'), {'email': self.email})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('users:reset_password_email_sent')
|
||||
|
||||
def test_reset_password_not_existing_user(self):
|
||||
response = self.client.post(reverse('users:reset_password'), {'email': 'vanpiro@noesiten.com'})
|
||||
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('users:reset_password_email_sent')
|
||||
|
||||
def test_reset_password_confirm_get(self):
|
||||
token = default_token_generator.make_token(self.user)
|
||||
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
|
||||
|
||||
response = self.client.get(reverse('users:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}))
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
def test_reset_password_confirm(self):
|
||||
token = default_token_generator.make_token(self.user)
|
||||
form_token = default_token_generator.make_token(self.user)
|
||||
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
|
||||
|
||||
new_password = '89733wy29'
|
||||
|
||||
response = self.client.post(
|
||||
reverse('users:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}),
|
||||
{'token': form_token, 'new_password1': new_password, 'new_password2': new_password},
|
||||
)
|
||||
assert response.status_code == 302
|
||||
assert response.url == reverse('users:login')
|
||||
self.user.refresh_from_db()
|
||||
|
||||
assert self.user.check_password(new_password)
|
||||
|
||||
def test_reset_password_confirm_distinct_password(self):
|
||||
token = default_token_generator.make_token(self.user)
|
||||
form_token = default_token_generator.make_token(self.user)
|
||||
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
|
||||
|
||||
new_password = '89733wy29'
|
||||
|
||||
response = self.client.post(
|
||||
reverse('users:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}),
|
||||
{'token': form_token, 'new_password1': new_password, 'new_password2': 'otherpassw13'},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
def test_reset_password_confirm_invalid_token(self):
|
||||
token = default_token_generator.make_token(self.user)
|
||||
form_token = 'invalid token'
|
||||
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
|
||||
|
||||
new_password = '89733wy29'
|
||||
|
||||
response = self.client.post(
|
||||
reverse('users:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}),
|
||||
{'token': form_token, 'new_password1': new_password, 'new_password2': new_password},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
+24
-1
@@ -1,4 +1,27 @@
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.urls import path
|
||||
from django.utils.text import gettext_lazy as _
|
||||
|
||||
from web.views.users import (
|
||||
login,
|
||||
logout,
|
||||
my_account,
|
||||
register,
|
||||
reset_password,
|
||||
reset_password_confirm,
|
||||
reset_password_email_sent,
|
||||
)
|
||||
|
||||
app_name = 'users'
|
||||
|
||||
|
||||
urlpatterns = []
|
||||
urlpatterns = [
|
||||
# users
|
||||
path(_('login/'), login, name='login'),
|
||||
path(_('logout/'), logout, name='logout'),
|
||||
path(_('register/'), register, name='register'),
|
||||
path(_('reset-password/'), reset_password, name='reset_password'),
|
||||
path(_('reset-password/<uidb64>/<token>/'), reset_password_confirm, name='reset_password_confirm'),
|
||||
path(_('reset-password/email-sent/'), reset_password_email_sent, name='reset_password_email_sent'),
|
||||
path(_('my-account/'), login_required(my_account, login_url=_('/login/')), name='my_account'),
|
||||
]
|
||||
|
||||
+244
@@ -0,0 +1,244 @@
|
||||
from django.conf import settings
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth import login as login_user
|
||||
from django.contrib.auth import logout as logout_user
|
||||
from django.contrib.auth.tokens import default_token_generator
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db import IntegrityError
|
||||
from django.shortcuts import redirect, render, reverse
|
||||
from django.utils.http import url_has_allowed_host_and_scheme, urlencode, urlsafe_base64_decode
|
||||
from django.utils.text import gettext_lazy as _
|
||||
from django.views.generic import TemplateView, View
|
||||
|
||||
from shop.models import CustomerAddress
|
||||
from users.forms import LoginForm, PasswordResetForm, RegisterForm, SetPasswordForm
|
||||
from web.models import WebSettings
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class RedirectionMixin:
|
||||
redirect_to = ''
|
||||
|
||||
def get_redirection(self):
|
||||
return reverse(self.redirect_to)
|
||||
|
||||
|
||||
class LoginView(View, RedirectionMixin):
|
||||
template_name = 'users/login.html'
|
||||
redirect_to = 'web:index'
|
||||
login_form_class = LoginForm
|
||||
|
||||
def get_redirection(self):
|
||||
next_page = self.request.GET.get('next', '')
|
||||
|
||||
if next_page:
|
||||
return f'{reverse(self.redirect_to)}?next={next_page}'
|
||||
|
||||
return reverse(self.redirect_to)
|
||||
|
||||
def get_login_form(self, request):
|
||||
return self.login_form_class(data=request.POST)
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
if request.user.is_authenticated:
|
||||
return redirect(self.get_redirection())
|
||||
|
||||
web_settings = WebSettings.load()
|
||||
login_form = self.login_form_class()
|
||||
|
||||
return render(
|
||||
request,
|
||||
self.template_name,
|
||||
{'form': login_form, 'title': web_settings.web_title, 'description': _('inicio de sesión')},
|
||||
)
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
login_form = self.get_login_form(request)
|
||||
|
||||
if login_form.is_valid():
|
||||
login_user(request, login_form.get_user())
|
||||
|
||||
if not login_form.cleaned_data.get('remember_me'):
|
||||
request.session.set_expiry(0)
|
||||
|
||||
return redirect(self.get_redirection())
|
||||
|
||||
return render(
|
||||
request, self.template_name, {'form': login_form, 'errors': login_form.errors.get('__all__')}, status=400
|
||||
)
|
||||
|
||||
|
||||
class RegisterView(TemplateView, RedirectionMixin):
|
||||
template_name = 'users/register.html'
|
||||
redirect_to = 'users:login'
|
||||
form_class = RegisterForm
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
settings = WebSettings.load()
|
||||
|
||||
return {'form': self.form_class(), 'title': settings.web_title, 'description': _('crear cuenta')}
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
settings = WebSettings.load()
|
||||
form = self.form_class(request.POST)
|
||||
errors = []
|
||||
|
||||
try:
|
||||
if form.is_valid():
|
||||
user = form.save()
|
||||
|
||||
user.username = user.email
|
||||
user.first_name = form.cleaned_data.get('first_name')
|
||||
user.last_name = form.cleaned_data.get('last_name')
|
||||
user.save()
|
||||
|
||||
login(request, user)
|
||||
return redirect(self.get_redirection())
|
||||
else:
|
||||
errors = form.errors
|
||||
except IntegrityError:
|
||||
errors = [_('Ya existe un usuario con ese correo electrónico')]
|
||||
|
||||
return render(
|
||||
request,
|
||||
self.template_name,
|
||||
{'form': form, 'title': settings.web_title, 'description': _('Crear cuenta'), 'errors': errors},
|
||||
status=400,
|
||||
)
|
||||
|
||||
|
||||
class LogoutView(View, RedirectionMixin):
|
||||
redirect_to = 'web:index'
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
logout_user(request)
|
||||
return redirect(self.get_redirection())
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
logout_user(request)
|
||||
return redirect(self.get_redirection())
|
||||
|
||||
|
||||
class ResetPasswordView(TemplateView):
|
||||
template_name = 'users/reset_password.html'
|
||||
form_class = PasswordResetForm
|
||||
redirect_to = 'users:reset_password_email_sent'
|
||||
html_reset_password_template_name = 'mails/reset_password.html'
|
||||
subject_template_name = 'mails/subject_reset_password.txt'
|
||||
|
||||
def get_email_options(self):
|
||||
return {
|
||||
'extra_email_context': {},
|
||||
'email_template_name': self.html_reset_password_template_name,
|
||||
'html_email_template_name': self.html_reset_password_template_name,
|
||||
'subject_template_name': self.subject_template_name,
|
||||
}
|
||||
|
||||
def get_base_context(self):
|
||||
settings = WebSettings.load()
|
||||
|
||||
return {'title': settings.web_title, 'description': _('Restablecer contraseña')}
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = self.get_base_context()
|
||||
context.update({'form': self.form_class()})
|
||||
return context
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
form = self.form_class(request.POST)
|
||||
|
||||
if form.is_valid():
|
||||
opts = {
|
||||
'use_https': request.is_secure(),
|
||||
'from_email': getattr(settings, 'DEFAULT_FROM_EMAIL'),
|
||||
'request': request,
|
||||
}
|
||||
|
||||
opts.update(self.get_email_options())
|
||||
form.save(**opts)
|
||||
return redirect(self.redirect_to)
|
||||
|
||||
context = self.get_base_context()
|
||||
context.update({'form': form})
|
||||
|
||||
return render(request, self.template_name, context)
|
||||
|
||||
|
||||
class ResetPasswordEmailSent(TemplateView):
|
||||
template_name = 'users/reset_password_email_sent.html'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
settings = WebSettings.load()
|
||||
|
||||
return {'title': settings.web_title, 'description': settings.web_description}
|
||||
|
||||
|
||||
class ResetPasswordConfirmView(TemplateView):
|
||||
template_name = 'users/reset_password_confirm.html'
|
||||
form_class = SetPasswordForm
|
||||
redirect_to = 'users:login'
|
||||
token_generator = default_token_generator
|
||||
|
||||
def get_user(self):
|
||||
try:
|
||||
uidb64 = self.kwargs.get('uidb64')
|
||||
uid = urlsafe_base64_decode(uidb64).decode()
|
||||
user = User.objects.get(pk=uid)
|
||||
except (TypeError, ValueError, OverflowError, User.DoesNotExist, ValidationError):
|
||||
user = None
|
||||
return user
|
||||
|
||||
def generate_new_token_for_user(self, user):
|
||||
return self.token_generator.make_token(user)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
user = self.get_user()
|
||||
valid_token = self.check_token(user)
|
||||
new_token = self.generate_new_token_for_user(user)
|
||||
|
||||
return {
|
||||
'title': WebSettings.load().web_title,
|
||||
'description': _('Establecer nueva contraseña'),
|
||||
'form': self.form_class(user, {'token': new_token}),
|
||||
'valid_token': valid_token,
|
||||
'new_token': new_token,
|
||||
}
|
||||
|
||||
def check_token(self, user):
|
||||
token = self.kwargs.get('token')
|
||||
valid_token = self.token_generator.check_token(user, token)
|
||||
return valid_token
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
user = self.get_user()
|
||||
form = self.form_class(user, request.POST)
|
||||
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
return redirect(self.redirect_to)
|
||||
return render(request, self.template_name, {})
|
||||
|
||||
|
||||
class MyAccountView(TemplateView):
|
||||
template_name = 'users/user_details.html'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
addresses = CustomerAddress.objects.filter(user=self.request.user)
|
||||
web_settings = WebSettings.load()
|
||||
return {
|
||||
'title': f'{web_settings.web_title} - Mi cuenta',
|
||||
'description': f'{web_settings.web_title} - Mi cuenta',
|
||||
'customer_addresses': addresses,
|
||||
}
|
||||
|
||||
|
||||
login = LoginView.as_view()
|
||||
logout = LogoutView.as_view()
|
||||
register = RegisterView.as_view()
|
||||
reset_password = ResetPasswordView.as_view()
|
||||
|
||||
reset_password_confirm = ResetPasswordConfirmView.as_view()
|
||||
reset_password_email_sent = ResetPasswordEmailSent.as_view()
|
||||
|
||||
my_account = MyAccountView.as_view()
|
||||
|
||||
Reference in New Issue
Block a user