simple start refactor

Author: CIS Guru

0-Aquiis.Core/Constants/ApplicationSettings.cs

@@ -9,6 +9,7 @@ public class ApplicationSettings
         public string Repository { get; set; } = string.Empty;
         public bool SoftDeleteEnabled { get; set; }
         public string SchemaVersion { get; set; } = "1.0.0";
+        public int MaxOrganizationUsers { get; set; } = 0; // 0 = unlimited (Professional), 3 = SimpleStart limit
     }
 
     // Property & Tenant Lifecycle Enums

2-Aquiis.Application/Services/OrganizationService.cs

@@ -2,18 +2,24 @@
 using Aquiis.Core.Constants;
 using Aquiis.Core.Interfaces.Services;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 namespace Aquiis.Application.Services
 {
     public class OrganizationService
     {
         private readonly ApplicationDbContext _dbContext;
         private readonly IUserContextService _userContext;
+        private readonly ApplicationSettings _settings;
 
-        public OrganizationService(ApplicationDbContext dbContext, IUserContextService userContextService)
+        public OrganizationService(
+            ApplicationDbContext dbContext, 
+            IUserContextService userContextService,
+            IOptions<ApplicationSettings> settings)
         {
             _dbContext = dbContext;
             _userContext = userContextService;
+            _settings = settings.Value;
         }
 
         #region CRUD Operations
@@ -289,6 +295,24 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, Guid organiz
             if (organization == null || organization.IsDeleted)
                 return false;
 
+            // Check user limit for SimpleStart (MaxOrganizationUsers > 0)
+            if (_settings.MaxOrganizationUsers > 0)
+            {
+                var currentUserCount = await _dbContext.OrganizationUsers
+                    .Where(ou => ou.OrganizationId == organizationId
+                              && ou.UserId != ApplicationConstants.SystemUser.Id
+                              && ou.IsActive
+                              && !ou.IsDeleted)
+                    .CountAsync();
+
+                if (currentUserCount >= _settings.MaxOrganizationUsers)
+                {
+                    throw new InvalidOperationException(
+                        $"User limit reached. SimpleStart allows maximum {_settings.MaxOrganizationUsers} user accounts (including system account). " +
+                        "Upgrade to Aquiis Professional for unlimited users.");
+                }
+            }
+
             // Check if user already has access
             var existing = await _dbContext.OrganizationUsers
                 .FirstOrDefaultAsync(uo => uo.UserId == userId && uo.OrganizationId == organizationId);

3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListView.razor

@@ -29,10 +29,11 @@
 @if (ShowMetrics)
 {
     <PropertyMetricsCard 
-        ShowAvailable="true" 
-        ShowPending="false" 
-        ShowOccupied="true" 
-        ShowMonthlyRent="true"
+        ShowAvailableProperties="true" 
+        ShowLeasePendingProperties="false" 
+        ShowOccupiedProperties="true" 
+        ShowTotalMonthlyRent="true"
+        TotalPropertiesCount="@TotalCount"
         AvailableCount="@AvailableCount"
         PendingCount="@PendingCount"
         OccupiedCount="@OccupiedCount"
@@ -219,6 +220,12 @@ else
     /// </summary>
     [Parameter]
     public bool SortAscending { get; set; } = true;
+
+     /// <summary>
+    /// Total properties count (for metrics)
+    /// </summary>
+    [Parameter]
+    public int TotalCount { get; set; }
 
     /// <summary>
     /// Available properties count (for metrics)

3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyListForm.razor

@@ -59,6 +59,7 @@ else
         StatusFilter="@selectedPropertyStatus"
         SortColumn="@sortColumn"
         SortAscending="@sortAscending"
+        TotalCount="@totalCount"
         AvailableCount="@availableCount"
         PendingCount="@pendingCount"
         OccupiedCount="@occupiedCount"
@@ -131,6 +132,8 @@ else
     private List<Property> pagedProperties = new();
     private string searchTerm = string.Empty;
     private string selectedPropertyStatus = string.Empty;
+
+    private int totalCount = 0;
     private int availableCount = 0;
     private int pendingCount = 0;
     private int occupiedCount = 0;
@@ -214,6 +217,7 @@ else
     private void CalculateMetrics(){
         if (filteredProperties != null)
         {
+            totalCount = filteredProperties.Count;
             availableCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Available);
             pendingCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.ApplicationPending || p.Status == ApplicationConstants.PropertyStatuses.LeasePending);
             occupiedCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Occupied);

4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor

@@ -58,10 +58,19 @@
                 <div class="card">
                     <div class="card-header d-flex justify-content-between align-items-center">
                         <h5 class="mb-0">Users with Access</h5>
-                        <button class="btn btn-sm btn-primary" @onclick="ShowAddUserModal">
+                        <button class="btn btn-sm btn-primary" @onclick="ShowAddUserModal" disabled="@(!CanAddMoreUsers)">
                             <i class="bi bi-person-plus"></i> Add User
                         </button>
                     </div>
+                    @if (!CanAddMoreUsers)
+                    {
+                        <div class="alert alert-warning m-3 mb-0">
+                            <i class="bi bi-exclamation-triangle"></i>
+                            <strong>User Limit Reached</strong><br />
+                            SimpleStart allows 3 user accounts (1 system + 2 login users).<br />
+                            <small>Upgrade to <strong>Aquiis Professional</strong> for unlimited users and advanced features.</small>
+                        </div>
+                    }
                     <div class="card-body p-0">
                         @if (!organizationUsers.Any())
                         {
@@ -229,6 +238,10 @@
     private string selectedRole = ApplicationConstants.OrganizationRoles.User;
     private string addUserError = string.Empty;
 
+    // SimpleStart: 3-user limit (excluding system account)
+    private bool CanAddMoreUsers => organizationUsers
+        .Count(ou => ou.UserId != ApplicationConstants.SystemUser.Id) < 3;
+
     protected override async Task OnInitializedAsync()
     {
         await LoadOrganization();

4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Register.razor

@@ -1,10 +1,7 @@
 @page "/Account/Register"
 
 @using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
 @using Aquiis.Infrastructure.Data
 @using Aquiis.Application.Services
 @using Aquiis.Core.Entities
@@ -324,21 +321,21 @@ else
             }
         }
 
+        // Auto-confirm email (no email integration yet)
         var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
-
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        if (UserManager.Options.SignIn.RequireConfirmedAccount)
+        var confirmResult = await UserManager.ConfirmEmailAsync(user, code);
+        
+        if (!confirmResult.Succeeded)
+        {
+            Logger.LogWarning("Failed to auto-confirm email for user {UserId}: {Errors}", 
+                userId, string.Join(", ", confirmResult.Errors.Select(e => e.Description)));
+        }
+        else
         {
-            RedirectManager.RedirectTo(
-                "Account/RegisterConfirmation",
-                new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
+            Logger.LogInformation("Email auto-confirmed for user {UserId}", userId);
         }
 
+        // Sign in the user directly
         await SignInManager.SignInAsync(user, isPersistent: false);
         RedirectManager.RedirectTo(ReturnUrl);
     }

4-Aquiis.SimpleStart/appsettings.json

@@ -20,7 +20,8 @@
     "SoftDeleteEnabled": true,
     "DatabaseFileName": "app_v0.3.0.db",
     "PreviousDatabaseFileName": "app_v0.0.0.db",
-    "SchemaVersion": "0.3.0"
+    "SchemaVersion": "0.3.0",
+    "MaxOrganizationUsers": 3
   },
   "SessionTimeout": {
     "InactivityTimeoutMinutes": 18,

5-Aquiis.Professional/Shared/Components/Account/Pages/Register.razor

@@ -1,10 +1,7 @@
 @page "/Account/Register"
 
 @using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
 @using Aquiis.Infrastructure.Data
 @using Aquiis.Application.Services
 @using Aquiis.Core.Entities
@@ -324,21 +321,21 @@ else
             }
         }
 
