UAuthStateView Enhancement

Author: mckaragoz

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Dialogs/PermissionDialog.razor

@@ -109,15 +109,20 @@
             Permissions = permissions
         };
 
-        var res = await UAuthClient.Authorization.SetPermissionsAsync(Role.Id, req);
+        var result = await UAuthClient.Authorization.SetPermissionsAsync(Role.Id, req);
 
-        if (!res.IsSuccess)
+        if (!result.IsSuccess)
         {
-            Snackbar.Add(res.Problem?.Title ?? "Failed to update permissions", Severity.Error);
+            Snackbar.Add(result.Problem?.Detail ?? result.Problem?.Title ?? "Failed to update permissions", Severity.Error);
             return;
         }
 
-        Role = (await UAuthClient.Authorization.QueryRolesAsync(new RoleQuery() { Search = Role.Name })).Value!.Items.First();
+        var result2 = await UAuthClient.Authorization.QueryRolesAsync(new RoleQuery() { Search = Role.Name });
+        if (result2.Value?.Items is not null)
+        {
+            Role = result2.Value.Items.First();
+        }
+        
         Snackbar.Add("Permissions updated", Severity.Success);
         RefreshUI();
     }

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Dialogs/RoleDialog.razor

@@ -13,7 +13,7 @@
 
     <DialogContent>
         <MudDataGrid @ref="_grid" T="RoleInfo" ServerData="LoadServerData" Hover="true" Dense="true" Bordered="true" Striped="true"
-                     EditMode="DataGridEditMode.Form" CommittedItemChanges="CommittedItemChanges" Loading="_loading">
+                     EditMode="DataGridEditMode.Form" CommittedItemChanges="CommittedItemChanges" Loading="_loading" ReadOnly="false">
 
             <ToolBarContent>
                 <MudStack Class="mud-width-full" Row="true" AlignItems="AlignItems.Center" Justify="Justify.Center">
@@ -83,7 +83,6 @@
 @code {
     private MudDataGrid<RoleInfo>? _grid;
     private bool _loading;
-    private bool _reloadQueued;
     private string? _newRoleName;
 
     [CascadingParameter]
@@ -219,10 +218,13 @@
 
     private async Task ReloadAsync()
     {
+        _loading = true;
+        await Task.Delay(300);
         if (_grid is null)
             return;
 
         await _grid.ReloadServerData();
+        _loading = false;
     }
 
     private int GetPermissionCount(RoleInfo role)

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/Home.razor

@@ -9,6 +9,7 @@
 @inject IDialogService DialogService
 @using System.Security.Claims
 @using CodeBeam.UltimateAuth.Core.Contracts
+@using CodeBeam.UltimateAuth.Core.Defaults
 @using CodeBeam.UltimateAuth.Sample.BlazorServer.Components.Custom
 
 @if (AuthState?.Identity?.UserStatus == UserStatus.SelfSuspended)

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/Home.razor.cs

@@ -217,6 +217,18 @@ private async Task SetAccountActiveAsync()
         }
     }
 
