Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion roleset/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ func (c *Client) List(ctx context.Context, params *ListParams) (*clerk.RoleSetLi

type AddRolesParams struct {
clerk.APIParams
RoleKeys []string `json:"role_keys,omitempty"`
RoleKeys []string `json:"role_keys,omitempty"`
DefaultRoleKey *string `json:"default_role_key,omitempty"`
}

// AddRoles adds roles to a role set.
Expand Down
5 changes: 3 additions & 2 deletions roleset/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,16 @@ func TestRoleSetClient_AddRoles(t *testing.T) {
config.HTTPClient = &http.Client{
Transport: &clerktest.RoundTripper{
T: t,
In: json.RawMessage(`{"role_keys":["role:admin","role:manager"]}`),
In: json.RawMessage(`{"role_keys":["role:admin","role:manager"], "default_role_key": "role:admin"}`),
Out: json.RawMessage(fmt.Sprintf(`{"object":"role_set","id":"%s","name":"Admin Role Set","type":"initial","key":"%s","description":"Admin roles","roles":[{"object":"role_set_item","id":"role_1","name":"Admin","key":"role:admin","description":"Admin role","created_at":1234567890,"updated_at":1234567890}],"default_role":{"object":"role_set_item","id":"role_123","name":"Member","key":"org:member","description":"Default member role","created_at":1234567890,"updated_at":1234567890},"created_at":1234567890,"updated_at":1234567891}`, roleSetID, roleSetKey)),
Method: http.MethodPost,
Path: "/v1/role_sets/" + url.PathEscape(roleSetKey) + "/roles",
},
}
client := NewClient(config)
roleSet, err := client.AddRoles(context.Background(), roleSetKey, &AddRolesParams{
RoleKeys: roleKeys,
RoleKeys: roleKeys,
DefaultRoleKey: clerk.String("role:admin"),
})
require.NoError(t, err)
assert.Equal(t, roleSetID, roleSet.ID)
Expand Down
Loading