update identity pages

Author: iammukeshm

src/Modules/Multitenancy/Modules.Multitenancy/Features/v1/CreateTenant/CreateTenantEndpoint.cs

@@ -16,10 +16,11 @@ public static RouteHandlerBuilder Map(this IEndpointRouteBuilder endpoints)
         return endpoints.MapPost("/", async (
             [FromBody] CreateTenantCommand command,
             [FromServices] IMediator mediator)
-            => Results.Accepted(string.Empty, await mediator.Send(command)))
+            => TypedResults.Ok(await mediator.Send(command)))
             .WithName("CreateTenant")
             .WithSummary("Create tenant")
             .RequirePermission(MultitenancyConstants.Permissions.Create)
-            .WithDescription("Create a new tenant.");
+            .WithDescription("Create a new tenant.")
+            .Produces<CreateTenantCommandResponse>(StatusCodes.Status200OK);
     }
 }

src/Modules/Multitenancy/Modules.Multitenancy/Services/TenantService.cs

@@ -112,7 +112,7 @@ public async Task<string> DeactivateAsync(string id)
             throw new CustomException("At least one active tenant is required.");
         }
 
-        if (!tenant.Id.Equals(MultitenancyConstants.Root.Id, StringComparison.OrdinalIgnoreCase))
+        if (tenant.Id.Equals(MultitenancyConstants.Root.Id, StringComparison.OrdinalIgnoreCase))
         {
             throw new CustomException("The root tenant cannot be deactivated.");
         }
@@ -160,7 +160,13 @@ public async Task<TenantStatusDto> GetStatusAsync(string id)
     public async Task<DateTime> UpgradeSubscription(string id, DateTime extendedExpiryDate)
     {
         var tenant = await GetTenantInfoAsync(id).ConfigureAwait(false);
-        tenant.SetValidity(extendedExpiryDate);
+
+        // Ensure the date is UTC for PostgreSQL compatibility
+        var utcExpiryDate = extendedExpiryDate.Kind == DateTimeKind.Utc
+            ? extendedExpiryDate
+            : DateTime.SpecifyKind(extendedExpiryDate, DateTimeKind.Utc);
+
+        tenant.SetValidity(utcExpiryDate);
         await _tenantStore.UpdateAsync(tenant).ConfigureAwait(false);
         return tenant.ValidUpto;
     }

src/Playground/Playground.Blazor/Components/Layout/NavMenu.razor

@@ -1,4 +1,8 @@
+@using FSH.Framework.Shared.Constants
+@using FSH.Framework.Shared.Multitenancy
+@using Microsoft.AspNetCore.Components.Authorization
 @inject NavigationManager Navigation
+@inject AuthenticationStateProvider AuthenticationStateProvider
 
 <nav class="fsh-nav">
     <MudNavMenu Class="pa-2" Rounded="true" Margin="Margin.Dense" Color="Color.Primary">
@@ -19,14 +23,17 @@
             </MudNavLink>
         </MudNavGroup>
 
-        <MudNavGroup Title="Tenants" Icon="@Icons.Material.Outlined.Business" Expanded="false">
-            <MudNavLink Href="/tenants" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Outlined.CorporateFare">
-                Tenants
-            </MudNavLink>
-            <MudNavLink Href="/tenants/settings" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Outlined.Tune">
-                Tenant Settings
-            </MudNavLink>
-        </MudNavGroup>
+        @if (_isRootTenantAdmin)
+        {
+            <MudNavGroup Title="Tenants" Icon="@Icons.Material.Outlined.Business" Expanded="false">
+                <MudNavLink Href="/tenants" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Outlined.CorporateFare">
+                    Tenants
+                </MudNavLink>
+                <MudNavLink Href="/tenants/settings" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Outlined.Tune">
+                    Tenant Settings
+                </MudNavLink>
+            </MudNavGroup>
+        }
 
         <MudNavLink Href="/audits" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Outlined.History">
             Audit Logs
@@ -76,4 +83,37 @@
 </nav>
 
 @code {
+    private bool _isRootTenantAdmin;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await CheckRootTenantAdmin();
+    }
+
+    private async Task CheckRootTenantAdmin()
+    {
+        try
+        {
+            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            var user = authState.User;
+
+            if (user.Identity?.IsAuthenticated != true)
+            {
+                _isRootTenantAdmin = false;
+                return;
+            }
+
+            var tenant = user.FindFirst(CustomClaims.Tenant)?.Value;
+            var isRootTenant = string.Equals(tenant, MultitenancyConstants.Root.Id, StringComparison.OrdinalIgnoreCase);
+
+            var roles = user.FindAll(System.Security.Claims.ClaimTypes.Role).Select(c => c.Value).ToList();
+            var isAdmin = roles.Any(r => string.Equals(r, RoleConstants.Admin, StringComparison.OrdinalIgnoreCase));
+
+            _isRootTenantAdmin = isRootTenant && isAdmin;
+        }
+        catch
+        {
+            _isRootTenantAdmin = false;
+        }
+    }
 }