Merge pull request #108 from leancodepl/fix/generic-authorize-when

Handle generic `AuthorizeWhenAttribute`

Author: jakubfijalkowski

examples/attributes/authorize_when.cs

@@ -0,0 +1,17 @@
+using LeanCode.Contracts;
+using LeanCode.Contracts.Security;
+
+[AuthorizeWhenCustomCtor]
+public class A : ICommand { }
+
+[AuthorizeWhenCustomGeneric]
+public class B : ICommand { }
+
+public class AuthorizeWhenCustomCtorAttribute : AuthorizeWhenAttribute
+{
+    public AuthorizeWhenCustomCtorAttribute()
+        : base(typeof(A))
+    { }
+}
+
+public class AuthorizeWhenCustomGenericAttribute : AuthorizeWhenAttribute<B> { }

src/LeanCode.ContractsGenerator.Tests/ExampleBased/Attributes.cs

@@ -58,4 +58,19 @@ public void AllowUnauthorized_attribute_is_correctly_propagated()
             .WithCommand("A")
                 .WithAttribute("LeanCode.Contracts.Security.AllowUnauthorizedAttribute");
     }
+
+    [Fact]
+    public void AuthorizeWhen_attribute_is_correctly_propagated()
+    {
+        "attributes/authorize_when.cs"
+            .Compiles()
+            .WithCommand("A")
+                .WithAttribute("AuthorizeWhenCustomCtorAttribute")
+            .WithCommand("B")
+                .WithAttribute("AuthorizeWhenCustomGenericAttribute")
+            .WithDto("AuthorizeWhenCustomCtorAttribute")
+                .ThatExtends(Known(KnownType.AuthorizeWhenAttribute))
+            .WithDto("AuthorizeWhenCustomGenericAttribute")
+                .ThatExtends(Known(KnownType.AuthorizeWhenAttribute));
+    }
 }

src/LeanCode.ContractsGenerator/Compilation/ContractTypes.cs

@@ -14,6 +14,7 @@ public sealed class ContractTypes
     private HashSet<INamedTypeSymbol> OperationType { get; }
 
     private HashSet<INamedTypeSymbol> AuthorizeWhenAttribute { get; }
+    private HashSet<INamedTypeSymbol> GenericAuthorizeWhenAttribute { get; }
     private HashSet<INamedTypeSymbol> AuthorizeWhenHasAnyOfAttribute { get; }
     private HashSet<INamedTypeSymbol> QueryCacheAttribute { get; }
 
@@ -31,6 +32,7 @@ public ContractTypes(IReadOnlyCollection<CSharpCompilation> compilations)
         OperationType = GetUnboundTypeSymbols(compilations, typeof(IOperation<>));
 
         AuthorizeWhenAttribute = GetTypeSymbols<AuthorizeWhenAttribute>(compilations);
+        GenericAuthorizeWhenAttribute = GetUnboundTypeSymbols(compilations, typeof(AuthorizeWhenAttribute<>));
         AuthorizeWhenHasAnyOfAttribute = GetTypeSymbols<AuthorizeWhenHasAnyOfAttribute>(compilations);
         QueryCacheAttribute = GetTypeSymbols<QueryCacheAttribute>(compilations);
         ExcludeFromContractsGenerationAttribute = GetTypeSymbols<ExcludeFromContractsGenerationAttribute>(compilations);
@@ -150,7 +152,7 @@ public bool IsOperationType(ITypeSymbol i) =>
         i is INamedTypeSymbol ns && ns.IsGenericType && OperationType.Contains(ns.ConstructUnboundGenericType());
 
     public bool IsAuthorizeWhenType(ITypeSymbol i) =>
-        AuthorizeWhenAttribute.Contains(i);
+        AuthorizeWhenAttribute.Contains(i) || (i is INamedTypeSymbol ns && ns.IsGenericType && GenericAuthorizeWhenAttribute.Contains(ns.ConstructUnboundGenericType()));
 
     public bool IsAuthorizeWhenHasAnyOfType(ITypeSymbol i) =>
         AuthorizeWhenHasAnyOfAttribute.Contains(i);