Refactored scopes policy

Author: Tiago Brenck

4-WebApp-your-API/4-2-B2C/TodoListService/AuthorizationPolicies/OperationScopeHandler.cs renamed to 4-WebApp-your-API/4-2-B2C/TodoListService/AuthorizationPolicies/ScopesRequirement.cs

@@ -8,26 +8,34 @@
 
 namespace TodoListService.AuthorizationPolicies
 {
-    /// <summary>
-    /// AuthorizationHandler that will check if the scope claim has the requirement value
-    /// </summary>
-    public class OperationScopeHandler : AuthorizationHandler<OperationAuthorizationRequirement>
+    public class ScopesRequirement : AuthorizationHandler<ScopesRequirement>, IAuthorizationRequirement
     {
+        string[] _scopes;
+
+        public ScopesRequirement(params string[] scopes)
+        {
+            _scopes = scopes;
+        }
+
+        /// <summary>
+        /// AuthorizationHandler that will check if the scope claim has the requirement value
+        /// </summary>
         protected override Task HandleRequirementAsync(AuthorizationHandlerContext context,
-                                                       OperationAuthorizationRequirement requirement)
+                                                        ScopesRequirement requirement)
         {
+            // If there are no scopes, do not process
             if (!context.User.Claims.Any(x => x.Type == ClaimConstants.Scope)
-                   && !context.User.Claims.Any(y => y.Type == ClaimConstants.Scp))
+               && !context.User.Claims.Any(y => y.Type == ClaimConstants.Scp))
             {
                 return Task.CompletedTask;
             }
 
             Claim scopeClaim = context?.User?.FindFirst(ClaimConstants.Scp);
 
-            if(scopeClaim == null)
+            if (scopeClaim == null)
                 scopeClaim = context?.User?.FindFirst(ClaimConstants.Scope);
 
-            if (scopeClaim != null && scopeClaim.Value.Split(' ').Contains(requirement.Name))
+            if (scopeClaim != null && scopeClaim.Value.Split(' ').Intersect(requirement._scopes).Any())
             {
                 context.Succeed(requirement);
             }

4-WebApp-your-API/4-2-B2C/TodoListService/Startup.cs

@@ -46,11 +46,11 @@ public void ConfigureServices(IServiceCollection services)
             {
                 // Create policy to check for the scope 'read'
                 options.AddPolicy("ReadScope", 
-                    policy => policy.Requirements.Add(new OperationAuthorizationRequirement { Name = "read" }));
+                    policy => policy.Requirements.Add(new ScopesRequirement("read")));
             });
 
             // Registering an authorization handler that will check if the scope claim has the requirement specified by the policy
-            services.AddSingleton<IAuthorizationHandler, OperationScopeHandler>();
+            //services.AddSingleton<IAuthorizationHandler, ScopesRequirement>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.