Service Accounts: Polish service account detail page (#45846)

* ServiceAccounts: add teams to service account DTO

* ServiceAccounts: Add team display to service accounts

* ServiceAccounts: add AC metadata to detail route

* ServiceAccounts: add role picker to detail page

* ServiceAccounts: Add role to profile DTO

* ServiceAccounts: remove wip mention of created by

pkg/services/serviceaccounts/api/api.go

@@ -197,8 +197,10 @@ func (api *ServiceAccountsAPI) RetrieveServiceAccount(ctx *models.ReqContext) re
 		}
 	}
 
+	saIDString := strconv.FormatInt(serviceAccount.Id, 10)
+	metadata := api.getAccessControlMetadata(ctx, map[string]bool{saIDString: true})
 	serviceAccount.AvatarUrl = dtos.GetGravatarUrlWithDefault("", serviceAccount.Name)
-
+	serviceAccount.AccessControl = metadata[saIDString]
 	return response.JSON(http.StatusOK, serviceAccount)
 }
 

pkg/services/serviceaccounts/database/database.go

@@ -178,6 +178,18 @@ func (s *ServiceAccountsStoreImpl) RetrieveServiceAccount(ctx context.Context, o
 		return nil, serviceaccounts.ErrServiceAccountNotFound
 	}
 
+	// Get Teams of service account. Can be optimized by combining with the query above
+	// in refactor
+	getTeamQuery := models.GetTeamsByUserQuery{UserId: serviceAccountID, OrgId: orgID}
+	if err := s.sqlStore.GetTeamsByUser(ctx, &getTeamQuery); err != nil {
+		return nil, err
+	}
+	teams := make([]string, len(getTeamQuery.Result))
+
+	for i := range getTeamQuery.Result {
+		teams[i] = getTeamQuery.Result[i].Name
+	}
+
 	saProfile := &serviceaccounts.ServiceAccountProfileDTO{
 		Id:        query.Result[0].UserId,
 		Name:      query.Result[0].Name,
@@ -185,6 +197,8 @@ func (s *ServiceAccountsStoreImpl) RetrieveServiceAccount(ctx context.Context, o
 		OrgId:     query.Result[0].OrgId,
 		UpdatedAt: query.Result[0].Updated,
 		CreatedAt: query.Result[0].Created,
+		Role:      query.Result[0].Role,
+		Teams:     teams,
 	}
 	return saProfile, nil
 }

pkg/services/serviceaccounts/database/database_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
@@ -76,7 +77,25 @@ func TestStore_RetrieveServiceAccount(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				require.Equal(t, c.user.Login, dto.Login)
+				require.Len(t, dto.Teams, 0)
 			}
 		})
 	}
 }
+func TestStore_RetrieveServiceAccountWithTeams(t *testing.T) {
+	userToCreate := tests.TestUser{Login: "servicetestwithTeam@admin", IsServiceAccount: true}
+	db, store := setupTestDatabase(t)
+	user := tests.SetupUserServiceAccount(t, db, userToCreate)
+
+	team, err := store.sqlStore.CreateTeam("serviceTeam", "serviceTeam", user.OrgId)
+	require.NoError(t, err)
+
+	err = store.sqlStore.AddTeamMember(user.Id, user.OrgId, team.Id, false, models.PERMISSION_VIEW)
+	require.NoError(t, err)
+
+	dto, err := store.RetrieveServiceAccount(context.Background(), user.OrgId, user.Id)
+	require.NoError(t, err)
+	require.Equal(t, userToCreate.Login, dto.Login)
+	require.Len(t, dto.Teams, 1)
+	require.Equal(t, "serviceTeam", dto.Teams[0])
+}

pkg/services/serviceaccounts/models.go

@@ -53,5 +53,7 @@ type ServiceAccountProfileDTO struct {
 	UpdatedAt     time.Time       `json:"updatedAt"`
 	CreatedAt     time.Time       `json:"createdAt"`
 	AvatarUrl     string          `json:"avatarUrl"`
+	Role          string          `json:"role"`
+	Teams         []string        `json:"teams"`
 	AccessControl map[string]bool `json:"accessControl,omitempty"`
 }