From b777d470412a1aec485ef27e95f2258a2ba6713e Mon Sep 17 00:00:00 2001 From: Sokurov Idar Date: Thu, 18 Feb 2021 19:22:10 +0300 Subject: [PATCH 1/8] Recreate registration v1 --- access_controller/settings.py | 16 ++++++++-- access_controller/urls.py | 30 +++++++++++++++---- main/extra_func.py | 25 +++++++++++++--- main/forms.py | 14 ++------- .../registration_form.html | 10 +++---- .../registration/password_reset_complete.html | 13 ++++++++ .../registration/password_reset_confirm.html | 23 ++++++++++++++ .../registration/password_reset_done.html | 14 +++++++++ .../registration/password_reset_email.html | 3 ++ .../registration/password_reset_form.html | 18 +++++++++++ main/views.py | 20 ++++++------- 11 files changed, 147 insertions(+), 39 deletions(-) create mode 100644 main/templates/registration/password_reset_complete.html create mode 100644 main/templates/registration/password_reset_confirm.html create mode 100644 main/templates/registration/password_reset_done.html create mode 100644 main/templates/registration/password_reset_email.html create mode 100644 main/templates/registration/password_reset_form.html diff --git a/access_controller/settings.py b/access_controller/settings.py index eecfa19..152b5b0 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -35,6 +35,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django_cleanup.apps.CleanupConfig', 'django_registration', 'main', ] @@ -51,6 +52,17 @@ MIDDLEWARE = [ ROOT_URLCONF = 'access_controller.urls' + +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'smtp.mail.ru' +EMAIL_PORT = 2525 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = 'dj-gr-2@mail.ru' +EMAIL_HOST_PASSWORD = 'djangogroup02' +SERVER_EMAIL = EMAIL_HOST_USER +DEFAULT_FROM_EMAIL = EMAIL_HOST_USER + + TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -119,11 +131,9 @@ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'staticroot') STATICFILES_DIRS = [ os.path.join(BASE_DIR, 'static'), - os.path.join(BASE_DIR, 'media'), ] -MEDIA_ROOT = BASE_DIR / 'media' -MEDIA_URL = '/media/' +ACCOUNT_ACTIVATION_DAYS = 7 LOGIN_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/' diff --git a/access_controller/urls.py b/access_controller/urls.py index b2603b2..edd173e 100644 --- a/access_controller/urls.py +++ b/access_controller/urls.py @@ -13,13 +13,10 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.conf.urls.static import static from django.contrib import admin from django.contrib.auth.views import LoginView +from django.contrib.auth import views as auth_views from django.urls import path, include - -from access_controller import settings -from access_controller.settings import DEBUG from main.views import main_page, profile_page, CustomRegistrationView urlpatterns = [ @@ -29,5 +26,28 @@ urlpatterns = [ path('accounts/register/', CustomRegistrationView.as_view(), name='registration'), path('accounts/login/', LoginView.as_view(extra_context={}), name='login'), # TODO add extra context path('accounts/', include('django.contrib.auth.urls')), - path('accounts/', include('django_registration.backends.one_step.urls')), + path('accounts/', include('django_registration.backends.activation.urls')), +] + +urlpatterns += [ + path( + 'password-reset/', + auth_views.PasswordResetView.as_view(), + name='password_reset' + ), + path( + 'password-reset/done/', + auth_views.PasswordResetDoneView.as_view(), + name='password_reset_done' + ), + path( + 'reset///', + auth_views.PasswordResetConfirmView.as_view(), + name='password_reset_confirm' + ), + path( + 'reset/done/', + auth_views.PasswordResetCompleteView.as_view(), + name='password_reset_complete' + ), ] diff --git a/main/extra_func.py b/main/extra_func.py index 73c533b..b3d194a 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -34,6 +34,11 @@ class ZendeskAdmin: user = self.admin.users.search(email).values[0] return user.id + def get_user_org(self, email: str) -> str: + user = self.admin.users.search(email).values[0] + print(user) + return user.organization + def get_user_image(self, email: str) -> str: user = self.admin.users.search(email).values[0] return user.photo['content_url'] if user.photo else None @@ -81,6 +86,18 @@ def check_user_exist(email: str) -> bool: return ZendeskAdmin().check_user(email) +def get_user_organization(email: str) -> bool: + """ + Функция возвращает организацию пользователя + + :param email: Электронная почта пользователя + :type email: :class:`str` + :return: Название организации + :rtype: :class:`str` + """ + return ZendeskAdmin().get_user_org(email) + + def check_user_auth(email: str, password: str) -> bool: """ Функция проверяет, верны ли входные данные @@ -94,10 +111,10 @@ def check_user_auth(email: str, password: str) -> bool: :rtype: :class:`bool` """ creds = { - 'email': email, - 'password': password, - 'subdomain': 'ngenix1612197338', - } + 'email': email, + 'password': password, + 'subdomain': 'ngenix1612197338', + } try: user = Zenpy(**creds) user.search(email, type='user') diff --git a/main/forms.py b/main/forms.py index fcd8a7f..6a058bb 100644 --- a/main/forms.py +++ b/main/forms.py @@ -5,30 +5,22 @@ from django_registration.forms import RegistrationFormUniqueEmail class CustomRegistrationForm(RegistrationFormUniqueEmail): """ Форма для регистрации :class:`django_registration.forms.RegistrationFormUniqueEmail` - с полем для ввода пароля от Zendesk аккаунта и с добавлением bootstrap-класса 'form-control' для всех полей + с добавлением bootstrap-класса 'form-control' :param password_zen: Поле для ввода пароля от Zendesk :type password_zen: :class:`django.forms.CharField` """ - password_zen = forms.CharField( - required=True, - label="Пароль от Zendesk аккаунта", - strip=False, - widget=forms.PasswordInput(attrs={ - 'class': 'form-control' - }) - ) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) for visible in self.visible_fields(): if visible.field.widget.attrs.get('class', False): - print(visible.field.widget.attrs['class'].find('form-control')) if visible.field.widget.attrs['class'].find('form-control') < 0: visible.field.widget.attrs['class'] += 'form-control' else: visible.field.widget.attrs['class'] = 'form-control' + if visible.html_name !='email': + visible.field.required = False class Meta(RegistrationFormUniqueEmail.Meta): fields = RegistrationFormUniqueEmail.Meta.fields - fields.insert(2, 'password_zen') diff --git a/main/templates/django_registration/registration_form.html b/main/templates/django_registration/registration_form.html index c4bb388..61b69b0 100644 --- a/main/templates/django_registration/registration_form.html +++ b/main/templates/django_registration/registration_form.html @@ -11,14 +11,12 @@ {% block content %}
{% csrf_token %} - {% for field in form %} - {{ field.label_tag }} - {{ field }} + {{ form.email.label_tag }} + {{ form.email }}
- {% if field.errors %} - {{ field.errors }} + {% if form.email.errors %} + {{ form.email.errors }} {% endif %} - {% endfor %}
{% endblock %} diff --git a/main/templates/registration/password_reset_complete.html b/main/templates/registration/password_reset_complete.html new file mode 100644 index 0000000..8381ada --- /dev/null +++ b/main/templates/registration/password_reset_complete.html @@ -0,0 +1,13 @@ +{% extends "base/base.html" %} + +{% block title %} + {{ pagename }} +{% endblock %} + +{% block heading %} + Восстановление пароля +{% endblock %} + +{% block content %} +

Ваш новый пароль был установлен. Вы можете войти сейчас

+{% endblock %} diff --git a/main/templates/registration/password_reset_confirm.html b/main/templates/registration/password_reset_confirm.html new file mode 100644 index 0000000..df40ed2 --- /dev/null +++ b/main/templates/registration/password_reset_confirm.html @@ -0,0 +1,23 @@ +{% extends "base/base.html" %} + +{% block title %} + {{ pagename }} +{% endblock %} + +{% block heading %} + Восстановление пароля +{% endblock %} + +{% block content %} + {% if validlink %} +

Пожалуйста, введите пароль дважды:

+
+ {{ form.as_p }} + {% csrf_token %} +

+
+ {% else %} +

Неверная ссылка восстановления пароля, возможно она уже была использована. + Пожалуйста, запросите новый сброс пароля

+ {% endif %} +{% endblock %} diff --git a/main/templates/registration/password_reset_done.html b/main/templates/registration/password_reset_done.html new file mode 100644 index 0000000..0103509 --- /dev/null +++ b/main/templates/registration/password_reset_done.html @@ -0,0 +1,14 @@ +{% extends "base/base.html" %} + +{% block title %} + {{ pagename }} +{% endblock %} + +{% block heading %} + Восстановление пароля +{% endblock %} + +{% block content %} +

Мы отправили вам на почту инструкцию по восстановлению

+

Если вы не получили сообщение, убедитесь что верно ввели адрес электронной почты.

+{% endblock %} diff --git a/main/templates/registration/password_reset_email.html b/main/templates/registration/password_reset_email.html new file mode 100644 index 0000000..8c0a2d2 --- /dev/null +++ b/main/templates/registration/password_reset_email.html @@ -0,0 +1,3 @@ +Someone asked for password reset for email {{ email }}. Follow thelink below: +{{ protocol }}://{{ domain }}{% url "password_reset_confirm" uidb64=uid token=token %} +Your username, in case you've forgotten: {{ user.get_username }} diff --git a/main/templates/registration/password_reset_form.html b/main/templates/registration/password_reset_form.html new file mode 100644 index 0000000..39cf045 --- /dev/null +++ b/main/templates/registration/password_reset_form.html @@ -0,0 +1,18 @@ +{% extends "base/base.html" %} + +{% block title %} + {{ pagename }} +{% endblock %} + +{% block heading %} + Забыли пароль? +{% endblock %} + +{% block content %} +

Введте свой e-mail адрес для восстановления пароля.

+
+ {{ form.as_p }} +

+ {% csrf_token %} +
+{% endblock %} diff --git a/main/views.py b/main/views.py index 797ea8b..92bedb6 100644 --- a/main/views.py +++ b/main/views.py @@ -1,17 +1,15 @@ +from django.contrib.auth.views import PasswordResetView from django.shortcuts import render from django.urls import reverse_lazy +from django_registration.backends.one_step.views import RegistrationView -from main.extra_func import check_user_exist, check_user_auth, update_profile +from main.extra_func import check_user_exist, check_user_auth, update_profile, get_user_organization from main.models import UserProfile from django.contrib.auth.models import User from main.forms import CustomRegistrationForm -from django_registration.views import RegistrationView - from django.contrib.auth.decorators import login_required -from zenpy import Zenpy - class CustomRegistrationView(RegistrationView): """ @@ -24,14 +22,16 @@ class CustomRegistrationView(RegistrationView): def register(self, form): self.is_allowed = True - if check_user_exist(form.data['email']) and check_user_auth(form.data['email'], form.data['password_zen']): + if get_user_organization(form.data['email'])=='SYSTEM' and check_user_exist(form.data['email']) : user = User.objects.create_user( - username=form.data['username'], + username=form.data['email'], email=form.data['email'], - password=form.data['password1'] ) + PasswordResetView.as_view()(self.request) + user.is_active = False + user.save() profile = user.userprofile - update_profile(profile) + return user else: self.is_allowed = False @@ -41,7 +41,7 @@ class CustomRegistrationView(RegistrationView): Используется самой django-registration """ if self.is_allowed: - return reverse_lazy('django_registration_complete') + return reverse_lazy('password_reset_done') else: return reverse_lazy('django_registration_disallowed') From c2c1477983ba370bf7732ad7622c566d61b2c0ac Mon Sep 17 00:00:00 2001 From: Sokurov Idar Date: Thu, 18 Feb 2021 19:50:33 +0300 Subject: [PATCH 2/8] small refactoring --- main/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/views.py b/main/views.py index 92bedb6..7625e26 100644 --- a/main/views.py +++ b/main/views.py @@ -28,9 +28,8 @@ class CustomRegistrationView(RegistrationView): email=form.data['email'], ) PasswordResetView.as_view()(self.request) - user.is_active = False - user.save() profile = user.userprofile + update_profile(profile) return user else: self.is_allowed = False From ca1fab09c9a5b1bd279a2d5287571c2c92f7ffef Mon Sep 17 00:00:00 2001 From: Andrew Smirnov Date: Thu, 18 Feb 2021 20:45:56 +0300 Subject: [PATCH 3/8] Add logging framework usage example --- access_controller/settings.py | 38 +++++++++++++++++++++++++++++++++++ main/views.py | 4 +++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/access_controller/settings.py b/access_controller/settings.py index eecfa19..c713dff 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -127,3 +127,41 @@ MEDIA_URL = '/media/' LOGIN_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/' + +# Logging system +# https://docs.djangoproject.com/en/3.1/topics/logging/ +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}', + 'style': '{', + }, + 'simple': { + 'format': '{levelname} {message}', + 'style': '{', + }, + }, + 'handlers': { + 'console': { + 'level': 'INFO', + 'class': 'logging.StreamHandler', + 'formatter': 'simple' + }, + 'mail_admins': { + 'level': 'ERROR', + 'class': 'django.utils.log.AdminEmailHandler', + } + }, + 'loggers': { + 'django': { + 'handlers': ['console'], + 'propagate': True, + }, + 'main.index': { + 'handlers': ['console'], + 'level': 'INFO', + } + } +} diff --git a/main/views.py b/main/views.py index 797ea8b..2ee81dd 100644 --- a/main/views.py +++ b/main/views.py @@ -10,7 +10,7 @@ from django_registration.views import RegistrationView from django.contrib.auth.decorators import login_required -from zenpy import Zenpy +import logging class CustomRegistrationView(RegistrationView): @@ -69,4 +69,6 @@ def profile_page(request): def main_page(request): + logger = logging.getLogger('main.index') + logger.info('Index page opened') return render(request, 'pages/index.html') From 0953a0627ecaeebc8a3a31eb48bb0290339c7cba Mon Sep 17 00:00:00 2001 From: Sokurov Idar Date: Thu, 18 Feb 2021 20:58:10 +0300 Subject: [PATCH 4/8] Temporary --- access_controller/settings.py | 11 +---------- main/views.py | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/access_controller/settings.py b/access_controller/settings.py index 152b5b0..d6e6b15 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -35,7 +35,6 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_cleanup.apps.CleanupConfig', 'django_registration', 'main', ] @@ -53,15 +52,7 @@ MIDDLEWARE = [ ROOT_URLCONF = 'access_controller.urls' -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_HOST = 'smtp.mail.ru' -EMAIL_PORT = 2525 -EMAIL_USE_TLS = True -EMAIL_HOST_USER = 'dj-gr-2@mail.ru' -EMAIL_HOST_PASSWORD = 'djangogroup02' -SERVER_EMAIL = EMAIL_HOST_USER -DEFAULT_FROM_EMAIL = EMAIL_HOST_USER - +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' TEMPLATES = [ { diff --git a/main/views.py b/main/views.py index 7625e26..24022bc 100644 --- a/main/views.py +++ b/main/views.py @@ -1,3 +1,5 @@ +from django.contrib.auth.forms import PasswordResetForm +from django.contrib.auth.tokens import default_token_generator from django.contrib.auth.views import PasswordResetView from django.shortcuts import render from django.urls import reverse_lazy @@ -22,12 +24,30 @@ class CustomRegistrationView(RegistrationView): def register(self, form): self.is_allowed = True - if get_user_organization(form.data['email'])=='SYSTEM' and check_user_exist(form.data['email']) : + + + forms = PasswordResetForm(initial={'email': form.data['email']}) + opts = { + 'use_https': self.request.is_secure(), + 'token_generator': default_token_generator, + 'from_email': form.data['email'], + 'email_template_name': 'registration/password_reset_email.html', + 'subject_template_name': 'registration/password_reset_subject.txt', + 'request': self.request, + 'html_email_template_name': None, + 'extra_email_context': None, + } + forms.full_clean() + forms.save(**opts) + + + if get_user_organization(form.data['email']) == 'SYSTEM' and check_user_exist(form.data['email']): user = User.objects.create_user( username=form.data['email'], email=form.data['email'], ) - PasswordResetView.as_view()(self.request) + + f = PasswordResetView profile = user.userprofile update_profile(profile) return user From e955dfab9949a8aae3b84c1baff92f4b05beb0e6 Mon Sep 17 00:00:00 2001 From: Andrew Smirnov Date: Thu, 18 Feb 2021 21:04:45 +0300 Subject: [PATCH 5/8] Fix registrationForm (add is_valid call) --- main/views.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/main/views.py b/main/views.py index 24022bc..1a116ea 100644 --- a/main/views.py +++ b/main/views.py @@ -25,21 +25,20 @@ class CustomRegistrationView(RegistrationView): def register(self, form): self.is_allowed = True - forms = PasswordResetForm(initial={'email': form.data['email']}) - opts = { - 'use_https': self.request.is_secure(), - 'token_generator': default_token_generator, - 'from_email': form.data['email'], - 'email_template_name': 'registration/password_reset_email.html', - 'subject_template_name': 'registration/password_reset_subject.txt', - 'request': self.request, - 'html_email_template_name': None, - 'extra_email_context': None, - } - forms.full_clean() - forms.save(**opts) - + if forms.is_valid(): + opts = { + 'use_https': self.request.is_secure(), + 'token_generator': default_token_generator, + 'from_email': form.data['email'], + 'email_template_name': 'registration/password_reset_email.html', + 'subject_template_name': 'registration/password_reset_subject.txt', + 'request': self.request, + 'html_email_template_name': None, + 'extra_email_context': None, + } + forms.full_clean() + forms.save(**opts) if get_user_organization(form.data['email']) == 'SYSTEM' and check_user_exist(form.data['email']): user = User.objects.create_user( From 8b512afadbdf75f65087cf341dc4bc634deebaaa Mon Sep 17 00:00:00 2001 From: Sokurov Idar Date: Fri, 19 Feb 2021 17:55:27 +0300 Subject: [PATCH 6/8] fix bug, update registration --- access_controller/settings.py | 10 +++- main/extra_func.py | 27 +++------ .../registration_closed.html | 2 +- .../registration/password_reset_email.html | 3 - main/views.py | 59 +++++++++---------- 5 files changed, 43 insertions(+), 58 deletions(-) delete mode 100644 main/templates/registration/password_reset_email.html diff --git a/access_controller/settings.py b/access_controller/settings.py index d6e6b15..86eb079 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -51,8 +51,14 @@ MIDDLEWARE = [ ROOT_URLCONF = 'access_controller.urls' - -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'smtp.mail.ru' +EMAIL_PORT = 2525 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = 'djgr.02@mail.ru' +EMAIL_HOST_PASSWORD = 'djangogroup02' +SERVER_EMAIL = EMAIL_HOST_USER +DEFAULT_FROM_EMAIL = EMAIL_HOST_USER TEMPLATES = [ { diff --git a/main/extra_func.py b/main/extra_func.py index b3d194a..909a6a7 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -22,26 +22,12 @@ class ZendeskAdmin: def check_user(self, email: str) -> bool: return True if self.admin.search(email, type='user') else False - def get_user_name(self, email: str) -> str: - user = self.admin.users.search(email).values[0] - return user.name - - def get_user_role(self, email: str) -> str: - user = self.admin.users.search(email).values[0] - return user.role - - def get_user_id(self, email: str) -> str: - user = self.admin.users.search(email).values[0] - return user.id + def get_user(self, email: str) -> str: + return self.admin.users.search(email).values[0] def get_user_org(self, email: str) -> str: user = self.admin.users.search(email).values[0] - print(user) - return user.organization - - def get_user_image(self, email: str) -> str: - user = self.admin.users.search(email).values[0] - return user.photo['content_url'] if user.photo else None + return user.organization.name def create_admin(self) -> None: if self.email is None: @@ -68,9 +54,10 @@ def update_profile(user_profile: UserProfile): :param user_profile: Объект профиля пользователя :type user_profile: :class:`main.models.UserProfile` """ - user_profile.name = ZendeskAdmin().get_user_name(user_profile.user.email) - user_profile.role = ZendeskAdmin().get_user_role(user_profile.user.email) - user_profile.image = ZendeskAdmin().get_user_image(user_profile.user.email) + user = ZendeskAdmin().get_user(user_profile.user.email) + user_profile.name = user.name + user_profile.role = user.role + user_profile.image = user.photo['content_url'] if user.photo else None user_profile.save() diff --git a/main/templates/django_registration/registration_closed.html b/main/templates/django_registration/registration_closed.html index 4fffce6..9c5e013 100644 --- a/main/templates/django_registration/registration_closed.html +++ b/main/templates/django_registration/registration_closed.html @@ -11,5 +11,5 @@ {% block content %}
-

Нет пользователя с указаным адресом электронной почты, либо был введён неверный пароль

+

Нет пользователя с указаным адресом электронной почты.

{% endblock %} diff --git a/main/templates/registration/password_reset_email.html b/main/templates/registration/password_reset_email.html deleted file mode 100644 index 8c0a2d2..0000000 --- a/main/templates/registration/password_reset_email.html +++ /dev/null @@ -1,3 +0,0 @@ -Someone asked for password reset for email {{ email }}. Follow thelink below: -{{ protocol }}://{{ domain }}{% url "password_reset_confirm" uidb64=uid token=token %} -Your username, in case you've forgotten: {{ user.get_username }} diff --git a/main/views.py b/main/views.py index 1a116ea..a1361e5 100644 --- a/main/views.py +++ b/main/views.py @@ -1,16 +1,14 @@ +from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import PasswordResetForm +from django.contrib.auth.models import User from django.contrib.auth.tokens import default_token_generator -from django.contrib.auth.views import PasswordResetView from django.shortcuts import render from django.urls import reverse_lazy from django_registration.backends.one_step.views import RegistrationView -from main.extra_func import check_user_exist, check_user_auth, update_profile, get_user_organization -from main.models import UserProfile - -from django.contrib.auth.models import User +from access_controller.settings import EMAIL_HOST_USER +from main.extra_func import check_user_exist, update_profile, get_user_organization from main.forms import CustomRegistrationForm -from django.contrib.auth.decorators import login_required class CustomRegistrationView(RegistrationView): @@ -24,32 +22,29 @@ class CustomRegistrationView(RegistrationView): def register(self, form): self.is_allowed = True - - forms = PasswordResetForm(initial={'email': form.data['email']}) - if forms.is_valid(): - opts = { - 'use_https': self.request.is_secure(), - 'token_generator': default_token_generator, - 'from_email': form.data['email'], - 'email_template_name': 'registration/password_reset_email.html', - 'subject_template_name': 'registration/password_reset_subject.txt', - 'request': self.request, - 'html_email_template_name': None, - 'extra_email_context': None, - } - forms.full_clean() - forms.save(**opts) - - if get_user_organization(form.data['email']) == 'SYSTEM' and check_user_exist(form.data['email']): - user = User.objects.create_user( - username=form.data['email'], - email=form.data['email'], - ) - - f = PasswordResetView - profile = user.userprofile - update_profile(profile) - return user + if check_user_exist(form.data['email']) and get_user_organization(form.data['email']) == 'SYSTEM': + forms = PasswordResetForm(self.request.POST) + if forms.is_valid(): + opts = { + 'use_https': self.request.is_secure(), + 'token_generator': default_token_generator, + 'from_email': EMAIL_HOST_USER, + 'email_template_name': 'registration/password_reset_email.html', + 'subject_template_name': 'registration/password_reset_subject.txt', + 'request': self.request, + 'html_email_template_name': None, + 'extra_email_context': None, + } + user = User.objects.create_user( + username=form.data['email'], + email=form.data['email'], + password=User.objects.make_random_password(length=50) + ) + forms.save(**opts) + update_profile(user.userprofile) + return user + else: + raise ValueError('Непредвиденная ошибка') else: self.is_allowed = False From 25734d847fcccd32607e6c39adc74787ed49dfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D1=83=D1=80=D0=BE=D0=B2=20=D0=98=D0=B4?= =?UTF-8?q?=D0=B0=D1=80?= Date: Tue, 23 Feb 2021 09:01:32 +0000 Subject: [PATCH 7/8] Add password reset --- main/templates/registration/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/templates/registration/login.html b/main/templates/registration/login.html index 0917b0c..a420ca7 100644 --- a/main/templates/registration/login.html +++ b/main/templates/registration/login.html @@ -31,7 +31,7 @@ {% endif %}
- Забыли пароль? + Забыли пароль?
From c71949dac6e6dceab313f58576c0c4c87928583c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=BE=D0=BD=D0=BA=D0=BE=D0=B2=D0=B8=D0=B4=20=D0=A0?= =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D0=BD?= Date: Thu, 25 Feb 2021 16:13:49 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BA=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access_controller/urls.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/access_controller/urls.py b/access_controller/urls.py index edd173e..45781bf 100644 --- a/access_controller/urls.py +++ b/access_controller/urls.py @@ -27,11 +27,12 @@ urlpatterns = [ path('accounts/login/', LoginView.as_view(extra_context={}), name='login'), # TODO add extra context path('accounts/', include('django.contrib.auth.urls')), path('accounts/', include('django_registration.backends.activation.urls')), -] + path('accounts/login/', include('django.contrib.auth.urls')), + ] urlpatterns += [ path( - 'password-reset/', + 'password_reset/', auth_views.PasswordResetView.as_view(), name='password_reset' ),