ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-09-18 06:14:31 +02:00
Code Issues Packages Releases Activity

token based login: fix re-logins

Browse Source
This commit is contained in:
Lou Knauer
2022-07-26 13:50:54 +02:00
parent dc0bf80742
commit d4b1b32ca0
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/auth/users.go
View File

@@ -38,13 +38,8 @@ func (auth *Authentication) GetUser(username string) (*User, error) {
func (auth *Authentication) AddUser(user *User) error {
rolesJson, _ := json.Marshal(user.Roles)
password, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
if err != nil {
return err
}
cols := []string{"username", "password", "roles"}
vals := []interface{}{user.Username, string(password), string(rolesJson)}
cols := []string{"username", "roles"}
vals := []interface{}{user.Username, string(rolesJson)}
if user.Name != "" {
cols = append(cols, "name")
vals = append(vals, user.Name)
@@ -53,6 +48,14 @@ func (auth *Authentication) AddUser(user *User) error {
cols = append(cols, "email")
vals = append(vals, user.Email)
}
if user.Password != "" {
password, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
if err != nil {
return err
}
cols = append(cols, "password")
vals = append(vals, string(password))
}
if _, err := sq.Insert("user").Columns(cols...).Values(vals...).RunWith(auth.db).Exec(); err != nil {
return err