Authorization Refinements (#814)

ChilliCream · Jun 3, 2019 · e36ec3b · e36ec3b
1 parent 1c4548a
commit e36ec3b
Show file tree

Hide file tree

Showing 12 changed files with 361 additions and 56 deletions.
diff --git a/src/Server/AspNetCore.Authorization/AuthorizeDirective.cs b/src/Server/AspNetCore.Authorization/AuthorizeDirective.cs
@@ -84,15 +84,8 @@ public AuthorizeDirective(
             string policy,
             IReadOnlyCollection<string> roles)
         {
-            if (string.IsNullOrEmpty(policy)
-                && (roles == null || roles.Count == 0))
-            {
-                throw new ArgumentException(
-                    "Either policy or roles has to be set.");
-            }
-
             Policy = policy;
-            Roles = (IReadOnlyCollection<string>)roles ?? Array.Empty<string>();
+            Roles = roles ?? Array.Empty<string>();
         }
 
         public AuthorizeDirective(

diff --git a/...zation/ObjectFieldDescriptorExtensions.cs → ...thorizeObjectFieldDescriptorExtensions.cs b/...zation/ObjectFieldDescriptorExtensions.cs → ...thorizeObjectFieldDescriptorExtensions.cs
@@ -8,7 +8,7 @@
 
 namespace HotChocolate.Types
 {
-    public static class ObjectFieldDescriptorExtensions
+    public static class AuthorizeObjectFieldDescriptorExtensions
     {
         public static IObjectFieldDescriptor Authorize(
             this IObjectFieldDescriptor self,
@@ -23,6 +23,17 @@ public static IObjectFieldDescriptor Authorize(
         }
 
 #if !ASPNETCLASSIC
+        public static IObjectFieldDescriptor Authorize(
+            this IObjectFieldDescriptor self)
+        {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+
+            return self.Directive(new AuthorizeDirective());
+        }
+
         public static IObjectFieldDescriptor Authorize(
             this IObjectFieldDescriptor self,
             string policy)

diff --git a/...ization/ObjectTypeDescriptorExtensions.cs → ...uthorizeObjectTypeDescriptorExtensions.cs b/...ization/ObjectTypeDescriptorExtensions.cs → ...uthorizeObjectTypeDescriptorExtensions.cs
@@ -8,7 +8,7 @@
 
 namespace HotChocolate.Types
 {
-    public static class ObjectTypeDescriptorExtensions
+    public static class AuthorizeObjectTypeDescriptorExtensions
     {
         public static IObjectTypeDescriptor Authorize(
             this IObjectTypeDescriptor self,
@@ -23,6 +23,17 @@ public static IObjectTypeDescriptor Authorize(
         }
 
 #if !ASPNETCLASSIC
+        public static IObjectTypeDescriptor Authorize(
+            this IObjectTypeDescriptor self)
+        {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+
+            return self.Directive(new AuthorizeDirective());
+        }
+
         public static IObjectTypeDescriptor Authorize(
             this IObjectTypeDescriptor self,
             string policy)