Browse Source

Merge pull request #11788 from abpframework/auto-merge/rel-5-1/892

Merge branch dev with rel-5.1
pull/11797/head
Yunus Emre Kalkan 5 years ago
committed by GitHub
parent
commit
dbf2495be8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 26
      modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs

26
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<ProjectDto>(
var projectDtos = new List<ProjectDto>(
ObjectMapper.Map<List<Project>, List<ProjectDto>>(projects)
);
return new ListResultDto<ProjectDto>(
projectDtos.Select(p => HidePrivateProperties(p)).ToList()
);
}
public async Task<ProjectDto> GetAsync(string shortName)
{
var project = await _projectRepository.GetByShortNameAsync(shortName);
return ObjectMapper.Map<Project, ProjectDto>(project);
var projectDto = ObjectMapper.Map<Project, ProjectDto>(project);
return HidePrivateProperties(projectDto);
}
public async Task<ListResultDto<VersionInfoDto>> 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;
}
}
}

Loading…
Cancel
Save