Trying to fix the logout.

Author: ilonatommy

CashFlowAnalyzer.Client/Layout/MainLayout.razor

@@ -1,10 +1,6 @@
 @inherits LayoutComponentBase
-@* 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 IAccountService AccountService
-@inject AuthenticationInfoProvider AuthenticationInfoProvider
 
 <div class="page">
     <div class="sidebar">
@@ -37,9 +33,10 @@ service of type 'CashFlowAnalyzer.Client.Services.AccountService'. *@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+        // issue: this does not get triggered if we redirected from login page or it's the server rendering
         if (firstRender)
         {
-            isAuthenticated = await AuthenticationInfoProvider.IsAuthenticated();
+            isAuthenticated = await AccountService.IsAuthenticated();
             if (isAuthenticated)
             {
                 StateHasChanged();
@@ -51,6 +48,7 @@ service of type 'CashFlowAnalyzer.Client.Services.AccountService'. *@
     private async Task Logout()
     {
         await AccountService.Logout();
+        isAuthenticated = false;
         Navigation.NavigateTo("/Login");
     }
 }

CashFlowAnalyzer.Client/Program.cs

@@ -15,7 +15,6 @@
 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/Services/Account/AccountService.cs

@@ -40,15 +40,25 @@ public async Task<AccountServiceResult> Register(RegisterModel model)
         return await SendRequest(request);
     }
 
+    public async Task<bool> IsAuthenticated()
+    {
+        var response = await _http.GetAsync($"{baseAddress}/api/auth/isAuthenticated");
+        if (response.IsSuccessStatusCode)
+        {
+            return await response.Content.ReadFromJsonAsync<bool>();
+        }
+        return false;
+    }
+
     private async Task<AccountServiceResult> SendRequest(HttpRequestMessage request)
     {
         using var response = await _http.SendAsync(request);
         if (response.StatusCode == HttpStatusCode.OK)
         {
-            _log.LogInformation("Registration was successful");
+            _log.LogInformation("Request was successful");
             return new AccountServiceResult() { Success = true };
         }
-        _log.LogWarning("Registration failed");
+        _log.LogWarning("Request failed");
         var errors = await response.Content.ReadFromJsonAsync<List<string>>();
         return new AccountServiceResult() { Success = false, Errors = errors };
     }

CashFlowAnalyzer.Client/Services/Account/AuthenticationInfoProvider.cs

@@ -7,4 +7,5 @@ public interface IAccountService
     Task<AccountServiceResult> Login(LoginModel model);
     Task<AccountServiceResult> Logout();
     Task<AccountServiceResult> Register(RegisterModel model);
+    Task<bool> IsAuthenticated();
 }

CashFlowAnalyzer.Client/Services/Account/IAccountService.cs

@@ -17,6 +17,12 @@ public AuthController(SignInManager<ApplicationUser> signInManager, UserManager<
             _userManager = userManager;
         }
 
+        [HttpGet("isAuthenticated")]
+        public IActionResult IsAuthenticated()
+        {
+            return Ok(User.Identity.IsAuthenticated);
+        }
+
         [HttpPost("login")]
         public async Task<IActionResult> Login([FromBody] LoginModel model)
         {

CashFlowAnalyzer/Controllers/AuthController.cs

@@ -12,7 +12,6 @@
 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.