Fix #12

unchase · Jul 28, 2020 · a3d1193 · a3d1193
1 parent ece9b53
commit a3d1193
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@
 
 These are the changes to each version that has been released on the [nuget](https://www.nuget.org/packages/Unchase.Swashbuckle.AspNetCore.Extensions/).
 
+## v2.3.9 `(2020-07-11)`
+
+- [x] Update nuget dependencies for sample WebAPI
+- [x] Fix [issue #12](https://github.com/unchase/Unchase.Swashbuckle.AspNetCore.Extensions/issues/12)
+
 ## v2.3.8 `(2020-07-06)`
 
 - [x] Fix bug with missed required definitions in `HidePathsAndDefinitionsByRolesDocumentFilter`

diff --git a/src/Unchase.Swashbuckle.AspNetCore.Extensions/Extensions/EnumTypeExtensions.cs b/src/Unchase.Swashbuckle.AspNetCore.Extensions/Extensions/EnumTypeExtensions.cs
@@ -44,7 +44,7 @@ private static string GetFieldAttributeDescription(this Type enumType, object en
             if (!enumType.IsEnum)
                 return string.Empty;
             var memInfo = enumType.GetMember(enumField.ToString());
-            var attributes = memInfo[0].GetCustomAttributes(typeof(DescriptionAttribute), false);
+            var attributes = memInfo[0].GetCustomAttributes(typeof(DescriptionAttribute), true);
             if (attributes.Length > 0)
                 return (attributes[attributeNumber] as DescriptionAttribute)?.Description ?? string.Empty;
             return string.Empty;

diff --git a/src/Unchase.Swashbuckle.AspNetCore.Extensions/Factories/ApiDescriptionFactory.cs b/src/Unchase.Swashbuckle.AspNetCore.Extensions/Factories/ApiDescriptionFactory.cs
@@ -44,7 +44,7 @@ internal static ApiDescription Create(
 
             var actionDescriptor = CreateActionDescriptor(methodInfo);
 
-            var routAttr = controllerType.GetCustomAttributes().OfType<RouteAttribute>().LastOrDefault();
+            var routAttr = controllerType.GetCustomAttributes(true).OfType<RouteAttribute>().LastOrDefault();
 
             if (string.IsNullOrWhiteSpace(actionDescriptor?.AttributeRouteInfo?.Template))
                 return null;
@@ -62,7 +62,7 @@ internal static ApiDescription Create(
                     actionDescriptor.AttributeRouteInfo.Template.Replace($"[{routeValue.Key}]", routeValue.Value);
             }
 
-            httpMethod = httpMethod ?? methodInfo?.GetCustomAttributes().OfType<HttpMethodAttribute>().FirstOrDefault()?.HttpMethods?.FirstOrDefault();
+            httpMethod = httpMethod ?? methodInfo?.GetCustomAttributes(true).OfType<HttpMethodAttribute>().FirstOrDefault()?.HttpMethods?.FirstOrDefault();
 
             var apiDescription = new ApiDescription
             {

diff --git a/...Swashbuckle.AspNetCore.Extensions/Filters/HidePathsAndDefinitionsByRolesDocumentFilter.cs b/...Swashbuckle.AspNetCore.Extensions/Filters/HidePathsAndDefinitionsByRolesDocumentFilter.cs
@@ -169,7 +169,7 @@ internal static void RemovePathsAndComponents(
 
             foreach (var path in paths)
             {
-                var authorizeAttributes = path.Key.ActionMethodInfo.GetCustomAttributes<AuthorizeAttribute>(false);
+                var authorizeAttributes = path.Key.ActionMethodInfo.GetCustomAttributes<AuthorizeAttribute>(true);
                 foreach (var authorizeAttribute in authorizeAttributes)
                 {
                     var authorizeAttributeRoles = authorizeAttribute?.Roles?.Split(',').Select(r => r.Trim()).ToList();
@@ -180,7 +180,7 @@ internal static void RemovePathsAndComponents(
                     }
                 }
 
-                var controllerAuthorizeAttributes = path.Key.ControllerType.GetCustomAttributes<AuthorizeAttribute>(false);
+                var controllerAuthorizeAttributes = path.Key.ControllerType.GetCustomAttributes<AuthorizeAttribute>(true);
                 foreach (var controllerAuthorizeAttribute in controllerAuthorizeAttributes)
                 {
                     var authorizeAttributeRoles = controllerAuthorizeAttribute?.Roles?.Split(',').Select(r => r.Trim()).ToList();

diff --git a/...nchase.Swashbuckle.AspNetCore.Extensions/Unchase.Swashbuckle.AspNetCore.Extensions.csproj b/...nchase.Swashbuckle.AspNetCore.Extensions/Unchase.Swashbuckle.AspNetCore.Extensions.csproj
@@ -14,9 +14,9 @@
     <NeutralLanguage></NeutralLanguage>
     <LangVersion>7.3</LangVersion>
     <PackageIconUrl>https://github.com/unchase/Unchase.Swashbuckle.AspNetCore.Extensions/blob/master/assets/icon.png?raw=true</PackageIconUrl>
-    <Version>2.3.8</Version>
-    <AssemblyVersion>2.3.8.0</AssemblyVersion>
-    <FileVersion>2.3.8.0</FileVersion>
+    <Version>2.3.9</Version>
+    <AssemblyVersion>2.3.9.0</AssemblyVersion>
+    <FileVersion>2.3.9.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DocumentationFile>Unchase.Swashbuckle.AspNetCore.Extensions.xml</DocumentationFile>
   </PropertyGroup>

diff --git a/test/WebApi3.1-Swashbuckle/WebApi3.1-Swashbuckle.csproj b/test/WebApi3.1-Swashbuckle/WebApi3.1-Swashbuckle.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
   </ItemGroup>
 
   <ItemGroup>