Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix: Apply fixes from code review

sy-records9a885d0bf6e3
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,