Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize hide abp end points #17151

Merged
merged 7 commits into from
Jul 20, 2023
Merged

Optimize hide abp end points #17151

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ffb6f3
Improved display for Floating Labels
masoodkhoshgard Jul 17, 2023
b9dca3f
Update AbpInputTagHelperService.cs
masoodkhoshgard Jul 18, 2023
ccd0469
Merge branch 'abpframework:dev' into dev
masoodkhoshgard Jul 18, 2023
f0d9b45
Merge branch 'abpframework:dev' into dev
masoodkhoshgard Jul 19, 2023
f6be757
Optimize HideAbpEndpoints for dont show Unused Schema
masoodkhoshgard Jul 19, 2023
1332be6
Merge branch 'abpframework:dev' into Optimize-HideAbpEndPoints
masoodkhoshgard Jul 20, 2023
8b6a375
revert Improved display for Floating Labels
masoodkhoshgard Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 48 additions & 3 deletions framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/AbpSwashbuckleDocumentFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class AbpSwashbuckleDocumentFilter : IDocumentFilter
protected virtual string[] ActionUrlPrefixes { get; set; } = new[] { "Volo." };

protected virtual string RegexConstraintPattern => @":regex\(([^()]*)\)";

public virtual void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
{
var actionUrls = context.ApiDescriptions
Expand All @@ -28,8 +28,29 @@ public virtual void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext cont
swaggerDoc
.Paths
.RemoveAll(path => !actionUrls.Contains(path.Key));

var actionSchemas = new HashSet<string>();
actionSchemas.UnionWith(swaggerDoc.Paths.Select(path => new { path = path.Value, schemas = swaggerDoc.Components.Schemas }).SelectMany(x => GetSchemaIdList(x.path, x.schemas)));

swaggerDoc.Components.Schemas.RemoveAll(schema => !actionSchemas.Contains(schema.Key));
}

protected virtual HashSet<string> GetSchemaIdList(OpenApiPathItem pathItem, IDictionary<string, OpenApiSchema> schemas)
{
var selectedSchemas = new HashSet<OpenApiSchema>();
var schemaIds = new HashSet<string>();

selectedSchemas.UnionWith(pathItem.Parameters.Select(parameter => parameter.Schema));
selectedSchemas.UnionWith(pathItem.Parameters.SelectMany(parameter => parameter.Content.Select(x => x.Value.Schema)));
selectedSchemas.UnionWith(pathItem.Operations.Values.SelectMany(c => c.Responses.SelectMany(x => x.Value.Content.Values.Select(x => x.Schema))));
selectedSchemas.UnionWith(pathItem.Operations.Values.SelectMany(c => c.Parameters.Select(x => x.Schema)));

foreach (var schema in selectedSchemas)
{
schemaIds.UnionWith(MakeListSchemaId(schema, schemas));
}
return schemaIds;
}
protected virtual string? RemoveRouteParameterConstraints(ActionDescriptor actionDescriptor)
{
var route = actionDescriptor.AttributeRouteInfo?.Template?.EnsureStartsWith('/').Replace("?", "");
Expand All @@ -49,10 +70,34 @@ public virtual void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext cont
{
break;
}
route = route.Remove(startIndex, (endIndex - startIndex));

route = route.Remove(startIndex, endIndex - startIndex);
}

return route;
}

private HashSet<string> MakeListSchemaId(OpenApiSchema schema, IDictionary<string, OpenApiSchema> contextSchemas)
{
var schemasId = new HashSet<string>();
if (schema != null)
{
if (schema.Reference != null)
{
schemasId.Add(schema.Reference.Id);
foreach (var sc in contextSchemas.Where(x => x.Key == schema.Reference.Id).Select(x => x.Value))
{
foreach (var property in sc.Properties.Values)
{
schemasId.UnionWith(MakeListSchemaId(property, contextSchemas));
}
}
}
if (schema.Items != null)
{
schemasId.UnionWith(MakeListSchemaId(schema.Items, contextSchemas));
}
}
return schemasId;
}
}
Loading