floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: (rbac) create user password require

This commit is contained in:
xushuhui 2022-04-21 10:13:49 +08:00
parent 42ca7cac25
commit 66b9995b07
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/biz/user.go
View File

@ -74,7 +74,7 @@ func CreateUser(localUser *User, req dto.CreateUser) (id string, err error) {
Name: v.Name, Name: v.Name,
}) })
} }
hash, err := bcrypt.GenerateFromPassword([]byte("123456"), bcrypt.DefaultCost) hash, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
if err != nil { if err != nil {
return return

2
plugin/api/rbac/role.go
View File

@ -19,7 +19,7 @@ func (h Rbac) CreateRole(w http.ResponseWriter, r *http.Request, ps httprouter.P
var req dto.CreateRole var req dto.CreateRole
err = h.DecodeJSON(r, &req) err = h.DecodeJSON(r, &req)
if err != nil { if err != nil {
h.Error(w, err) h.Error400(w, err.Error())
return return
} }
req.RoleType = roleType req.RoleType = roleType

11
plugin/api/rbac/user.go
View File

@ -25,7 +25,12 @@ func (h Rbac) CreateUser(w http.ResponseWriter, r *http.Request, ps httprouter.P
var req dto.CreateUser var req dto.CreateUser
err := h.DecodeJSON(r, &req) err := h.DecodeJSON(r, &req)
if err != nil { if err != nil {
h.Error(w, err) h.Error400(w, err.Error())
return
}
if req.Username == "" || req.Password == "" {
h.Error400(w, "username or password require")
return return
} }
localUser, err := biz.FromUserContext(r.Context()) localUser, err := biz.FromUserContext(r.Context())
@ -68,7 +73,7 @@ func (h Rbac) UpdateUser(w http.ResponseWriter, r *http.Request, ps httprouter.P
err := h.DecodeJSON(r, &req) err := h.DecodeJSON(r, &req)
if err != nil { if err != nil {
_ = log.Error(err.Error()) _ = log.Error(err.Error())
h.Error(w, err) h.Error400(w, err.Error())
return return
} }
localUser, err := biz.FromUserContext(r.Context()) localUser, err := biz.FromUserContext(r.Context())
@ -94,7 +99,7 @@ func (h Rbac) UpdateUserRole(w http.ResponseWriter, r *http.Request, ps httprout
err := h.DecodeJSON(r, &req) err := h.DecodeJSON(r, &req)
if err != nil { if err != nil {
_ = log.Error(err.Error()) _ = log.Error(err.Error())
h.Error(w, err) h.Error400(w, err.Error())
return return
} }
localUser, err := biz.FromUserContext(r.Context()) localUser, err := biz.FromUserContext(r.Context())