github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3910 from jumpserver/dev_user 

[Update] 修改用户密码重置页面错误信息提示
pull/3918/head
BaiJiangJie 2020-04-17 11:27:26 +08:00 committed by GitHub
parent 1de2923dd3 081f4b1c0a
commit 0d3fab216b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/users/views/login.py
View File

@ -109,17 +109,21 @@ class UserResetPasswordView(FormView):
token = self.request.GET.get('token')
user = User.validate_reset_password_token(token)
if not user:
return self.get(self.request, errors=_('Token invalid or expired'))
error = _('Token invalid or expired')
form.add_error('new_password', error)
return self.form_invalid(form)
if not user.can_update_password():
errors = _('User auth from {}, go there change password'.format(user.source))
return self.get(self.request, errors=errors)
error = _('User auth from {}, go there change password'.format(user.source))
form.add_error('new_password', error)
return self.form_invalid(form)
password = form.cleaned_data['new_password']
is_ok = check_password_rules(password)
if not is_ok:
errors = _('* Your password does not meet the requirements')
return self.get(self.request, errors=errors)
error = _('* Your password does not meet the requirements')
form.add_error('new_password', error)
return self.form_invalid(form)
user.reset_password(password)
User.expired_reset_password_token(token)