github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-18 08:51:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3910 from jumpserver/dev_user

Browse Source 
[Update] 修改用户密码重置页面错误信息提示
This commit is contained in:
BaiJiangJie 2020-04-17 11:27:26 +08:00 committed by GitHub
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') token = self.request.GET.get('token')
user = User.validate_reset_password_token(token) user = User.validate_reset_password_token(token)
if not user: 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(): if not user.can_update_password():
errors = _('User auth from {}, go there change password'.format(user.source)) error = _('User auth from {}, go there change password'.format(user.source))
return self.get(self.request, errors=errors) form.add_error('new_password', error)
return self.form_invalid(form)
password = form.cleaned_data['new_password'] password = form.cleaned_data['new_password']
is_ok = check_password_rules(password) is_ok = check_password_rules(password)
if not is_ok: if not is_ok:
errors = _('* Your password does not meet the requirements') error = _('* Your password does not meet the requirements')
return self.get(self.request, errors=errors) form.add_error('new_password', error)
return self.form_invalid(form)
user.reset_password(password) user.reset_password(password)
User.expired_reset_password_token(token) User.expired_reset_password_token(token)