+    private string? _roles = "Admin";
+    private void RefreshHiddenState()
+    {
+        if (_roles == "Admin")
+        {
+            _roles = "User";
+            return;
+        }
+
+        _roles = "Admin";
+    }
+
     public override void Dispose()
     {
         base.Dispose();

samples/blazor-server/CodeBeam.UltimateAuth.Sample.BlazorServer/Components/Pages/LandingPage.razor.cs

@@ -1,4 +1,4 @@
-using CodeBeam.UltimateAuth.Core.Constants;
+using CodeBeam.UltimateAuth.Core.Defaults;
 
 namespace CodeBeam.UltimateAuth.Sample.BlazorServer.Components.Pages;
 

src/CodeBeam.UltimateAuth.Client/AuthState/UAuthState.cs

@@ -1,4 +1,6 @@
-using CodeBeam.UltimateAuth.Core.Contracts;
+using CodeBeam.UltimateAuth.Authorization.Contracts;
+using CodeBeam.UltimateAuth.Core.Contracts;
+using CodeBeam.UltimateAuth.Core.Defaults;
 using CodeBeam.UltimateAuth.Core.Domain;
 using CodeBeam.UltimateAuth.Core.Extensions;
 using CodeBeam.UltimateAuth.Users.Contracts;
@@ -40,6 +42,8 @@ internal void ApplySnapshot(AuthStateSnapshot snapshot, DateTimeOffset validated
         Identity = snapshot.Identity;
         Claims = snapshot.Claims;
 
+        _compiledPermissions = new CompiledPermissionSet(Claims.Permissions.Select(Permission.From));
+
         IsStale = false;
         LastValidatedAt = validatedAt;
 
@@ -114,7 +118,28 @@ internal void Clear()
 
     public bool IsInRole(string role) => IsAuthenticated && Claims.IsInRole(role);
 
-    public bool HasPermission(string permission) => IsAuthenticated && Claims.HasPermission(permission);
+    private CompiledPermissionSet? _compiledPermissions;
+    public bool HasPermission(string permission)
+    {
+        if (!IsAuthenticated)
+            return false;
+
+        if (Claims.HasPermission(permission))
+            return true;
+
+        return _compiledPermissions?.IsAllowed(permission) == true;
+    }
+
+    public bool HasAnyPermission(params string[] permissions)
+    {
+        foreach (var perm in permissions)
+        {
+            if (HasPermission(perm))
+                return true;
+        }
+
+        return false;
+    }
 
     public bool HasClaim(string type, string value) => IsAuthenticated && Claims.HasValue(type, value);
 
@@ -123,7 +148,7 @@ internal void Clear()
     /// <summary>
     /// Creates a ClaimsPrincipal view for ASP.NET / Blazor integration.
     /// </summary>
-    public ClaimsPrincipal ToClaimsPrincipal(string authenticationType = "UltimateAuth")
+    public ClaimsPrincipal ToClaimsPrincipal(string authenticationType = UAuthConstants.SchemeDefaults.GlobalScheme)
     {
         if (!IsAuthenticated || Identity is null)
             return new ClaimsPrincipal(new ClaimsIdentity());

src/CodeBeam.UltimateAuth.Client/Components/UALoginDispatch.razor

@@ -1,7 +1,7 @@
 @page "/__uauth/login-redirect"
 
 @namespace CodeBeam.UltimateAuth.Client
-@using CodeBeam.UltimateAuth.Core.Constants
+@using CodeBeam.UltimateAuth.Core.Defaults
 @using Microsoft.AspNetCore.WebUtilities
 @inject NavigationManager Nav
 

src/CodeBeam.UltimateAuth.Client/Components/UAuthLoginForm.razor

@@ -4,7 +4,7 @@
 @using CodeBeam.UltimateAuth.Client.Device
 @using CodeBeam.UltimateAuth.Client.Options
 @using CodeBeam.UltimateAuth.Core.Abstractions
-@using CodeBeam.UltimateAuth.Core.Constants
+@using CodeBeam.UltimateAuth.Core.Defaults
 @using CodeBeam.UltimateAuth.Core.Contracts
 @using CodeBeam.UltimateAuth.Core.Options
 @using Microsoft.Extensions.Options

src/CodeBeam.UltimateAuth.Client/Components/UAuthLoginForm.razor.cs

@@ -1,7 +1,7 @@
 using CodeBeam.UltimateAuth.Client.Infrastructure;
 using CodeBeam.UltimateAuth.Core.Abstractions;
-using CodeBeam.UltimateAuth.Core.Constants;
 using CodeBeam.UltimateAuth.Core.Contracts;
+using CodeBeam.UltimateAuth.Core.Defaults;
 using CodeBeam.UltimateAuth.Core.Domain;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.WebUtilities;

src/CodeBeam.UltimateAuth.Client/Components/UAuthStateView.razor

@@ -2,7 +2,9 @@
 
 @inherits UAuthReactiveComponentBase
 @using CodeBeam.UltimateAuth.Core.Domain
+@using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
+@inject IAuthorizationService AuthorizationService 
 
 @if (_inactive)
 {
@@ -15,21 +17,22 @@
         @NotAuthorized
     }
 }
+else if (_authorizing && Authorizing is not null)
+{
+    @Authorizing
+}
+else if (!_authorized)
+{
+    @NotAuthorized
+}
 else
 {
-    <AuthorizeView Roles="@Roles" Policy="@Policy">
-        <Authorized>
-            @if (Authorized is not null)
-            {
-                @Authorized(AuthState)
-            }
-            else if (ChildContent is not null)
-            {
-                @ChildContent(AuthState)
-            }
-        </Authorized>
-        <NotAuthorized>
-            @NotAuthorized
-        </NotAuthorized>
-    </AuthorizeView>
+    if (Authorized is not null)
+    {
+        @Authorized(AuthState)
+    }
+    else if (ChildContent is not null)
+    {
+        @ChildContent(AuthState)
+    }
 }