chore: Make member role struct match site roles (#3671)

Emyrk · web-flow · commit 0b53b06fc63a · 2022-08-24T15:58:57.000-04:00
diff --git a/coderd/members.go b/coderd/members.go
@@ -105,11 +105,17 @@ func (api *API) updateOrganizationMemberRoles(ctx context.Context, args database
 }
 
 func convertOrganizationMember(mem database.OrganizationMember) codersdk.OrganizationMember {
-	return codersdk.OrganizationMember{
+	convertedMember := codersdk.OrganizationMember{
 		UserID:         mem.UserID,
 		OrganizationID: mem.OrganizationID,
 		CreatedAt:      mem.CreatedAt,
 		UpdatedAt:      mem.UpdatedAt,
-		Roles:          mem.Roles,
+		Roles:          make([]codersdk.Role, 0, len(mem.Roles)),
 	}
+
+	for _, roleName := range mem.Roles {
+		rbacRole, _ := rbac.RoleByName(roleName)
+		convertedMember.Roles = append(convertedMember.Roles, convertRole(rbacRole))
+	}
+	return convertedMember
 }
diff --git a/coderd/users.go b/coderd/users.go
@@ -1000,7 +1000,7 @@ func convertUser(user database.User, organizationIDs []uuid.UUID) codersdk.User
 		Username:        user.Username,
 		Status:          codersdk.UserStatus(user.Status),
 		OrganizationIDs: organizationIDs,
-		Roles:           make([]codersdk.Role, 0),
+		Roles:           make([]codersdk.Role, 0, len(user.RBACRoles)),
 	}
 
 	for _, roleName := range user.RBACRoles {
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -489,17 +489,19 @@ func TestGrantSiteRoles(t *testing.T) {
 	})
 	require.NoError(t, err)
 	_, randOrgUser := coderdtest.CreateAnotherUserWithUser(t, admin, randOrg.ID, rbac.RoleOrgAdmin(randOrg.ID))
+	userAdmin := coderdtest.CreateAnotherUser(t, admin, first.OrganizationID, rbac.RoleUserAdmin())
 
 	const newUser = "newUser"
 
 	testCases := []struct {
-		Name         string
-		Client       *codersdk.Client
-		OrgID        uuid.UUID
-		AssignToUser string
-		Roles        []string
-		Error        bool
-		StatusCode   int
+		Name          string
+		Client        *codersdk.Client
+		OrgID         uuid.UUID
+		AssignToUser  string
+		Roles         []string
+		ExpectedRoles []string
+		Error         bool
+		StatusCode    int
 	}{
 		{
 			Name:         "OrgRoleInSite",
@@ -576,7 +578,20 @@ func TestGrantSiteRoles(t *testing.T) {
 			OrgID:        first.OrganizationID,
 			AssignToUser: newUser,
 			Roles:        []string{rbac.RoleOrgAdmin(first.OrganizationID)},
-			Error:        false,
+			ExpectedRoles: []string{
+				rbac.RoleOrgAdmin(first.OrganizationID),
+			},
+			Error: false,
+		},
+		{
+			Name:         "UserAdminMakeMember",
+			Client:       userAdmin,
+			AssignToUser: newUser,
+			Roles:        []string{rbac.RoleMember()},
+			ExpectedRoles: []string{
+				rbac.RoleMember(),
+			},
+			Error: false,
 		},
 	}
 
@@ -597,23 +612,33 @@ func TestGrantSiteRoles(t *testing.T) {
 				c.AssignToUser = newUser.ID.String()
 			}
 
+			var newRoles []codersdk.Role
 			if c.OrgID != uuid.Nil {
 				// Org assign
-				_, err = c.Client.UpdateOrganizationMemberRoles(ctx, c.OrgID, c.AssignToUser, codersdk.UpdateRoles{
+				var mem codersdk.OrganizationMember
+				mem, err = c.Client.UpdateOrganizationMemberRoles(ctx, c.OrgID, c.AssignToUser, codersdk.UpdateRoles{
 					Roles: c.Roles,
 				})
+				newRoles = mem.Roles
 			} else {
 				// Site assign
-				_, err = c.Client.UpdateUserRoles(ctx, c.AssignToUser, codersdk.UpdateRoles{
+				var user codersdk.User
+				user, err = c.Client.UpdateUserRoles(ctx, c.AssignToUser, codersdk.UpdateRoles{
 					Roles: c.Roles,
 				})
+				newRoles = user.Roles
 			}
 
 			if c.Error {
 				require.Error(t, err)
 				requireStatusCode(t, err, c.StatusCode)
 			} else {
 				require.NoError(t, err)
+				roles := make([]string, 0, len(newRoles))
+				for _, r := range newRoles {
+					roles = append(roles, r.Name)
+				}
+				require.ElementsMatch(t, roles, c.ExpectedRoles)
 			}
 		})
 	}
diff --git a/codersdk/organizationmember.go b/codersdk/organizationmember.go
@@ -11,5 +11,5 @@ type OrganizationMember struct {
 	OrganizationID uuid.UUID `db:"organization_id" json:"organization_id"`
 	CreatedAt      time.Time `db:"created_at" json:"created_at"`
 	UpdatedAt      time.Time `db:"updated_at" json:"updated_at"`
-	Roles          []string  `db:"roles" json:"roles"`
+	Roles          []Role    `db:"roles" json:"roles"`
 }
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -206,7 +206,7 @@ export interface OrganizationMember {
   readonly organization_id: string
   readonly created_at: string
   readonly updated_at: string
-  readonly roles: string[]
+  readonly roles: Role[]
 }
 
 // From codersdk/pagination.go

Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,17 @@ func (api *API) updateOrganizationMemberRoles(ctx context.Context, args database`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`func convertOrganizationMember(mem database.OrganizationMember) codersdk.OrganizationMember {`
`108`		`- return codersdk.OrganizationMember{`
	`108`	`+ convertedMember := codersdk.OrganizationMember{`
`109`	`109`	`UserID: mem.UserID,`
`110`	`110`	`OrganizationID: mem.OrganizationID,`
`111`	`111`	`CreatedAt: mem.CreatedAt,`
`112`	`112`	`UpdatedAt: mem.UpdatedAt,`
`113`		`- Roles: mem.Roles,`
	`113`	`+ Roles: make([]codersdk.Role, 0, len(mem.Roles)),`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ for _, roleName := range mem.Roles {`
	`117`	`+ rbacRole, _ := rbac.RoleByName(roleName)`
	`118`	`+ convertedMember.Roles = append(convertedMember.Roles, convertRole(rbacRole))`
	`119`	`+ }`
	`120`	`+ return convertedMember`
`115`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1000,7 +1000,7 @@ func convertUser(user database.User, organizationIDs []uuid.UUID) codersdk.User`
`1000`	`1000`	`Username: user.Username,`
`1001`	`1001`	`Status: codersdk.UserStatus(user.Status),`
`1002`	`1002`	`OrganizationIDs: organizationIDs,`
`1003`		`- Roles: make([]codersdk.Role, 0),`
	`1003`	`+ Roles: make([]codersdk.Role, 0, len(user.RBACRoles)),`
`1004`	`1004`	`}`
`1005`	`1005`
`1006`	`1006`	`for _, roleName := range user.RBACRoles {`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ type OrganizationMember struct {`
`11`	`11`	OrganizationID uuid.UUID `db:"organization_id" json:"organization_id"`
`12`	`12`	CreatedAt time.Time `db:"created_at" json:"created_at"`
`13`	`13`	UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
`14`		- Roles []string `db:"roles" json:"roles"`
	`14`	+ Roles []Role `db:"roles" json:"roles"`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ export interface OrganizationMember {`
`206`	`206`	`readonly organization_id: string`
`207`	`207`	`readonly created_at: string`
`208`	`208`	`readonly updated_at: string`
`209`		`- readonly roles: string[]`
	`209`	`+ readonly roles: Role[]`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// From codersdk/pagination.go`