Fix #1.

Author: ilonatommy

CashFlowAnalyzer.Client/Layout/MainLayout.razor

@@ -2,9 +2,9 @@
 @* Issue: Cannot provide a value for property 'AccountService' on type 
 'CashFlowAnalyzer.Client.Layout.MainLayout'. There is no registered
 service of type 'CashFlowAnalyzer.Client.Services.AccountService'. *@
-@* @inject NavigationManager Navigation
-@inject AccountService AccountService
-@inject AuthenticationStateProvider AuthenticationStateProvider *@
+@inject NavigationManager Navigation
+@inject IAccountService AccountService
+@inject AuthenticationInfoProvider AuthenticationInfoProvider
 
 <div class="page">
     <div class="sidebar">
@@ -13,10 +13,10 @@ service of type 'CashFlowAnalyzer.Client.Services.AccountService'. *@
 
     <main>
         <div class="top-row px-4">
-            @* @if (isAuthenticated)
+            @if (isAuthenticated)
             {
                 <button class="btn btn-danger" @onclick="Logout">Logout</button>
-            } *@
+            }
             <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
         </div>
 
@@ -32,18 +32,25 @@ service of type 'CashFlowAnalyzer.Client.Services.AccountService'. *@
     <span class="dismiss">🗙</span>
 </div>
 
-@* @code {
+@code {
     private bool isAuthenticated;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-        isAuthenticated = authState.User.Identity.IsAuthenticated;
+        if (firstRender)
+        {
+            isAuthenticated = await AuthenticationInfoProvider.IsAuthenticated();
+            if (isAuthenticated)
+            {
+                StateHasChanged();
+            }
+        }
+        await base.OnAfterRenderAsync(firstRender);
     }
 
     private async Task Logout()
     {
         await AccountService.Logout();
         Navigation.NavigateTo("/Login");
     }
-} *@
+}

CashFlowAnalyzer.Client/Layout/NavMenu.razor

@@ -10,7 +10,7 @@
     <nav class="nav flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
+                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Dashboard
             </NavLink>
         </div>
 
@@ -20,11 +20,6 @@
             </NavLink>
         </div>
 
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="dashboard">
-                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Dashboard
-            </NavLink>
-        </div>
     </nav>
 </div>
 

CashFlowAnalyzer.Client/Pages/Dashboard.razor

@@ -1,4 +1,4 @@
-@page "/dashboard"
+@page "/"
 @attribute [Authorize]
 @using System
 @inject IFinancialDataService FinancialDataService

CashFlowAnalyzer.Client/Pages/Home.razor

@@ -15,6 +15,7 @@
 builder.Services.AddScoped<IAccountService, AccountService>();
 builder.Services.AddScoped<SpreadsheetReader>();
 builder.Services.AddScoped<IFinancialDataService, FinancialDataService>();
+builder.Services.AddScoped<AuthenticationInfoProvider>();
 builder.Services.AddBlazorBootstrap();
 
 // Supply HttpClient instances that include access tokens when making requests to the server project

CashFlowAnalyzer.Client/Program.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Components.Authorization;
+
+namespace CashFlowAnalyzer.Client.Services;
+
+public class AuthenticationInfoProvider
+{
+    private readonly AuthenticationStateProvider _authenticationStateProvider;
+
+    public AuthenticationInfoProvider(AuthenticationStateProvider authenticationStateProvider)
+    {
+        _authenticationStateProvider = authenticationStateProvider;
+    }
+
+    public async Task<bool> IsAuthenticated()
+    {
+        var authState = await _authenticationStateProvider.GetAuthenticationStateAsync();
+        return authState.User.Identity.IsAuthenticated;
+    }
+}

CashFlowAnalyzer.Client/Services/Account/AuthenticationInfoProvider.cs

@@ -12,6 +12,7 @@
 builder.Services.AddScoped<IAccountService, AccountService>();
 builder.Services.AddScoped<SpreadsheetReader>();
 builder.Services.AddScoped<IFinancialDataService, FinancialDataService>();
+builder.Services.AddScoped<AuthenticationInfoProvider>();
 builder.Services.AddScoped<DatabaseService>();
 
 // Add services to the container.