clean up authorization handlers

4 years ago · c037d3536d
parent 39924f9992
commit c037d3536d
3 changed files with 13 additions and 9 deletions
--- a/Jellyfin.Api/Auth/DefaultAuthorizationPolicy/DefaultAuthorizationHandler.cs
+++ b/Jellyfin.Api/Auth/DefaultAuthorizationPolicy/DefaultAuthorizationHandler.cs
@ -29,13 +29,15 @@ namespace Jellyfin.Api.Auth.DefaultAuthorizationPolicy
        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, DefaultAuthorizationRequirement requirement)
        {
            var validated = ValidateClaims(context.User);
-            if (!validated)
+            if (validated)
+            {
+                context.Succeed(requirement);
+            }
+            else
            {
                context.Fail();
-                return Task.CompletedTask;
            }

-            context.Succeed(requirement);
            return Task.CompletedTask;
        }
    }
--- a/Jellyfin.Api/Auth/IgnoreParentalControlPolicy/IgnoreParentalControlHandler.cs
+++ b/Jellyfin.Api/Auth/IgnoreParentalControlPolicy/IgnoreParentalControlHandler.cs
@ -29,13 +29,15 @@ namespace Jellyfin.Api.Auth.IgnoreParentalControlPolicy
        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, IgnoreParentalControlRequirement requirement)
        {
            var validated = ValidateClaims(context.User, ignoreSchedule: true);
-            if (!validated)
+            if (validated)
+            {
+                context.Succeed(requirement);
+            }
+            else
            {
                context.Fail();
-                return Task.CompletedTask;
            }

-            context.Succeed(requirement);
            return Task.CompletedTask;
        }
    }
--- a/Jellyfin.Api/Auth/LocalAccessPolicy/LocalAccessHandler.cs
+++ b/Jellyfin.Api/Auth/LocalAccessPolicy/LocalAccessHandler.cs
@ -29,13 +29,13 @@ namespace Jellyfin.Api.Auth.LocalAccessPolicy
        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, LocalAccessRequirement requirement)
        {
            var validated = ValidateClaims(context.User, localAccessOnly: true);
-            if (!validated)
+            if (validated)
            {
-                context.Fail();
+                context.Succeed(requirement);
            }
            else
            {
-                context.Succeed(requirement);
+                context.Fail();
            }

            return Task.CompletedTask;