upd(system): permission update returns all permissions for given roleID
This commit is contained in:
@@ -18,7 +18,7 @@ func TestRole(t *testing.T) {
|
||||
|
||||
userRepo := User(context.Background(), factory.Database.MustGet())
|
||||
user := &types.User{
|
||||
Name: "John Doe",
|
||||
Name: "John Role Doe",
|
||||
Username: "johndoe",
|
||||
}
|
||||
user.GeneratePassword("johndoe")
|
||||
|
||||
@@ -17,7 +17,7 @@ func TestUser(t *testing.T) {
|
||||
|
||||
userRepo := User(context.Background(), factory.Database.MustGet())
|
||||
user := &types.User{
|
||||
Name: "John Doe",
|
||||
Name: "John User Doe",
|
||||
Username: "johndoe",
|
||||
SatosaID: "1234",
|
||||
}
|
||||
@@ -50,7 +50,7 @@ func TestUser(t *testing.T) {
|
||||
}
|
||||
|
||||
{
|
||||
users, err := userRepo.Find(&types.UserFilter{Query: ""})
|
||||
users, err := userRepo.Find(&types.UserFilter{Query: "John User Doe"})
|
||||
assert(t, err == nil, "Owner.Find error: %+v", err)
|
||||
assert(t, len(users) == 1, "Owner.Find: expected 1 user, got %d", len(users))
|
||||
assert(t, len(users[0].Roles) == 1, "Owner.Find: expected 1 role, got %d", len(users[0].Roles))
|
||||
|
||||
@@ -49,7 +49,11 @@ func (p *permission) Update(roleID uint64, rules []rules.Rule) (interface{}, err
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return nil, p.resources.Grant(roleID, rules)
|
||||
err := p.resources.Grant(roleID, rules)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return p.resources.List(roleID)
|
||||
}
|
||||
|
||||
func (p *permission) Delete(roleID uint64) (interface{}, error) {
|
||||
|
||||
Reference in New Issue
Block a user