m

Author: Laurie T. Malau

components/public-api-server/pkg/apiv1/tokens.go

@@ -83,9 +83,9 @@ func (s *TokensService) GetPersonalAccessToken(ctx context.Context, req *connect
 	}
 
 	return connect.NewResponse(&v1.GetPersonalAccessTokenResponse{Token: &v1.PersonalAccessToken{
-		Id:             response.Id,
+		Id:             response.ID,
 		Hash:           response.Hash,
-		Name:           response.Hash,
+		Name:           response.Name,
 		Description:    response.Description,
 		ExpirationTime: timestamppb.New(response.ExpirationTime),
 		Scopes:         response.Scopes,

components/public-api-server/pkg/apiv1/tokens_test.go

@@ -100,15 +100,15 @@ func TestTokensService_GetPersonalAccessToken(t *testing.T) {
 	})
 
 	t.Run("invalid argument when Token ID is empty", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.GetPersonalAccessToken(context.Background(), connect.NewRequest(&v1.GetPersonalAccessTokenRequest{}))
 
 		require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))
 	})
 
 	t.Run("invalid argument when Token ID is not a valid UUID", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.GetPersonalAccessToken(context.Background(), connect.NewRequest(&v1.GetPersonalAccessTokenRequest{
 			Id: "foo-bar",
@@ -172,15 +172,15 @@ func TestTokensService_RegeneratePersonalAccessToken(t *testing.T) {
 	})
 
 	t.Run("invalid argument when Token ID is empty", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.RegeneratePersonalAccessToken(context.Background(), connect.NewRequest(&v1.RegeneratePersonalAccessTokenRequest{}))
 
 		require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))
 	})
 
 	t.Run("invalid argument when Token ID is not a valid UUID", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.RegeneratePersonalAccessToken(context.Background(), connect.NewRequest(&v1.RegeneratePersonalAccessTokenRequest{
 			Id: "foo-bar",
@@ -221,15 +221,15 @@ func TestTokensService_UpdatePersonalAccessToken(t *testing.T) {
 	})
 
 	t.Run("invalid argument when Token ID is empty", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.UpdatePersonalAccessToken(context.Background(), connect.NewRequest(&v1.UpdatePersonalAccessTokenRequest{}))
 
 		require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))
 	})
 
 	t.Run("invalid argument when Token ID is not a valid UUID", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.UpdatePersonalAccessToken(context.Background(), connect.NewRequest(&v1.UpdatePersonalAccessTokenRequest{
 			Token: &v1.PersonalAccessToken{
@@ -272,15 +272,15 @@ func TestTokensService_DeletePersonalAccessToken(t *testing.T) {
 	})
 
 	t.Run("invalid argument when Token ID is empty", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.DeletePersonalAccessToken(context.Background(), connect.NewRequest(&v1.DeletePersonalAccessTokenRequest{}))
 
 		require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))
 	})
 
 	t.Run("invalid argument when Token ID is not a valid UUID", func(t *testing.T) {
-		_, client := setupTokensService(t, withTokenFeatureEnabled)
+		_, _, client := setupTokensService(t, withTokenFeatureEnabled)
 
 		_, err := client.DeletePersonalAccessToken(context.Background(), connect.NewRequest(&v1.DeletePersonalAccessTokenRequest{
 			Id: "foo-bar",