devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

fix: roles model

Browse Source
This commit is contained in:
Lakhan Samani 2021-10-04 13:58:03 +05:30
parent e429a1f860
commit b1b7f47f4c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/db/roles.go
View File

@ -23,8 +23,7 @@ func (r *Role) BeforeCreate(tx *gorm.DB) (err error) {
func (mgr *manager) SaveRoles(roles []Role) error { func (mgr *manager) SaveRoles(roles []Role) error {
res := mgr.db.Clauses( res := mgr.db.Clauses(
clause.OnConflict{ clause.OnConflict{
OnConstraint: "authorizer_roles_role_key", DoNothing: true,
DoNothing: true,
}).Create(&roles) }).Create(&roles)
if res.Error != nil { if res.Error != nil {
log.Println(`Error saving roles`) log.Println(`Error saving roles`)

4
server/resolvers/adminUpdateUser.go
View File

@ -30,7 +30,6 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
} }
user, err := db.Mgr.GetUserByID(params.ID) user, err := db.Mgr.GetUserByID(params.ID)
if err != nil { if err != nil {
return res, fmt.Errorf(`User not found`) return res, fmt.Errorf(`User not found`)
} }
@ -114,9 +113,8 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
return res, err return res, err
} }
userIdStr := fmt.Sprintf("%v", user.ID)
res = &model.User{ res = &model.User{
ID: userIdStr, ID: params.ID,
Email: user.Email, Email: user.Email,
Image: &user.Image, Image: &user.Image,
FirstName: &user.FirstName, FirstName: &user.FirstName,