git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-29 18:00:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: restructure user parameters for PostUser and simplify email validation; refactor UserAvatar styles and improve user name handling

Browse Source
This commit is contained in:
Marvin Zhang
2025-05-29 22:16:27 +08:00
parent 57348da3f2
commit 062077a9bd
4 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/controllers/user.go
View File

@@ -86,25 +86,27 @@ func GetUserList(_ *gin.Context, params *GetListParams) (response *ListResponse[
}
type PostUserParams struct {
Username string `json:"username" description:"Username" validate:"required"`
Password string `json:"password" description:"Password" validate:"required"`
Role string `json:"role" description:"Role"`
RoleId string `json:"role_id" description:"Role ID" format:"objectid" pattern:"^[0-9a-fA-F]{24}$"`
Email string `json:"email" description:"Email"`
Data struct {
Username string `json:"username" description:"Username" validate:"required"`
Password string `json:"password" description:"Password" validate:"required"`
Role string `json:"role" description:"Role"`
RoleId string `json:"role_id" description:"Role ID" format:"objectid" pattern:"^[0-9a-fA-F]{24}$"`
Email string `json:"email" description:"Email"`
} `json:"data" validate:"required"`
}
func PostUser(c *gin.Context, params *PostUserParams) (response *Response[models.User], err error) {
// Validate email format
if params.Email != "" {
if params.Data.Email != "" {
emailRegex := regexp.MustCompile(`^[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,}$`)
if !emailRegex.MatchString(params.Email) {
if !emailRegex.MatchString(params.Data.Email) {
return GetErrorResponse[models.User](errors.BadRequestf("invalid email format"))
}
}
var roleId primitive.ObjectID
if params.RoleId != "" {
roleId, err = primitive.ObjectIDFromHex(params.RoleId)
if params.Data.RoleId != "" {
roleId, err = primitive.ObjectIDFromHex(params.Data.RoleId)
if err != nil {
return GetErrorResponse[models.User](errors.BadRequestf("invalid role id: %v", err))
}
@@ -115,11 +117,11 @@ func PostUser(c *gin.Context, params *PostUserParams) (response *Response[models
}
u := GetUserFromContext(c)
model := models.User{
Username: params.Username,
Password: utils.EncryptMd5(params.Password),
Role: params.Role,
Username: params.Data.Username,
Password: utils.EncryptMd5(params.Data.Password),
Role: params.Data.Role,
RoleId: roleId,
Email: params.Email,
Email: params.Data.Email,
}
model.SetCreated(u.Id)
model.SetUpdated(u.Id)