More fixes for ChilliCream#624, now on the .net classic part of the code

eduleite · Mar 11, 2019 · f58512f · f58512f
1 parent 9092124
commit f58512f
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/Server/AspNetCore.Authorization/AuthorizeDirective.cs b/src/Server/AspNetCore.Authorization/AuthorizeDirective.cs
@@ -53,13 +53,21 @@ public AuthorizeDirective(
                 ArgumentNode rolesArgument = node.Arguments
                     .FirstOrDefault(t => t.Name.Value == "roles");
 
-                Roles = (rolesArgument != null
-                    && rolesArgument.Value is ListValueNode lv)
-                    ? lv.Items.OfType<StringValueNode>()
-                        .Select(t => t.Value?.Trim())
-                        .Where(s => !string.IsNullOrEmpty(s))
-                        .ToArray()
-                    : Array.Empty<string>();
+                Roles = Array.Empty<string>();
+                if (rolesArgument != null)
+                {
+                    if (rolesArgument.Value is ListValueNode lv)
+                    {
+                        Roles = lv.Items.OfType<StringValueNode>()
+                            .Select(t => t.Value?.Trim())
+                            .Where(s => !string.IsNullOrEmpty(s))
+                            .ToArray();
+                    }
+                    else if (rolesArgument.Value is StringValueNode svn)
+                    {
+                        Roles = new[] { svn.Value };
+                    }
+                }
             }
         }