You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by li...@apache.org on 2024/06/12 03:44:39 UTC
(incubator-answer) 02/02: fix: Apply fixes from code review
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 9a885d0bf6e3ba487dbd17f9957a9a9eecb387ee
Author: sy-records <52...@qq52o.cn>
AuthorDate: Wed Jun 12 07:34:50 2024 +0800
fix: Apply fixes from code review
---
internal/service/user_admin/user_backyard.go | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/internal/service/user_admin/user_backyard.go b/internal/service/user_admin/user_backyard.go
index 1d192d5c..6ce98f99 100644
--- a/internal/service/user_admin/user_backyard.go
+++ b/internal/service/user_admin/user_backyard.go
@@ -360,19 +360,7 @@ func (us *UserAdminService) EditUserProfile(ctx context.Context, req *schema.Edi
return nil, errors.BadRequest(reason.UserNotFound)
}
- if checker.IsInvalidUsername(req.Username) {
- return append(errFields, &validator.FormErrorField{
- ErrorField: "username",
- ErrorMsg: reason.UsernameInvalid,
- }), errors.BadRequest(reason.UsernameInvalid)
- }
-
- if !req.IsAdmin && checker.IsReservedUsername(req.Username) {
- return append(errFields, &validator.FormErrorField{
- ErrorField: "username",
- ErrorMsg: reason.UsernameInvalid,
- }), errors.BadRequest(reason.UsernameInvalid)
- } else if req.IsAdmin && checker.IsUsersIgnorePath(req.Username) {
+ if checker.IsInvalidUsername(req.Username) || checker.IsUsersIgnorePath(req.Username) {
return append(errFields, &validator.FormErrorField{
ErrorField: "username",
ErrorMsg: reason.UsernameInvalid,