zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: user reset password

Browse Source
This commit is contained in:
wxg0103 2025-06-12 19:16:30 +08:00
parent e0a7fe8feb
commit 02e7cacb10
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/users/serializers/user.py
View File

@ -512,14 +512,6 @@ def update_user_role(instance, user):
class RePasswordSerializer(serializers.Serializer): class RePasswordSerializer(serializers.Serializer):
email = serializers.EmailField(
required=True,
label=_("Email"),
validators=[validators.EmailValidator(message=ExceptionCodeConstants.EMAIL_FORMAT_ERROR.value.message,
code=ExceptionCodeConstants.EMAIL_FORMAT_ERROR.value.code)])
code = serializers.CharField(required=True, label=_("Verification code"))
password = serializers.CharField(required=True, label=_("Password"), password = serializers.CharField(required=True, label=_("Password"),
validators=[validators.RegexValidator(regex=re.compile( validators=[validators.RegexValidator(regex=re.compile(
"^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z_!@#$%^&*`~.()-+=]+$)(?![a-z0-9]+$)(?![a-z_!@#$%^&*`~()-+=]+$)" "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z_!@#$%^&*`~.()-+=]+$)(?![a-z0-9]+$)(?![a-z_!@#$%^&*`~()-+=]+$)"
@ -541,28 +533,19 @@ class RePasswordSerializer(serializers.Serializer):
def is_valid(self, *, raise_exception=False): def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True) super().is_valid(raise_exception=True)
email = self.data.get("email")
cache_code = cache.get(get_key(email + ':reset_password'), version=version)
if self.data.get('password') != self.data.get('re_password'): if self.data.get('password') != self.data.get('re_password'):
raise AppApiException(ExceptionCodeConstants.PASSWORD_NOT_EQ_RE_PASSWORD.value.code, raise AppApiException(ExceptionCodeConstants.PASSWORD_NOT_EQ_RE_PASSWORD.value.code,
ExceptionCodeConstants.PASSWORD_NOT_EQ_RE_PASSWORD.value.message) ExceptionCodeConstants.PASSWORD_NOT_EQ_RE_PASSWORD.value.message)
if cache_code != self.data.get('code'):
raise AppApiException(ExceptionCodeConstants.CODE_ERROR.value.code,
ExceptionCodeConstants.CODE_ERROR.value.message)
return True return True
def reset_password(self): def reset_password(self, user_id: str):
""" """
修改密码 修改密码
:return: 是否成功 :return: 是否成功
""" """
if self.is_valid(): if self.is_valid():
email = self.data.get("email") QuerySet(User).filter(id=user_id).update(
QuerySet(User).filter(email=email).update(
password=password_encrypt(self.data.get('password'))) password=password_encrypt(self.data.get('password')))
code_cache_key = email + ":reset_password"
# 删除验证码缓存
cache.delete(code_cache_key, version=version)
return True return True

11
apps/users/views/user.py
View File

@ -287,12 +287,11 @@ class RePasswordView(APIView):
request=ResetPasswordAPI.get_request(), request=ResetPasswordAPI.get_request(),
responses=DefaultModelResponse.get_response()) responses=DefaultModelResponse.get_response())
@log(menu='User management', operate='Change password', @log(menu='User management', operate='Change password',
get_operation_object=lambda r, k: {'name': r.data.get('email', None)}, get_operation_object=lambda r, k: {'name': r.user.username},
get_user=lambda r: {'user_name': None, 'email': r.data.get('email', None)},
get_details=get_re_password_details) get_details=get_re_password_details)
def post(self, request: Request): def post(self, request: Request):
serializer_obj = RePasswordSerializer(data=request.data) serializer_obj = RePasswordSerializer(data=request.data)
return result.success(serializer_obj.reset_password()) return result.success(serializer_obj.reset_password(request.user.id))
class SendEmail(APIView): class SendEmail(APIView):
@ -361,10 +360,8 @@ class ResetCurrentUserPasswordView(APIView):
get_operation_object=lambda r, k: {'name': r.user.username}, get_operation_object=lambda r, k: {'name': r.user.username},
get_details=get_re_password_details) get_details=get_re_password_details)
def post(self, request: Request): def post(self, request: Request):
data = {'email': request.user.email} serializer_obj = RePasswordSerializer(data=request.data)
data.update(request.data) if serializer_obj.reset_password(request.user.id):
serializer_obj = RePasswordSerializer(data=data)
if serializer_obj.reset_password():
version, get_key = Cache_Version.TOKEN.value version, get_key = Cache_Version.TOKEN.value
cache.delete(get_key(token=request.auth), version=version) cache.delete(get_key(token=request.auth), version=version)
return result.success(True) return result.success(True)