refactor: Add roles into the user response

BrunoQuaresma · BrunoQuaresma · commit b27a5edb8622 · 2022-05-09T14:37:34.000Z
diff --git a/coderd/users.go b/coderd/users.go
@@ -807,14 +807,22 @@ func (api *api) createUser(ctx context.Context, req codersdk.CreateUserRequest)
 }
 
 func convertUser(user database.User, organizationIDs []uuid.UUID) codersdk.User {
-	return codersdk.User{
+	convertedUser := codersdk.User{
 		ID:              user.ID,
 		Email:           user.Email,
 		CreatedAt:       user.CreatedAt,
 		Username:        user.Username,
 		Status:          codersdk.UserStatus(user.Status),
 		OrganizationIDs: organizationIDs,
+		Roles:           make([]codersdk.Role, 0),
 	}
+
+	for _, roleName := range user.RBACRoles {
+		rbacRole, _ := rbac.RoleByName(roleName)
+		convertedUser.Roles = append(convertedUser.Roles, codersdk.ConvertRole(rbacRole))
+	}
+
+	return convertedUser
 }
 
 func convertUsers(users []database.User, organizationIDsByUserID map[uuid.UUID][]uuid.UUID) []codersdk.User {
diff --git a/codersdk/roles.go b/codersdk/roles.go
@@ -45,13 +45,17 @@ func (c *Client) ListOrganizationRoles(ctx context.Context, org uuid.UUID) ([]Ro
 	return roles, json.NewDecoder(res.Body).Decode(&roles)
 }
 
+func ConvertRole(role rbac.Role) Role {
+	return Role{
+		DisplayName: role.DisplayName,
+		Name:        role.Name,
+	}
+}
+
 func ConvertRoles(roles []rbac.Role) []Role {
 	converted := make([]Role, 0, len(roles))
 	for _, role := range roles {
-		converted = append(converted, Role{
-			DisplayName: role.DisplayName,
-			Name:        role.Name,
-		})
+		converted = append(converted, ConvertRole(role))
 	}
 	return converted
 }
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -45,6 +45,7 @@ type User struct {
 	Username        string      `json:"username" validate:"required"`
 	Status          UserStatus  `json:"status"`
 	OrganizationIDs []uuid.UUID `json:"organization_ids"`
+	Roles           []Role      `json:"roles"`
 }
 
 type CreateFirstUserRequest struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -12,7 +12,7 @@ export interface AgentGitSSHKey {
   readonly private_key: string
 }
 
-// From codersdk/users.go:109:6
+// From codersdk/users.go:110:6
 export interface AuthMethods {
   readonly password: boolean
   readonly github: boolean
@@ -30,21 +30,21 @@ export interface BuildInfoResponse {
   readonly version: string
 }
 
-// From codersdk/users.go:50:6
+// From codersdk/users.go:51:6
 export interface CreateFirstUserRequest {
   readonly email: string
   readonly username: string
   readonly password: string
   readonly organization: string
 }
 
-// From codersdk/users.go:58:6
+// From codersdk/users.go:59:6
 export interface CreateFirstUserResponse {
   readonly user_id: string
   readonly organization_id: string
 }
 
-// From codersdk/users.go:104:6
+// From codersdk/users.go:105:6
 export interface CreateOrganizationRequest {
   readonly name: string
 }
@@ -77,7 +77,7 @@ export interface CreateTemplateVersionRequest {
   readonly parameter_values: CreateParameterRequest[]
 }
 
-// From codersdk/users.go:63:6
+// From codersdk/users.go:64:6
 export interface CreateUserRequest {
   readonly email: string
   readonly username: string
@@ -101,7 +101,7 @@ export interface CreateWorkspaceRequest {
   readonly parameter_values: CreateParameterRequest[]
 }
 
-// From codersdk/users.go:100:6
+// From codersdk/users.go:101:6
 export interface GenerateAPIKeyResponse {
   readonly key: string
 }
@@ -119,13 +119,13 @@ export interface GoogleInstanceIdentityToken {
   readonly json_web_token: string
 }
 
-// From codersdk/users.go:89:6
+// From codersdk/users.go:90:6
 export interface LoginWithPasswordRequest {
   readonly email: string
   readonly password: string
 }
 
-// From codersdk/users.go:95:6
+// From codersdk/users.go:96:6
 export interface LoginWithPasswordResponse {
   readonly session_token: string
 }
@@ -195,6 +195,12 @@ export interface ProvisionerJobLog {
   readonly output: string
 }
 
+// From codersdk/roles.go:13:6
+export interface Role {
+  readonly name: string
+  readonly display_name: string
+}
+
 // From codersdk/templates.go:17:6
 export interface Template {
   readonly id: string
@@ -255,17 +261,17 @@ export interface UpdateActiveTemplateVersion {
   readonly id: string
 }
 
-// From codersdk/users.go:79:6
+// From codersdk/users.go:80:6
 export interface UpdateRoles {
   readonly roles: string[]
 }
 
-// From codersdk/users.go:75:6
+// From codersdk/users.go:76:6
 export interface UpdateUserPasswordRequest {
   readonly password: string
 }
 
-// From codersdk/users.go:70:6
+// From codersdk/users.go:71:6
 export interface UpdateUserProfileRequest {
   readonly email: string
   readonly username: string
@@ -294,9 +300,10 @@ export interface User {
   readonly username: string
   readonly status: UserStatus
   readonly organization_ids: string[]
+  readonly roles: Role[]
 }
 
-// From codersdk/users.go:83:6
+// From codersdk/users.go:84:6
 export interface UserRoles {
   readonly roles: string[]
   readonly organization_roles: Record<string, string[]>

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ type User struct {`
`45`	`45`	Username string `json:"username" validate:"required"`
`46`	`46`	Status UserStatus `json:"status"`
`47`	`47`	OrganizationIDs []uuid.UUID `json:"organization_ids"`
	`48`	+ Roles []Role `json:"roles"`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`type CreateFirstUserRequest struct {`