Remove complexity from layout view

Author: KianW-DfE

src/SchoolAccount.Web.Mvc/DependencyInjection.cs

@@ -1,5 +1,6 @@
 using GovUk.Frontend.AspNetCore;
 using SchoolAccount.Web.Mvc.Authentication.Extensions;
+using SchoolAccount.Web.Mvc.Features.Header;
 using SchoolAccount.Web.Mvc.Infrastructure;
 
 namespace SchoolAccount.Web.Mvc;
@@ -16,6 +17,7 @@ IConfigurationManager configuration
         services.AddDsiAuthentication(configuration);
         services.AddControllersWithFeatureViews();
         services.AddGovUkFrontend();
+        services.AddScoped<IHeaderContentProvider, HeaderContentProvider>();
 
         if (env.IsDevelopment())
         {

src/SchoolAccount.Web.Mvc/Features/Header/IHeaderContentProvider.cs

@@ -0,0 +1,21 @@
+using SchoolAccount.SharedKernel;
+
+namespace SchoolAccount.Web.Mvc.Features.Header;
+
+public interface IHeaderContentProvider
+{
+    bool IsAuthenticated { get; }
+    string? OrganisationName { get; }
+}
+
+public class HeaderContentProvider : IHeaderContentProvider
+{
+    public bool IsAuthenticated { get; }
+    public string? OrganisationName { get; }
+
+    public HeaderContentProvider(IUserContext userContext)
+    {
+        IsAuthenticated = userContext.IsAuthenticated;
+        OrganisationName = userContext.Organisation?.Name;
+    }
+}

src/SchoolAccount.Web.Mvc/Features/Shared/_Layout.cshtml

@@ -1,14 +1,11 @@
-@using SchoolAccount.SharedKernel
-@inject IUserContext CurrentUser
+@using SchoolAccount.Web.Mvc.Features.Header
+@inject IHeaderContentProvider HeaderContentProvider
 
 @* ReSharper disable Razor.LayoutNotResolved *@
 @* ReSharper disable Razor.SectionNotResolved *@
 
 @{
     Layout = "_GovUkPageTemplate";
-
-    var isAuthenticated = CurrentUser?.IsAuthenticated == true;
-    var organisationName = CurrentUser?.Organisation?.Name;
 }
 
 @section Head {
@@ -26,9 +23,9 @@
                 </a>
             </div>
             <div class="header-navigation">
-                @if (isAuthenticated)
+                @if (HeaderContentProvider.IsAuthenticated)
                 {
-                    <span class="header-navigation__school">@organisationName</span>
+                    <span class="header-navigation__school">@HeaderContentProvider.OrganisationName</span>
 
                     @using (Html.BeginForm("Logout", "Account", FormMethod.Post))
                     {