fix: api.v2.user_service.ListUserAccessTokens limit length after sort

doreamon-design · Apr 7, 2024 · d2e6bb0 · d2e6bb0
1 parent 210a0ef
commit d2e6bb0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/server/route/api/v2/user_service.go b/server/route/api/v2/user_service.go
@@ -350,11 +350,6 @@ func (s *APIV2Service) ListUserAccessTokens(ctx context.Context, request *apiv2p
 		return nil, status.Errorf(codes.Internal, "failed to list access tokens: %v", err)
 	}
 
-	// limit only the first 200 access tokens.
-	if len(userAccessTokens) > 200 {
-		userAccessTokens = userAccessTokens[:200]
-	}
-
 	accessTokens := []*apiv2pb.UserAccessToken{}
 	for _, userAccessToken := range userAccessTokens {
 		claims := &auth.ClaimsMessage{}
@@ -389,6 +384,12 @@ func (s *APIV2Service) ListUserAccessTokens(ctx context.Context, request *apiv2p
 	slices.SortFunc(accessTokens, func(i, j *apiv2pb.UserAccessToken) int {
 		return int(i.IssuedAt.Seconds - j.IssuedAt.Seconds)
 	})
+
+	// limit only the first 200 access tokens.
+	if len(userAccessTokens) > 200 {
+		userAccessTokens = userAccessTokens[:200]
+	}
+
 	response := &apiv2pb.ListUserAccessTokensResponse{
 		AccessTokens: accessTokens,
 	}