diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs index f07dc8a361..af39991783 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs @@ -35,16 +35,22 @@ namespace Volo.Docs.Projects { var projects = await _projectRepository.GetListAsync(); - return new ListResultDto( + var projectDtos = new List( ObjectMapper.Map, List>(projects) ); + + return new ListResultDto( + projectDtos.Select(p => HidePrivateProperties(p)).ToList() + ); } public async Task GetAsync(string shortName) { var project = await _projectRepository.GetByShortNameAsync(shortName); - return ObjectMapper.Map(project); + var projectDto = ObjectMapper.Map(project); + + return HidePrivateProperties(projectDto); } public async Task> GetVersionsAsync(string shortName) @@ -140,5 +146,21 @@ namespace Volo.Docs.Projects ? (GithubVersionProviderSource) (long) project.ExtraProperties["GithubVersionProviderSource"] : GithubVersionProviderSource.Releases; } + + private ProjectDto HidePrivateProperties(ProjectDto project) + { + if (project.ExtraProperties.ContainsKey("GitHubAccessToken")) + { + project.ExtraProperties["GitHubAccessToken"] = null; + } + + if (project.ExtraProperties.ContainsKey("GitHubUserAgent")) + { + project.ExtraProperties["GitHubUserAgent"] = null; + } + + + return project; + } } } diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs index 26b5fc5d41..4e75eed45f 100644 --- a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs +++ b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp; using Volo.Abp.Application.Dtos; @@ -24,25 +22,16 @@ namespace Volo.Docs.Projects [HttpGet] [Route("")] - public virtual async Task> GetListAsync() + public virtual Task> GetListAsync() { - var projects = await ProjectAppService.GetListAsync(); - projects.Items = projects.Items.Select(project => - { - project.ExtraProperties = new Dictionary(); - return project; - }).ToList(); - - return projects; + return ProjectAppService.GetListAsync(); } [HttpGet] [Route("{shortName}")] - public virtual async Task GetAsync(string shortName) + public virtual Task GetAsync(string shortName) { - var project = await ProjectAppService.GetAsync(shortName); - project.ExtraProperties = new Dictionary(); - return project; + return ProjectAppService.GetAsync(shortName); } [HttpGet]