SlimRole has organizaton scope now in response, remove from the name

Emyrk · Emyrk · commit 01a492ebe00f · 2024-06-04T16:10:14.000-05:00
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -204,13 +204,6 @@ func Group(group database.Group, members []database.User) codersdk.Group {
 	}
 }
 
-func SlimRole(role rbac.Role) codersdk.SlimRole {
-	return codersdk.SlimRole{
-		DisplayName: role.DisplayName,
-		Name:        role.Name,
-	}
-}
-
 func TemplateInsightsParameters(parameterRows []database.GetTemplateParameterInsightsRow) ([]codersdk.TemplateParameterUsage, error) {
 	// Use a stable sort, similarly to how we would sort in the query, note that
 	// we don't sort in the query because order varies depending on the table
@@ -525,6 +518,19 @@ func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.Provisioner
 	return result
 }
 
+func SlimRole(role rbac.Role) codersdk.SlimRole {
+	roleName, orgIDStr, err := rbac.RoleSplit(role.Name)
+	if err != nil {
+		roleName = role.Name
+	}
+
+	return codersdk.SlimRole{
+		DisplayName:    role.DisplayName,
+		Name:           roleName,
+		OrganizationID: orgIDStr,
+	}
+}
+
 func RBACRole(role rbac.Role) codersdk.Role {
 	roleName, orgIDStr, err := rbac.RoleSplit(role.Name)
 	if err != nil {
diff --git a/coderd/members.go b/coderd/members.go
@@ -68,7 +68,7 @@ func convertOrganizationMember(mem database.OrganizationMember) codersdk.Organiz
 	}
 
 	for _, roleName := range mem.Roles {
-		rbacRole, _ := rbac.RoleByName(roleName)
+		rbacRole, _ := rbac.RoleByName(rbac.RoleName(roleName, mem.OrganizationID.String()))
 		convertedMember.Roles = append(convertedMember.Roles, db2sdk.SlimRole(rbacRole))
 	}
 	return convertedMember
diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go
@@ -70,6 +70,14 @@ func RoleMember() string {
 	return RoleName(member, "")
 }
 
+func StaticRoleOrgAdmin() string {
+	return orgAdmin
+}
+
+func StaticRoleOrgMember() string {
+	return orgMember
+}
+
 func RoleOrgAdmin(organizationID uuid.UUID) string {
 	return RoleName(orgAdmin, organizationID.String())
 }
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -986,7 +986,7 @@ func TestGrantSiteRoles(t *testing.T) {
 			Name:         "OrgRoleInSite",
 			Client:       admin,
 			AssignToUser: codersdk.Me,
-			Roles:        []string{rbac.RoleOrgAdmin(first.OrganizationID)},
+			Roles:        []string{rbac.StaticRoleOrgAdmin()},
 			Error:        true,
 			StatusCode:   http.StatusBadRequest,
 		},
@@ -1029,7 +1029,7 @@ func TestGrantSiteRoles(t *testing.T) {
 			Client:       orgAdmin,
 			OrgID:        randOrg.ID,
 			AssignToUser: randOrgUser.ID.String(),
-			Roles:        []string{rbac.RoleOrgMember(randOrg.ID)},
+			Roles:        []string{rbac.StaticRoleOrgMember()},
 			Error:        true,
 			StatusCode:   http.StatusNotFound,
 		},
@@ -1047,9 +1047,9 @@ func TestGrantSiteRoles(t *testing.T) {
 			Client:       orgAdmin,
 			OrgID:        first.OrganizationID,
 			AssignToUser: newUser,
-			Roles:        []string{rbac.RoleOrgAdmin(first.OrganizationID)},
+			Roles:        []string{rbac.StaticRoleOrgAdmin()},
 			ExpectedRoles: []string{
-				rbac.RoleOrgAdmin(first.OrganizationID),
+				rbac.StaticRoleOrgAdmin(),
 			},
 			Error: false,
 		},
diff --git a/codersdk/roles.go b/codersdk/roles.go
@@ -14,8 +14,9 @@ import (
 // and it would require extra db calls to fetch this information. The UI does
 // not need it, so most api calls will use this structure that omits information.
 type SlimRole struct {
-	Name        string `json:"name"`
-	DisplayName string `json:"display_name"`
+	Name           string `json:"name"`
+	DisplayName    string `json:"display_name"`
+	OrganizationID string `json:"organization_id"`
 }
 
 type AssignableRoles struct {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func convertOrganizationMember(mem database.OrganizationMember) codersdk.Organiz`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`for _, roleName := range mem.Roles {`
`71`		`- rbacRole, _ := rbac.RoleByName(roleName)`
	`71`	`+ rbacRole, _ := rbac.RoleByName(rbac.RoleName(roleName, mem.OrganizationID.String()))`
`72`	`72`	`convertedMember.Roles = append(convertedMember.Roles, db2sdk.SlimRole(rbacRole))`
`73`	`73`	`}`
`74`	`74`	`return convertedMember`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,14 @@ func RoleMember() string {`
`70`	`70`	`return RoleName(member, "")`
`71`	`71`	`}`
`72`	`72`
	`73`	`+func StaticRoleOrgAdmin() string {`
	`74`	`+ return orgAdmin`
	`75`	`+}`
	`76`	`+`
	`77`	`+func StaticRoleOrgMember() string {`
	`78`	`+ return orgMember`
	`79`	`+}`
	`80`	`+`
`73`	`81`	`func RoleOrgAdmin(organizationID uuid.UUID) string {`
`74`	`82`	`return RoleName(orgAdmin, organizationID.String())`
`75`	`83`	`}`