+        // Auto-confirm email (no email integration yet)
         var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
-
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        if (UserManager.Options.SignIn.RequireConfirmedAccount)
+        var confirmResult = await UserManager.ConfirmEmailAsync(user, code);
+        
+        if (!confirmResult.Succeeded)
+        {
+            Logger.LogWarning("Failed to auto-confirm email for user {UserId}: {Errors}", 
+                userId, string.Join(", ", confirmResult.Errors.Select(e => e.Description)));
+        }
+        else
         {
-            RedirectManager.RedirectTo(
-                "Account/RegisterConfirmation",
-                new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
+            Logger.LogInformation("Email auto-confirmed for user {UserId}", userId);
         }
 
+        // Sign in the user directly
         await SignInManager.SignInAsync(user, isPersistent: false);
         RedirectManager.RedirectTo(ReturnUrl);
     }

5-Aquiis.Professional/appsettings.json

@@ -20,7 +20,8 @@
     "SoftDeleteEnabled": true,
     "DatabaseFileName": "app_v0.3.0.db",
     "PreviousDatabaseFileName": "app_v0.0.0.db",
-    "SchemaVersion": "0.3.0"
+    "SchemaVersion": "0.3.0",
+    "MaxOrganizationUsers": 0
   },
   "SessionTimeout": {
     "InactivityTimeoutMinutes": 18,

6-Tests/Aquiis.UI.Professional.Tests/NewSetupUITests.cs

@@ -31,7 +31,7 @@ public async Task CreateNewAccount()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).ClickAsync();
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).FillAsync("Aquiis");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).PressAsync("Tab");
-        await Page.Locator("select[id='Input.State']").SelectOptionAsync(new[] { "LA" });
+        await Page.Locator("select[id='Input.State']").SelectOptionAsync(new[] { "TX" });
         await Page.Locator("select[id='Input.State']").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
@@ -44,25 +44,25 @@ public async Task CreateNewAccount()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Confirm Password" }).FillAsync("Today123");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Register" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
+        // await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
 
-        // await Page.GetByRole(AriaRole.Heading, new() { Name = "Register confirmation" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
+        // // await Page.GetByRole(AriaRole.Heading, new() { Name = "Register confirmation" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
+        // await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
 
-        // await Page.GetByText("Thank you for confirming your").ClickAsync();
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        // // await Page.GetByText("Thank you for confirming your").ClickAsync();
+        // await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Log in')");
+        // await Page.WaitForSelectorAsync("h1:has-text('Log in')");
 
-        // await Page.GetByRole(AriaRole.Heading, new() { Name = "Log in", Exact = true }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+        // // await Page.GetByRole(AriaRole.Heading, new() { Name = "Log in", Exact = true }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        // await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
 
         await Page.WaitForSelectorAsync("text=Dashboard");