Commit42b42ab

committed

Handle out of order lists

1 parent117f838 commit42b42abCopy full SHA for 42b42ab

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,14 +174,15 @@ func OrganizationRoles(organizationID uuid.UUID) []string {`
`174`	`174`	`// the list from the builtins.`
`175`	`175`	`funcSiteRoles() []string {`
`176`	`176`	`varroles []string`
`177`		`-forrole:=rangebuiltInRoles {`
`178`		`-_,scope,err:=roleSplit(role)`
	`177`	`+for_,roleF:=rangebuiltInRoles {`
	`178`	`+role:=roleF("random")`
	`179`	`+_,scope,err:=roleSplit(role.Name)`
`179`	`180`	`iferr!=nil {`
`180`	`181`	`// This should never happen`
`181`	`182`	`continue`
`182`	`183`	`}`
`183`	`184`	`ifscope=="" {`
`184`		`-roles=append(roles,role)`
	`185`	`+roles=append(roles,role.Name)`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`	`returnroles`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func TestListRoles(t *testing.T) {`
`122`	`122`	`require.Contains(t,apiErr.Message,c.AuthorizedError)`
`123`	`123`	`}else {`
`124`	`124`	`require.NoError(t,err)`
`125`		`-require.Equal(t,c.ExpectedRoles,roles)`
	`125`	`+require.ElementsMatch(t,c.ExpectedRoles,roles)`
`126`	`126`	`}`
`127`	`127`	`})`
`128`	`128`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ import (`
`9`	`9`	`"github.com/google/uuid"`
`10`	`10`	`)`
`11`	`11`
	`12`	`+// ListSiteRoles lists all available site wide roles.`
	`13`	`+// This is not user specific.`
`12`	`14`	`func (c*Client)ListSiteRoles(ctx context.Context) ([]string,error) {`
`13`	`15`	`res,err:=c.request(ctx,http.MethodGet,"/api/v2/users/roles",nil)`
`14`	`16`	`iferr!=nil {`
`@@ -22,6 +24,8 @@ func (c *Client) ListSiteRoles(ctx context.Context) ([]string, error) {`
`22`	`24`	`returnroles,json.NewDecoder(res.Body).Decode(&roles)`
`23`	`25`	`}`
`24`	`26`
	`27`	`+// ListOrganizationRoles lists all available roles for a given organization.`
	`28`	`+// This is not user specific.`
`25`	`29`	`func (c*Client)ListOrganizationRoles(ctx context.Context,org uuid.UUID) ([]string,error) {`
`26`	`30`	`res,err:=c.request(ctx,http.MethodGet,fmt.Sprintf("/api/v2/organizations/%s/members/roles/",org.String()),nil)`
`27`	`31`	`iferr!=nil {`

Comments

(0)