This commit is contained in:
@@ -24,39 +24,39 @@ class LoginView(auth_views.LoginView):
|
||||
template_name = 'dav_auth/forms/login.html'
|
||||
|
||||
def get_redirect_url(self):
|
||||
url = super(LoginView, self).get_redirect_url()
|
||||
url = super().get_redirect_url()
|
||||
if not url and app_config.settings.login_redirect_url:
|
||||
url = resolve_url(app_config.settings.login_redirect_url)
|
||||
return url
|
||||
|
||||
def form_valid(self, form):
|
||||
r = super(LoginView, self).form_valid(form)
|
||||
messages.success(self.request, _(u'Benutzer angemeldet: %(username)s') % {'username': form.get_user()})
|
||||
r = super().form_valid(form)
|
||||
messages.success(self.request, _('Benutzer angemeldet: %(username)s') % {'username': form.get_user()})
|
||||
try:
|
||||
validate_password(form.cleaned_data['password'])
|
||||
except ValidationError as e:
|
||||
logger.warning(u'Weak password (%d): %s', self.request.user.pk, e)
|
||||
message = u'<br />\n<p>\n'
|
||||
message += u'Dein Passwort entspricht nicht mehr den aktuellen Passwortrichtlinien.<br />\n'
|
||||
message += u'Bitte hilf uns die Daten deiner Teilnehmer zu schützen und ändere dein Passwort.<br />\n'
|
||||
message += u'</p>\n'
|
||||
message += u'<p>\n'
|
||||
message += u'<a href="%(href)s">Passwort ändern</a>\n' % {'href': reverse('dav_auth:set_password')}
|
||||
message += u'</p>\n<br />\n'
|
||||
logger.warning('Weak password (%d): %s', self.request.user.pk, e)
|
||||
message = '<br />\n<p>\n'
|
||||
message += 'Dein Passwort entspricht nicht mehr den aktuellen Passwortrichtlinien.<br />\n'
|
||||
message += 'Bitte hilf uns die Daten deiner Teilnehmer zu schützen und ändere dein Passwort.<br />\n'
|
||||
message += '</p>\n'
|
||||
message += '<p>\n'
|
||||
message += '<a href="%(href)s">Passwort ändern</a>\n' % {'href': reverse('dav_auth:set_password')}
|
||||
message += '</p>\n<br />\n'
|
||||
messages.warning(self.request, mark_safe(message))
|
||||
return r
|
||||
|
||||
|
||||
class LogoutView(auth_views.LogoutView):
|
||||
def get_next_page(self):
|
||||
url = super(LogoutView, self).get_next_page()
|
||||
url = super().get_next_page()
|
||||
if not url and app_config.settings.logout_redirect_url:
|
||||
url = resolve_url(app_config.settings.logout_redirect_url)
|
||||
return url
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
r = super(LogoutView, self).dispatch(request, *args, **kwargs)
|
||||
messages.success(self.request, _(u'Benutzer abgemeldet.'))
|
||||
r = super().dispatch(request, *args, **kwargs)
|
||||
messages.success(self.request, _('Benutzer abgemeldet.'))
|
||||
return r
|
||||
|
||||
|
||||
@@ -68,8 +68,8 @@ class SetPasswordView(auth_views.PasswordChangeView):
|
||||
return resolve_url(app_config.settings.login_redirect_url)
|
||||
|
||||
def form_valid(self, form):
|
||||
r = super(SetPasswordView, self).form_valid(form)
|
||||
messages.success(self.request, _(u'Passwort gespeichert.'))
|
||||
r = super().form_valid(form)
|
||||
messages.success(self.request, _('Passwort gespeichert.'))
|
||||
if form.cleaned_data.get('send_password_mail', False):
|
||||
email = emails.PasswordSetEmail(self.request.user, form.cleaned_data['new_password'])
|
||||
email.send()
|
||||
@@ -91,14 +91,14 @@ class CreateAndSendPasswordView(generic.FormView):
|
||||
user.save()
|
||||
email = emails.PasswordSetEmail(user, random_password)
|
||||
email.send()
|
||||
messages.success(self.request, _(u'Neues Passwort versendet.'))
|
||||
messages.success(self.request, _('Neues Passwort versendet.'))
|
||||
logger.info('Password recreated for user \'%s\'', username)
|
||||
except user_model.DoesNotExist:
|
||||
logger.warning('Password recreated for unknown user \'%s\'', username)
|
||||
|
||||
return super(CreateAndSendPasswordView, self).form_valid(form)
|
||||
return super().form_valid(form)
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
if request.user.is_authenticated:
|
||||
return HttpResponseRedirect(reverse('dav_auth:set_password'))
|
||||
return super(CreateAndSendPasswordView, self).get(request, *args, **kwargs)
|
||||
return super().get(request, *args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user